]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
break CF_MEDIA_PAUSE to CF_AUDIO_PAUSE and CF_VIDEO_PAUSE so we can control them...
authorSeven Du <dujinfang@gmail.com>
Tue, 25 Feb 2014 03:22:11 +0000 (11:22 +0800)
committerSeven Du <dujinfang@gmail.com>
Tue, 25 Feb 2014 03:22:53 +0000 (11:22 +0800)
src/include/switch_types.h
src/mod/languages/mod_managed/managed/swig.2010.cs
src/mod/languages/mod_managed/managed/swig.cs
src/switch_core_io.c

index beb26fc3702a9300465a768f2e9bc2d56132f0e3..8bd1dff30cf889d314ded5aa51b1b19f4b2902cf 100644 (file)
@@ -1267,6 +1267,10 @@ CF_EVENT_LOCK            - Don't parse events
 CF_RESET                       - Tell extension parser to reset
 CF_ORIGINATING         - Channel is originating
 CF_STOP_BROADCAST      - Signal to stop broadcast
+
+CF_AUDIO_PAUSE      - Audio is not ready to read/write
+CF_VIDEO_PAUSE      - Video is not ready to read/write
+
 </pre>
  */
 
@@ -1398,7 +1402,8 @@ typedef enum {
        CF_VIDEO_ECHO,
        CF_SLA_INTERCEPT,
        CF_VIDEO_BREAK,
-       CF_MEDIA_PAUSE,
+       CF_AUDIO_PAUSE,
+       CF_VIDEO_PAUSE,
        CF_BYPASS_MEDIA_AFTER_HOLD,
        /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
        /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
index bfe88dc48255529d841ca9a364344ca53ba5af64..04ccdce44894c14b80dadd217c9f77740b3dfb21 100644 (file)
@@ -26933,7 +26933,8 @@ public enum switch_channel_flag_t {
   CF_VIDEO_ECHO,\r
   CF_SLA_INTERCEPT,\r
   CF_VIDEO_BREAK,\r
-  CF_MEDIA_PAUSE,\r
+  CF_AUDIO_PAUSE,\r
+  CF_VIDEO_PAUSE,\r
   CF_BYPASS_MEDIA_AFTER_HOLD,\r
   CF_FLAG_MAX\r
 }\r
index ef496f5e3729ec214012b29921850760b9d4798a..f1645709141c4a55bbd97d2d46370c8a51bac049 100644 (file)
@@ -26940,7 +26940,8 @@ public enum switch_channel_flag_t {
   CF_VIDEO_ECHO,
   CF_SLA_INTERCEPT,
   CF_VIDEO_BREAK,
-  CF_MEDIA_PAUSE,
+  CF_AUDIO_PAUSE,
+  CF_VIDEO_PAUSE,
   CF_BYPASS_MEDIA_AFTER_HOLD,
   CF_FLAG_MAX
 }
index 753396868b0ff5eec4f9a0ecbe4b66fe2959eb3d..c290d9175fba4affa95b8c94369686fa63a58959 100644 (file)
@@ -46,7 +46,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
                return SWITCH_STATUS_FALSE;
        }
 
-       if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) {
+       if (switch_channel_test_flag(session->channel, CF_VIDEO_PAUSE)) {
                return SWITCH_STATUS_SUCCESS;
        }
 
@@ -74,7 +74,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
                return SWITCH_STATUS_FALSE;
        }
 
-       if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) {
+       if (switch_channel_test_flag(session->channel, CF_VIDEO_PAUSE)) {
                *frame = &runtime.dummy_cng_frame;
                switch_yield(20000);
                return SWITCH_STATUS_SUCCESS;
@@ -177,7 +177,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
                        return SWITCH_STATUS_SUCCESS;
                }
 
-               if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) {
+               if (switch_channel_test_flag(session->channel, CF_AUDIO_PAUSE)) {
                        switch_yield(20000);
                        *frame = &runtime.dummy_cng_frame;
                        // switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Media Paused!!!!\n");
@@ -1053,7 +1053,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
                }
        }
 
-       if (switch_channel_test_flag(session->channel, CF_MEDIA_PAUSE)) {
+       if (switch_channel_test_flag(session->channel, CF_AUDIO_PAUSE)) {
                return SWITCH_STATUS_SUCCESS;
        }