Changeset e4beeb2e6cd7f4ecec5a0c3a0ecef5b8f6f06e4a

Timestamp:

27/04/05 13:40:11 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1114602011 +0000

git-parent:

[53444459bbbd454a9abdc866231a540ed91b7530]

git-author:

Gildas Bazin <gbazin@videolan.org> 1114602011 +0000

Message:

* src/input/es_out.c: cleanup empty programs.

Files:

• src/input/es_out.c (modified) (3 diffs)

src/input/es_out.c

@@ -497 +497 @@
-}
-
+/* EsOutDelProgram:
+ *  Delete a program
+ */
+static void EsOutProgramDel( es_out_t *out, int i_group )
+{
+    es_out_sys_t      *p_sys = out->p_sys;
+    input_thread_t    *p_input = p_sys->p_input;
+    es_out_pgrm_t     *p_pgrm = NULL;
+    vlc_value_t       val;
+    int               i;
+
+    for( i = 0; i < p_sys->i_pgrm; i++ )
+    {
+        if( p_sys->pgrm[i]->i_id == i_group )
+        {
+            p_pgrm = p_sys->pgrm[i];
+            break;
+        }
+    }
+
+    if( p_pgrm == NULL ) return;
+
+    if( p_pgrm->i_es )
+    {
+        msg_Dbg( p_input, "can't delete program %d which still has %i ES",
+                 i_group, p_pgrm->i_es );
+        return;
+    }
+
+    TAB_REMOVE( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
+
+    /* If program is selected we need to unselect it */
+    if( p_sys->p_pgrm == p_pgrm ) p_sys->p_pgrm = 0;
+
+    if( p_pgrm->psz_now_playing ) free( p_pgrm->psz_now_playing );
+    free( p_pgrm );
+
+    /* Update "program" variable */
+    val.i_int = i_group;
+    var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
+
+    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+}
+
-/* EsOutProgramMeta:
- */
@@ -1012 +1056 @@
-
-    es->p_pgrm->i_es--;
-
-
-
-
-
+
-
-    if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL;
@@ -1504 +1544 @@
-                           fmt->video.i_visible_height);
-       if( fmt->video.i_frame_rate > 0 &&
-   
-   
-           
-           
-           
+        
+        
+                        
+                        
+                        
-        break;
-