Changeset 0fee43a45c5c05c42ca8da004fc15eba9442970b

Timestamp:

04/03/01 05:39:41 (7 years ago)

Author:

Stéphane Borel <stef@videolan.org>

git-committer:

Stéphane Borel <stef@videolan.org> 986269181 +0000

git-parent:

[8ccd224ce68ba37052c2dfff1d8a34b2c12d32ae]

git-author:

Stéphane Borel <stef@videolan.org> 986269181 +0000

Message:

-Fall back to one-packet-once reading in dvd input since multi-block
seems to have a bug that make the vlc crash on title/audio/spu change. I
hope that this bug will be fixed soon for the performance is poorer now

-add-ons and changes in gnome interface:

*menu subdivision is done only if there are over 20 items,
*in DVD mode next/prev apply to title,
*in DVD mode, added a box with button to navigate through

chapters.

This has not been finished yet (and it is not in gtk plugin then). And I
think I will leave toolbar next/prev buttons for playlist and add
button specifically for title change like for chapters.*

Files:

• plugins/dvd/input_dvd.c (modified) (4 diffs)
• plugins/gnome/gnome_callbacks.c (modified) (4 diffs)
• plugins/gnome/gnome_callbacks.h (modified) (3 diffs)
• plugins/gnome/gnome_interface.c (modified) (3 diffs)
• plugins/gnome/intf_gnome.c (modified) (24 diffs)
• plugins/gnome/intf_gnome.glade (modified) (1 diff)
• plugins/gnome/intf_gnome.h (modified) (3 diffs)
• src/input/input_dec.c (modified) (3 diffs)
• src/input/input_programs.c (modified) (2 diffs)

plugins/dvd/input_dvd.c

@@ -11 +11 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-6 2001/04/02 23:30:41 sam
+7 2001/04/03 03:39:41 stef
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -692 +692 @@
-            input_SelectES( p_input, p_input->stream.pp_es[i_spu] );
-        }
-/ i_title >= 0
+* i_title >= 0 */
-    else
-    {
@@ -748 +748 @@
-    p_dvd->i_fd = p_input->i_handle;
-
-
-
+
+
+
+
+
-
-    i = CSSTest( p_input->i_handle );
@@ -767 +770 @@
-    /* Reading structures initialisation */
-    p_input->p_method_data =
-8192, 16384
+2048, 8192
-    intf_WarnMsg( 2, "dvd info: netlist initialized" );
-

plugins/gnome/gnome_callbacks.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-19 2001/04/01 07:31:38
+20 2001/04/03 03:39:41
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -161 +161 @@
-
-
+void
+on_button_chapter_prev_clicked         (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    intf_thread_t * p_intf;
+    input_area_t *  p_area;
+
+    p_intf = GetIntf( GTK_WIDGET(button), "intf_window" );
+    p_area = p_intf->p_input->stream.p_selected_area;
+
+    if( p_area->i_part - 1 >= 0 )
+    {
+        p_area->i_part--;
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+        input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+    }
+}
+
+
+void
+on_button_chapter_next_clicked         (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    intf_thread_t * p_intf;
+    input_area_t *  p_area;
+
+    p_intf = GetIntf( GTK_WIDGET(button), "intf_window" );
+    p_area = p_intf->p_input->stream.p_selected_area;
+
+    if( p_area->i_part + 1 < p_area->i_part_nb )
+    {
+        p_area->i_part++;
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+        input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+    }
+}
+
+
-/*****************************************************************************
- * Menubar callbacks
@@ -506 +544 @@
-
-
+void
+on_toolbar_prev_title_clicked         (GtkButton       *button,
+                                       gpointer         user_data)
+{
+    intf_thread_t * p_intf;
+    input_area_t *  p_area;
+    int             i_id;
+
+    p_intf = GetIntf( GTK_WIDGET(button), "intf_window" );
+    i_id = p_intf->p_input->stream.p_selected_area->i_id - 1;
+
+    if( i_id >= 0 )
+    {
+        p_area = p_intf->p_input->stream.pp_areas[i_id];
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+        p_intf->p_sys->b_menus_update = 1;
+        input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+    }
+}
+
+
+void
+on_toolbar_next_title_clicked          (GtkButton       *button,
+                                        gpointer         user_data)
+{
+    intf_thread_t * p_intf;
+    input_area_t *  p_area;
+    int             i_id;
+
+    p_intf = GetIntf( GTK_WIDGET(button), "intf_window" );
+    i_id = p_intf->p_input->stream.p_selected_area->i_id + 1;
+
+    if( i_id < p_intf->p_input->stream.i_area_nb )
+    {
+        p_area = p_intf->p_input->stream.pp_areas[i_id];   
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+        p_intf->p_sys->b_menus_update = 1;
+        input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+    }
+}
+
+
-/*****************************************************************************
- * Popup callbacks
@@ -857 +937 @@
-    {
-        psz_method = "dvd";
+        p_intf->p_sys->i_intf_mode = DVD_MODE;
+        p_intf->p_sys->b_mode_changed = 1;
-    }
-    else if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),

plugins/gnome/gnome_callbacks.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-2 2001/03/21 13:42:34 sam
+3 2001/04/03 03:39:41 stef
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -88 +88 @@
-
-void
+on_toolbar_prev_title_clicked          (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_next_title_clicked          (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
-on_popup_play_activate                 (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
@@ -274 +282 @@
-on_menubar_chapter_toggle              (GtkCheckMenuItem     *menuitem,
-                                        gpointer             user_data);
+
+void
+on_button_chapter_prev_clicked         (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_button_chapter_next_clicked         (GtkButton       *button,
+                                        gpointer         user_data);

plugins/gnome/gnome_interface.c

@@ -141 +141 @@
-  GtkWidget *label_bar;
-  GtkWidget *slider;
+  GtkWidget *dvd_box;
+  GtkWidget *label_title;
+  GtkWidget *hbox6;
+  GtkWidget *button_chapter_prev;
+  GtkWidget *label_chapter;
+  GtkWidget *button_chapter_next;
-  GtkWidget *appbar;
+  GtkTooltips *tooltips;
+
+  tooltips = gtk_tooltips_new ();
-
-  intf_window = gnome_app_new ("VideoLAN Client", _("VideoLAN Client"));
@@ -463 +472 @@
-  gtk_scale_set_digits (GTK_SCALE (slider), 3);
-
+  dvd_box = gtk_hbox_new (FALSE, 0);
+  gtk_widget_ref (dvd_box);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "dvd_box", dvd_box,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_box_pack_start (GTK_BOX (vbox2), dvd_box, TRUE, TRUE, 0);
+
+  label_title = gtk_label_new (_("Title:"));
+  gtk_widget_ref (label_title);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "label_title", label_title,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (label_title);
+  gtk_box_pack_start (GTK_BOX (dvd_box), label_title, TRUE, FALSE, 0);
+
+  hbox6 = gtk_hbox_new (FALSE, 10);
+  gtk_widget_ref (hbox6);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "hbox6", hbox6,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (hbox6);
+  gtk_box_pack_start (GTK_BOX (dvd_box), hbox6, TRUE, FALSE, 0);
+
+  button_chapter_prev = gnome_stock_button (GNOME_STOCK_BUTTON_PREV);
+  gtk_widget_ref (button_chapter_prev);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_chapter_prev", button_chapter_prev,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (button_chapter_prev);
+  gtk_box_pack_start (GTK_BOX (hbox6), button_chapter_prev, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, button_chapter_prev, _("Select previous chapter"), NULL);
+  gtk_button_set_relief (GTK_BUTTON (button_chapter_prev), GTK_RELIEF_NONE);
+
+  label_chapter = gtk_label_new (_("Chapter:   "));
+  gtk_widget_ref (label_chapter);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "label_chapter", label_chapter,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (label_chapter);
+  gtk_box_pack_start (GTK_BOX (hbox6), label_chapter, FALSE, FALSE, 0);
+
+  button_chapter_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
+  gtk_widget_ref (button_chapter_next);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_chapter_next", button_chapter_next,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (button_chapter_next);
+  gtk_box_pack_start (GTK_BOX (hbox6), button_chapter_next, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, button_chapter_next, _("Select next chapter"), NULL);
+  gtk_button_set_relief (GTK_BUTTON (button_chapter_next), GTK_RELIEF_NONE);
+
-  appbar = gnome_appbar_new (TRUE, TRUE, GNOME_PREFERENCES_NEVER);
-  gtk_widget_ref (appbar);
@@ -519 +573 @@
-                      GTK_SIGNAL_FUNC (on_slider_button_release_event),
-                      NULL);
+  gtk_signal_connect (GTK_OBJECT (button_chapter_prev), "clicked",
+                      GTK_SIGNAL_FUNC (on_button_chapter_prev_clicked),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (button_chapter_next), "clicked",
+                      GTK_SIGNAL_FUNC (on_button_chapter_next_clicked),
+                      NULL);
+
+  gtk_object_set_data (GTK_OBJECT (intf_window), "tooltips", tooltips);
-
-  return intf_window;

plugins/gnome/intf_gnome.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-4 2001/04/01 07:31:38
+5 2001/04/03 03:39:41
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -50 +50 @@
-#include "intf_msg.h"
-#include "interface.h"
+#include "intf_playlist.h"
-
-#include "gnome_callbacks.h"
@@ -75 +76 @@
-static gint GnomeSetupMenu    ( intf_thread_t * p_intf );
-static void GnomeDisplayDate  ( GtkAdjustment *p_adj );
+static gint GnomeDVDModeManage( intf_thread_t * p_intf );
-
-/*****************************************************************************
@@ -150 +152 @@
-    p_intf->p_sys->b_slider_free = 1;
-
+    p_intf->p_sys->b_mode_changed = 0;
+    p_intf->p_sys->i_intf_mode = FILE_MODE;
+
-    p_intf->p_sys->pf_gtk_callback = NULL;
-    p_intf->p_sys->pf_gdk_callback = NULL;
@@ -199 +204 @@
-    p_intf->p_sys->p_network = create_intf_network( );
-
+    /* Sets the interface mode according to playlist item */
+    if( p_main->p_playlist->p_item != NULL )
+    {
+        if( !strncmp( p_main->p_playlist->p_item->psz_name, "dvd:", 4 ) )
+        {
+            p_intf->p_sys->i_intf_mode = DVD_MODE;
+            p_intf->p_sys->b_mode_changed = 1;
+        }
+    }
+
-    /* Set the title of the main window */
-    gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
@@ -213 +228 @@
-    p_intf->p_sys->p_label_date = P_LABEL( "label_date" );
-    p_intf->p_sys->p_label_status = P_LABEL( "label_status" );
+    p_intf->p_sys->p_label_title = P_LABEL( "label_title" );
+    p_intf->p_sys->p_label_chapter = P_LABEL( "label_chapter" );
-    #undef P_LABEL
-
@@ -296 +313 @@
-        p_intf->b_menu_change = 0;
-    }
+
+    if( p_intf->p_input != NULL && p_intf->p_sys->p_window != NULL &&
+        p_intf->p_sys->b_mode_changed )
+    {
+        switch( p_intf->p_sys->i_intf_mode )
+        {
+            case DVD_MODE:
+                GnomeDVDModeManage( p_intf );
+                break;
+        }
+
+        p_intf->p_sys->b_mode_changed = 0;
+    }
+
-
-    /* Update language/chapter menus after user request */
@@ -446 +477 @@
-                /* don't lose p_item when we append into menu */
-                p_item_active = p_item;
-                gtk_object_ref( GTK_OBJECT( p_item_active ) );
-            }
-
@@ -471 +501 @@
-        gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( p_item_active ),
-                                        TRUE );
-        gtk_object_unref( GTK_OBJECT( p_item_active ) );
-    }
-
@@ -520 +549 @@
-    {
-        /* we group chapters in packets of ten for small screens */
-)// 
+
-        {
-            if( i_chapter != 0 )
@@ -546 +575 @@
-        {
-            p_item_selected = p_item;
-            gtk_object_ref( GTK_OBJECT( p_item_selected ) );
-        }
-        
@@ -557 +585 @@
-                        (gpointer)(i_chapter + 1) );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* link the new menu to the title menu item */
@@ -574 +611 @@
-        gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( p_item_selected ),
-                                        TRUE );
-        gtk_object_unref( GTK_OBJECT( p_item_selected ) );
-    }
-
@@ -612 +648 @@
-    gint                i_title;
-    gint                i_chapter;
-
+
+
-
-    /* cast */
@@ -625 +662 @@
-    p_chapter_menu_item = NULL;
-    p_item_active = NULL;
-
+title_
-
-    /* loop on titles */
-
+title_
-    {
-        /* we group titles in packets of ten for small screens */
-)// && ( i
+ && ( i_title
-        {
-            if( i_title != 1 )
@@ -659 +696 @@
-            {
-                p_item_active = p_title_item;
-                gtk_object_ref( GTK_OBJECT( p_item_active ) );
-            }
-
@@ -679 +715 @@
-            p_title_item = gtk_menu_item_new_with_label( psz_name );
-            p_chapter_menu = gtk_menu_new();
+            i_chapter_nb =
+                    p_intf->p_input->stream.pp_areas[i_title]->i_part_nb;
-    
-
-
-
-
+
-            {
-                /* we group chapters in packets of ten for small screens */
-)// && ( i
+&& ( i_chapter
-                {
-                    if( i_chapter != 0 )
@@ -717 +752 @@
-                {
-                    p_item_active = p_item;
-                    gtk_object_ref( GTK_OBJECT( p_item_active ) );
-                }
-
@@ -726 +760 @@
-                           (gpointer)( ( i_title * 100 ) + ( i_chapter + 1) ) );
-
-
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
+
+
+
+
+
+
-
-            /* link the new menu to the title menu item */
@@ -745 +790 @@
-        gtk_widget_show( p_title_item );
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* be sure that menu is sensitive */
@@ -762 +817 @@
-        gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( p_item_active ),
-                                        TRUE );
-        gtk_object_unref( GTK_OBJECT( p_item_active ) );
-    }
-
@@ -780 +834 @@
-    GtkWidget *         p_popup_menu;
-    gint                i;
-
-    vlc_mutex_lock( &p_intf->p_input->stream.stream_lock );
-
-    if( p_intf->p_input->stream.i_area_nb > 1 )
@@ -815 +867 @@
-    }
-
-    vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock );
-
-    /* audio menus */
-
@@ -880 +930 @@
-
-
+/*****************************************************************************
+ * GnomeDVDModeManage
+ *****************************************************************************/
+static gint GnomeDVDModeManage( intf_thread_t * p_intf )
+{
+    GtkWidget *     p_dvd_box;
+    GtkWidget *     p_toolbar_next;
+    GtkWidget *     p_toolbar_prev;
+
+    p_dvd_box = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
+                 p_intf->p_sys->p_window ), "dvd_box" ) );
+    gtk_widget_show( GTK_WIDGET( p_dvd_box ) );
+
+    p_toolbar_next = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
+                 p_intf->p_sys->p_window ), "toolbar_next" ) );
+    gtk_signal_disconnect_by_data( GTK_OBJECT( p_toolbar_next ), NULL );
+    gtk_signal_connect( GTK_OBJECT( p_toolbar_next ), "clicked",
+                        GTK_SIGNAL_FUNC( on_toolbar_next_title_clicked ),
+                        NULL);
+
+    p_toolbar_prev = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
+                 p_intf->p_sys->p_window ), "toolbar_prev" ) );
+    gtk_signal_disconnect_by_data( GTK_OBJECT( p_toolbar_prev ), NULL );
+    gtk_signal_connect( GTK_OBJECT( p_toolbar_prev ), "clicked",
+                        GTK_SIGNAL_FUNC( on_toolbar_prev_title_clicked ),
+                        NULL);
+
+    return TRUE;
+}
+

plugins/gnome/intf_gnome.glade

@@ -581 +581 @@
-      <fill>True</fill>
-    </child>
+      </widget>
+
+      <widget>
+    <class>GtkHBox</class>
+    <name>dvd_box</name>
+    <visible>False</visible>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+    <child>
+      <padding>0</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
+
+    <widget>
+      <class>GtkLabel</class>
+      <name>label_title</name>
+      <label>Title:</label>
+      <justify>GTK_JUSTIFY_CENTER</justify>
+      <wrap>False</wrap>
+      <xalign>0.5</xalign>
+      <yalign>0.5</yalign>
+      <xpad>0</xpad>
+      <ypad>0</ypad>
+      <child>
+        <padding>0</padding>
+        <expand>True</expand>
+        <fill>False</fill>
+      </child>
+    </widget>
+
+    <widget>
+      <class>GtkHBox</class>
+      <name>hbox6</name>
+      <homogeneous>False</homogeneous>
+      <spacing>10</spacing>
+      <child>
+        <padding>0</padding>
+        <expand>True</expand>
+        <fill>False</fill>
+      </child>
+
+      <widget>
+        <class>GtkButton</class>
+        <name>button_chapter_prev</name>
+        <tooltip>Select previous chapter</tooltip>
+        <can_focus>True</can_focus>
+        <signal>
+          <name>clicked</name>
+          <handler>on_button_chapter_prev_clicked</handler>
+          <last_modification_time>Tue, 03 Apr 2001 00:53:47 GMT</last_modification_time>
+        </signal>
+        <stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
+        <relief>GTK_RELIEF_NONE</relief>
+        <child>
+          <padding>0</padding>
+          <expand>False</expand>
+          <fill>False</fill>
+        </child>
+      </widget>
+
+      <widget>
+        <class>GtkLabel</class>
+        <name>label_chapter</name>
+        <label>Chapter:   </label>
+        <justify>GTK_JUSTIFY_CENTER</justify>
+        <wrap>False</wrap>
+        <xalign>0.5</xalign>
+        <yalign>0.5</yalign>
+        <xpad>0</xpad>
+        <ypad>0</ypad>
+        <child>
+          <padding>0</padding>
+          <expand>False</expand>
+          <fill>False</fill>
+        </child>
+      </widget>
+
+      <widget>
+        <class>GtkButton</class>
+        <name>button_chapter_next</name>
+        <tooltip>Select next chapter</tooltip>
+        <can_focus>True</can_focus>
+        <signal>
+          <name>clicked</name>
+          <handler>on_button_chapter_next_clicked</handler>
+          <last_modification_time>Tue, 03 Apr 2001 00:53:40 GMT</last_modification_time>
+        </signal>
+        <stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
+        <relief>GTK_RELIEF_NONE</relief>
+        <child>
+          <padding>0</padding>
+          <expand>False</expand>
+          <fill>False</fill>
+        </child>
+      </widget>
+    </widget>
-      </widget>
-    </widget>

plugins/gnome/intf_gnome.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-4 2001/04/01 07:31:38
+5 2001/04/03 03:39:41
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -27 +27 @@
-#define DROP_ACCEPT_TEXT_URI_LIST  0
-#define DROP_ACCEPT_TEXT_PLAIN     1
+
+/*****************************************************************************
+ * interface modes
+ *****************************************************************************/
+#define FILE_MODE   0
+#define NET_MODE    1
+#define DVD_MODE    2
+#define VCD_MODE    3
-
-/*****************************************************************************
@@ -58 +66 @@
-    GtkLabel *          p_label_date;
-    GtkLabel *          p_label_status;
+    GtkLabel *          p_label_title;
+    GtkLabel *          p_label_chapter;
+
+    /* input mode management */
+    boolean_t           b_mode_changed;
+    gint                i_intf_mode;      /* interface mode: file, net, disc */
-
-    /* XXX: Ugly kludge, see intf_gnome.c */

src/input/input_dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-8 2001/02/08 13:52:35 massiot
+9 2001/04/03 03:39:41 stef
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -71 +71 @@
-
-    /* Waiting for the thread to exit */
+    /* I thought that unlocking was better since thread join can be long
+     * but it actually creates late pictures and freezes --stef */
+//    vlc_mutex_unlock( &p_input->stream.stream_lock );
-    vlc_thread_join( p_es->thread_id );
+//    vlc_mutex_lock( &p_input->stream.stream_lock );
-
-    /* Freeing all packets still in the decoder fifo. */
@@ -112 +116 @@
-        p_decoder_fifo->pf_delete_pes( p_decoder_fifo->p_packets_mgt,
-                                       p_pes );
-
+decoder 
-    }
-    vlc_mutex_unlock( &p_decoder_fifo->data_lock );

src/input/input_programs.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-2 2001/04/01 07:31:38
+3 2001/04/03 03:39:41
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -731 +731 @@
-        {
-            intf_ErrMsg( "No more selected ES in input_UnselectES" );
-            vlc_mutex_unlock( &p_input->stream.stream_lock );
-            return( 1 );
-        }