[asterisk-commits] kmoore: branch kmoore/stasis-bridging_events r389975 - in /team/kmoore/stasis...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue May 28 21:39:36 CDT 2013
Author: kmoore
Date: Tue May 28 21:39:32 2013
New Revision: 389975
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389975
Log:
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.
........
Merged revisions 389974 from http://svn.asterisk.org/svn/asterisk/trunk
Modified:
team/kmoore/stasis-bridging_events/ (props changed)
team/kmoore/stasis-bridging_events/apps/app_fax.c
team/kmoore/stasis-bridging_events/include/asterisk/stasis_channels.h
team/kmoore/stasis-bridging_events/main/stasis_channels.c
team/kmoore/stasis-bridging_events/res/res_fax.c
team/kmoore/stasis-bridging_events/res/res_monitor.c
team/kmoore/stasis-bridging_events/res/res_musiconhold.c
Propchange: team/kmoore/stasis-bridging_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 28 21:39:32 2013
@@ -1,1 +1,1 @@
-/trunk:1-389911
+/trunk:1-389974
Modified: team/kmoore/stasis-bridging_events/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/apps/app_fax.c?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/apps/app_fax.c (original)
+++ team/kmoore/stasis-bridging_events/apps/app_fax.c Tue May 28 21:39:32 2013
@@ -268,7 +268,7 @@
"fax_resolution", stat.y_resolution,
"fax_bitrate", stat.bit_rate,
"filenames", json_filenames);
- message = ast_channel_cached_blob_create(s->chan, ast_channel_fax_type(), json_object);
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(s->chan), ast_channel_fax_type(), json_object);
if (!message) {
return;
}
Modified: team/kmoore/stasis-bridging_events/include/asterisk/stasis_channels.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/include/asterisk/stasis_channels.h?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/include/asterisk/stasis_channels.h (original)
+++ team/kmoore/stasis-bridging_events/include/asterisk/stasis_channels.h Tue May 28 21:39:32 2013
@@ -155,27 +155,6 @@
/*!
* \since 12
- * \brief Creates a \ref ast_channel_blob message using the current cached
- * \ref ast_channel_snapshot for the passed in \ref ast_channel
- *
- * The given \a blob should be treated as immutable and not modified after it is
- * put into the message.
- *
- * \param chan Channel blob is associated with, or \c NULL for global/all channels.
- * \param type Message type for this blob.
- * \param blob JSON object representing the data, or \c NULL for no data. If
- * \c NULL, ast_json_null() is put into the object.
- *
- * \param chan Channel blob is associated with
- * \param blob JSON object representing the data.
- * \return \ref ast_channel_blob message.
- * \return \c NULL on error
- */
-struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan,
- struct stasis_message_type *type, struct ast_json *blob);
-
-/*!
- * \since 12
* \brief Create a \ref ast_channel_blob message, pulling channel state from
* the cache.
*
Modified: team/kmoore/stasis-bridging_events/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/main/stasis_channels.c?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/main/stasis_channels.c (original)
+++ team/kmoore/stasis-bridging_events/main/stasis_channels.c Tue May 28 21:39:32 2013
@@ -250,12 +250,12 @@
return msg;
}
-struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan,
+struct stasis_message *ast_channel_blob_create_from_cache(const char *channel_id,
struct stasis_message_type *type,
struct ast_json *blob)
{
RAII_VAR(struct ast_channel_snapshot *, snapshot,
- ast_channel_snapshot_get_latest(ast_channel_uniqueid(chan)),
+ ast_channel_snapshot_get_latest(channel_id),
ao2_cleanup);
return create_channel_blob_message(snapshot, type, blob);
Modified: team/kmoore/stasis-bridging_events/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/res/res_fax.c?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/res/res_fax.c (original)
+++ team/kmoore/stasis-bridging_events/res/res_fax.c Tue May 28 21:39:32 2013
@@ -1197,7 +1197,7 @@
{
SCOPED_CHANNELLOCK(lock, chan);
- message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object);
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object);
if (!message) {
return -1;
}
@@ -1789,7 +1789,7 @@
return -1;
}
- message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object);
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object);
if (!message) {
return -1;
}
@@ -2269,7 +2269,7 @@
return -1;
}
- message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_obj);
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_obj);
if (!message) {
return -1;
}
Modified: team/kmoore/stasis-bridging_events/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/res/res_monitor.c?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/res/res_monitor.c (original)
+++ team/kmoore/stasis-bridging_events/res/res_monitor.c Tue May 28 21:39:32 2013
@@ -396,7 +396,7 @@
/* so we know this call has been monitored in case we need to bill for it or something */
pbx_builtin_setvar_helper(chan, "__MONITORED","true");
- message = ast_channel_cached_blob_create(chan,
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),
ast_channel_monitor_start_type(),
NULL);
if (message) {
@@ -516,7 +516,7 @@
ast_free(ast_channel_monitor(chan));
ast_channel_monitor_set(chan, NULL);
- message = ast_channel_cached_blob_create(chan,
+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),
ast_channel_monitor_stop_type(),
NULL);
if (message) {
Modified: team/kmoore/stasis-bridging_events/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging_events/res/res_musiconhold.c?view=diff&rev=389975&r1=389974&r2=389975
==============================================================================
--- team/kmoore/stasis-bridging_events/res/res_musiconhold.c (original)
+++ team/kmoore/stasis-bridging_events/res/res_musiconhold.c Tue May 28 21:39:32 2013
@@ -1585,7 +1585,7 @@
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 @@
}
}
- 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);
}
More information about the asterisk-commits
mailing list