[vlc-commits] input: add DEMUX_SET_ES notification

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Dec  3 19:05:20 2013 +0100| [836a03aac650236bbd66db9faeee556c843bf68d] | committer: Francois Cartegnie

input: add DEMUX_SET_ES notification

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=836a03aac650236bbd66db9faeee556c843bf68d
---

 include/vlc_demux.h |    3 ++-
 src/input/demux.c   |    1 +
 src/input/input.c   |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 6cfca6b..0dcee0d 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -115,11 +115,12 @@ enum demux_query_e
     DEMUX_SET_TITLE,            /* arg1= int            can fail */
     DEMUX_SET_SEEKPOINT,        /* arg1= int            can fail */
 
-    /* DEMUX_SET_GROUP only a hint for demuxer (mainly DVB) to allow not
+    /* DEMUX_SET_GROUP/SET_ES only a hint for demuxer (mainly DVB) to allow not
      * reading everything (you should not use this to call es_out_Control)
      * if you don't know what to do with it, just IGNORE it, it is safe(r)
      * -1 means all group, 0 default group (first es added) */
     DEMUX_SET_GROUP,            /* arg1= int, arg2=const vlc_list_t *   can fail */
+    DEMUX_SET_ES,               /* arg1= int                            can fail */
 
     /* Ask the demux to demux until the given date at the next pf_demux call
      * but not more (and not less, at the precision available of course).
diff --git a/src/input/demux.c b/src/input/demux.c
index 86e2082..8126455 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -320,6 +320,7 @@ int demux_vaControlHelper( stream_t *s,
         case DEMUX_SET_NEXT_DEMUX_TIME:
         case DEMUX_GET_TITLE_INFO:
         case DEMUX_SET_GROUP:
+        case DEMUX_SET_ES:
         case DEMUX_GET_ATTACHMENTS:
         case DEMUX_CAN_RECORD:
         case DEMUX_SET_RECORD_STATE:
diff --git a/src/input/input.c b/src/input/input.c
index f5c6d20..183681a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1856,6 +1856,8 @@ static bool Control( input_thread_t *p_input,
             /* No need to force update, es_out does it if needed */
             es_out_Control( p_input->p->p_es_out_display,
                             ES_OUT_SET_ES_BY_ID, (int)val.i_int );
+
+            demux_Control( p_input->p->input.p_demux, DEMUX_SET_ES, (int)val.i_int );
             break;
 
         case INPUT_CONTROL_RESTART_ES: