[Freeswitch-svn] [commit] r10480 - freeswitch/trunk/src

FreeSWITCH SVN mikej at freeswitch.org
Thu Nov 20 09:48:59 PST 2008


Author: mikej
Date: Thu Nov 20 12:48:58 2008
New Revision: 10480

Log:
hack for the 32nd flag for now, new solution in the works.

Modified:
   freeswitch/trunk/src/switch_ivr_bridge.c

Modified: freeswitch/trunk/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_bridge.c	(original)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	Thu Nov 20 12:48:58 2008
@@ -529,7 +529,7 @@
 	switch_channel_clear_flag(channel, CF_TRANSFER);
 	switch_channel_clear_flag(channel, CF_ORIGINATING);
 
-	if (switch_channel_test_flag(channel, CF_MASTER)) {
+	if (switch_channel_test_flag(channel, (uint32_t)CF_MASTER)) {
 		switch_channel_set_state(channel, CS_SOFT_EXECUTE);
 	}
 
@@ -547,11 +547,11 @@
 
 	switch_channel_clear_flag(channel, CF_TRANSFER);
 
-	if (!switch_channel_test_flag(channel, CF_MASTER)) {
+	if (!switch_channel_test_flag(channel, (uint32_t)CF_MASTER)) {
 		return SWITCH_STATUS_SUCCESS;
 	}
 
-	switch_channel_clear_flag(channel, CF_MASTER);
+	switch_channel_clear_flag(channel, (uint32_t)CF_MASTER);
 
 	if ((other_uuid = switch_channel_get_variable(channel, SWITCH_UUID_BRIDGE)) && (other_session = switch_core_session_locate(other_uuid))) {
 		switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
@@ -1035,8 +1035,8 @@
 
 			switch_channel_clear_state_handler(originator_channel, NULL);
 			switch_channel_clear_state_handler(originatee_channel, NULL);
-			switch_channel_set_flag(originator_channel, CF_MASTER);
-			switch_channel_clear_flag(originatee_channel, CF_MASTER);
+			switch_channel_set_flag(originator_channel, (uint32_t)CF_MASTER);
+			switch_channel_clear_flag(originatee_channel, (uint32_t)CF_MASTER);
 			switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers);
 			switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers);
 			switch_channel_set_variable(originator_channel, SWITCH_UUID_BRIDGE, switch_core_session_get_uuid(originatee_session));



More information about the Freeswitch-svn mailing list