diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-05-29 02:26:17 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-05-29 02:26:17 +0000 |
| commit | 6851801a5ebcb0fc7cdf20c14a68e96e67d7f96e (patch) | |
| tree | 271a81f5970dd968cc4815205717daaaafcb529c /res/res_musiconhold.c | |
| parent | bb584c55dee3fbe1bd6d4ecffdfff2c74733cc65 (diff) | |
Resolve a merge conflict
When ast_channel_cached_blob_create was merged,
ast_channel_blob_create_from_cache was partially removed in an
unresolved merge conflict. This restores ast_channel_blob_create_from_cache
and refactors usage of ast_channel_cached_blob_create (requires an
ast_channel) to use ast_channel_blob_create_from_cache (requires a
channel uniqueid) instead.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2ed7ea52b..df6c7d787 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1585,7 +1585,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con return -1; } - message = ast_channel_cached_blob_create(chan, + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_start_type(), json_object); if (message) { @@ -1611,7 +1611,7 @@ static void local_ast_moh_stop(struct ast_channel *chan) } } - message = ast_channel_cached_blob_create(chan, ast_channel_moh_stop_type(), NULL); + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_stop_type(), NULL); if (message) { stasis_publish(ast_channel_topic(chan), message); } |