ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-11 03:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7500: revert earlier bridge change

Browse Source
This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:46:44 -05:00
1 parent 3c29d4e8a7
commit 44e7929507
3 files changed
+1 -131
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/switch_ivr_bridge.c
-15
View File
@@ -46,7 +46,6 @@ struct vid_helper {
int up;
};
#if 0
static void *SWITCH_THREAD_FUNC video_bridge_thread(switch_thread_t *thread, void *obj)
{
struct vid_helper *vh = obj;
@@ -109,17 +108,9 @@ static void *SWITCH_THREAD_FUNC video_bridge_thread(switch_thread_t *thread, voi
vh->up = 0;
return NULL;
}
#endif
static switch_thread_t *launch_video(struct vid_helper *vh)
{
switch_channel_t *channel = switch_core_session_get_channel(vh->session_a);
switch_channel_set_private(channel, "_video_bridged_session_", vh->session_b);
switch_channel_set_flag(channel, CF_VIDEO_BRIDGE);
return NULL;
#if 0
switch_thread_t *thread;
switch_threadattr_t *thd_attr = NULL;
@@ -127,8 +118,6 @@ static switch_thread_t *launch_video(struct vid_helper *vh)
switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
switch_thread_create(&thread, thd_attr, video_bridge_thread, vh, switch_core_session_get_pool(vh->session_a));
return thread;
#endif
}
#endif
@@ -601,10 +590,6 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
end_of_bridge_loop:
#ifdef SWITCH_VIDEO_IN_THREADS
switch_channel_clear_flag(chan_a, CF_VIDEO_BRIDGE);
switch_channel_clear_flag(chan_b, CF_VIDEO_BRIDGE);
if (vid_thread) {
vh.up = -1;
switch_channel_set_flag(chan_a, CF_NOT_READY);