Changeset 16b435f09be15d5241a6d4897065cd0a605a4992

Timestamp:

28/04/05 09:26:04 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1114673164 +0000

git-parent:

[4bd2fb3107420aed855cd72f557fc6eed8e508d2]

git-author:

Laurent Aimar <fenrir@videolan.org> 1114673164 +0000

Message:

es_out*: added ES_OUT_DEL_GROUP
ts.c: use ES_OUT_DEL_GROUP to remove old program.

Files:

• include/vlc_es_out.h (modified) (1 diff)
• modules/demux/ts.c (modified) (2 diffs)
• src/input/es_out.c (modified) (1 diff)

include/vlc_es_out.h

@@ -81 +81 @@
-    /* Set meta data for group (dynamic) */
-    ES_OUT_SET_GROUP_META,  /* arg1=int i_group arg2=vlc_meta_t */
+    /* */
+    ES_OUT_DEL_GROUP,       /* arg1=int i_group */
-};
-

modules/demux/ts.c

@@ -2942 +2942 @@
-        for( i = 0; i < i_pmt_rm; i++ )
-        {
+            int i_prg;
-            if( p_sys->b_dvb_control )
-            {
@@ -2948 +2949 @@
-                                    pmt_rm[i]->i_pid, VLC_FALSE ) )
-                    p_sys->b_dvb_control = VLC_FALSE;
+            }
+
+            for( i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
+            {
+                const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
+                if( i_number != 0 )
+                    es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
-            }
-

src/input/es_out.c

@@ -1364 +1364 @@
-            return VLC_SUCCESS;
-        }
+        case ES_OUT_DEL_GROUP:
+        {
+            int i_group = (int)va_arg( args, int );
+
+            return EsOutProgramDel( out, i_group );
+        }
-
-        default: