[asterisk-commits] kmoore: branch kmoore/stasis-bridge_events r385300 - in /team/kmoore/stasis-b...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Apr 11 07:58:41 2013
New Revision: 385300

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385300
Log:
Remove internal bridge information that is of no relevance to external consumers.

Modified:
    team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h
    team/kmoore/stasis-bridge_events/main/bridging.c
    team/kmoore/stasis-bridge_events/main/stasis_bridging.c

Modified: team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h?view=diff&rev=385300&r1=385299&r2=385300
==============================================================================
--- team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h (original)
+++ team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h Thu Apr 11 07:58:41 2013
@@ -52,22 +52,6 @@
 	unsigned int num_channels;
 	/*! Number of active channels in the bridge. */
 	unsigned int num_active;
-	/*!
-	 * \brief Count of the active temporary requests to inhibit bridge merges.
-	 * Zero if merges are allowed.
-	 *
-	 * \note Temporary as in try again in a moment.
-	 */
-	unsigned int inhibit_merge;
-	/*! The internal sample rate this bridge is mixed at when multiple channels are being mixed.
-	 *  If this value is 0, the bridge technology may auto adjust the internal mixing rate. */
-	unsigned int internal_sample_rate;
-	/*! The mixing interval indicates how quickly the bridges internal mixing should occur
-	 * for bridge technologies that mix audio. When set to 0, the bridge tech must choose a
-	 * default interval for itself. */
-	unsigned int internal_mixing_interval;
-	/*! TRUE if the bridge has been dissolved.  Any channel joining is immediately ejected. */
-	unsigned int dissolved:1;
 };
 
 /*!

Modified: team/kmoore/stasis-bridge_events/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/main/bridging.c?view=diff&rev=385300&r1=385299&r2=385300
==============================================================================
--- team/kmoore/stasis-bridge_events/main/bridging.c (original)
+++ team/kmoore/stasis-bridge_events/main/bridging.c Thu Apr 11 07:58:41 2013
@@ -3748,7 +3748,6 @@
 {
 	ast_bridge_lock(bridge);
 	bridge->internal_mixing_interval = mixing_interval;
-	ast_bridge_publish_state(bridge);
 	ast_bridge_unlock(bridge);
 }
 
@@ -3756,7 +3755,6 @@
 {
 	ast_bridge_lock(bridge);
 	bridge->internal_sample_rate = sample_rate;
-	ast_bridge_publish_state(bridge);
 	ast_bridge_unlock(bridge);
 }
 

Modified: team/kmoore/stasis-bridge_events/main/stasis_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/main/stasis_bridging.c?view=diff&rev=385300&r1=385299&r2=385300
==============================================================================
--- team/kmoore/stasis-bridge_events/main/stasis_bridging.c (original)
+++ team/kmoore/stasis-bridge_events/main/stasis_bridging.c Thu Apr 11 07:58:41 2013
@@ -102,10 +102,6 @@
 	snapshot->feature_flags = bridge->feature_flags;
 	snapshot->num_channels = bridge->num_channels;
 	snapshot->num_active = bridge->num_active;
-	snapshot->inhibit_merge = bridge->inhibit_merge;
-	snapshot->internal_sample_rate = bridge->internal_sample_rate;
-	snapshot->internal_mixing_interval = bridge->internal_mixing_interval;
-	snapshot->dissolved = bridge->dissolved;
 
 	ao2_ref(snapshot, +1);
 	return snapshot;