[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r390147 - in /team/rmudgett/bridge_pha...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 30 13:42:54 2013
New Revision: 390147

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390147
Log:
Address Kinsey's reviewboard comments.

Modified:
    team/rmudgett/bridge_phase/include/asterisk/channel.h
    team/rmudgett/bridge_phase/include/asterisk/stasis_channels.h
    team/rmudgett/bridge_phase/main/channel.c
    team/rmudgett/bridge_phase/main/stasis_channels.c

Modified: team/rmudgett/bridge_phase/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/include/asterisk/channel.h?view=diff&rev=390147&r1=390146&r2=390147
==============================================================================
--- team/rmudgett/bridge_phase/include/asterisk/channel.h (original)
+++ team/rmudgett/bridge_phase/include/asterisk/channel.h Thu May 30 13:42:54 2013
@@ -1152,18 +1152,6 @@
  */
 struct ast_channel *ast_dummy_channel_alloc(void);
 #endif
-
-/*!
- * \brief Publish a channel blob message.
- * \since 12.0.0
- *
- * \param chan Channel publishing the blob.
- * \param type Type of stasis message.
- * \param blob The blob being published. (NULL if no blob)
- *
- * \return Nothing
- */
-void ast_channel_publish_blob(struct ast_channel *chan, struct stasis_message_type *type, struct ast_json *blob);
 
 /*!
  * \brief Queue one or more frames to a channel's frame queue

Modified: team/rmudgett/bridge_phase/include/asterisk/stasis_channels.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/include/asterisk/stasis_channels.h?view=diff&rev=390147&r1=390146&r2=390147
==============================================================================
--- team/rmudgett/bridge_phase/include/asterisk/stasis_channels.h (original)
+++ team/rmudgett/bridge_phase/include/asterisk/stasis_channels.h Thu May 30 13:42:54 2013
@@ -252,6 +252,19 @@
 	const char *role, struct ast_channel_snapshot *snapshot);
 
 /*!
+ * \brief Publish a channel blob message.
+ * \since 12.0.0
+ *
+ * \param chan Channel publishing the blob.
+ * \param type Type of stasis message.
+ * \param blob The blob being published. (NULL if no blob)
+ *
+ * \return Nothing
+ */
+void ast_channel_publish_blob(struct ast_channel *chan, struct stasis_message_type *type,
+	struct ast_json *blob);
+
+/*!
  * \since 12
  * \brief Publish a \ref ast_channel_snapshot for a channel.
  *

Modified: team/rmudgett/bridge_phase/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/channel.c?view=diff&rev=390147&r1=390146&r2=390147
==============================================================================
--- team/rmudgett/bridge_phase/main/channel.c (original)
+++ team/rmudgett/bridge_phase/main/channel.c Thu May 30 13:42:54 2013
@@ -1346,20 +1346,6 @@
 int ast_queue_frame_head(struct ast_channel *chan, struct ast_frame *fin)
 {
 	return __ast_queue_frame(chan, fin, 1, NULL);
-}
-
-void ast_channel_publish_blob(struct ast_channel *chan, struct stasis_message_type *type, struct ast_json *blob)
-{
-	RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
-
-	if (!blob) {
-		blob = ast_json_null();
-	}
-
-	message = ast_channel_blob_create(chan, type, blob);
-	if (message) {
-		stasis_publish(ast_channel_topic(chan), message);
-	}
 }
 
 /*! \brief Queue a hangup frame for channel */

Modified: team/rmudgett/bridge_phase/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/stasis_channels.c?view=diff&rev=390147&r1=390146&r2=390147
==============================================================================
--- team/rmudgett/bridge_phase/main/stasis_channels.c (original)
+++ team/rmudgett/bridge_phase/main/stasis_channels.c Thu May 30 13:42:54 2013
@@ -444,6 +444,20 @@
 	return obj->blob;
 }
 
+void ast_channel_publish_blob(struct ast_channel *chan, struct stasis_message_type *type, struct ast_json *blob)
+{
+	RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
+
+	if (!blob) {
+		blob = ast_json_null();
+	}
+
+	message = ast_channel_blob_create(chan, type, blob);
+	if (message) {
+		stasis_publish(ast_channel_topic(chan), message);
+	}
+}
+
 void ast_channel_publish_snapshot(struct ast_channel *chan)
 {
 	RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);