X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fgtk%2Fmenu.c;h=d18d0a6df816eab41a08cd1f26672e6dfcb14872;hb=5ca0ebcca2e3f55a1087811048684a3b9b1eecbf;hp=c2e5cfe94854222ea67303314a1e83c531bf11a5;hpb=95b4a56a03d74780366bbf13cf12e834f84e3a2c;p=vlc

diff --git a/modules/gui/gtk/menu.c b/modules/gui/gtk/menu.c
index c2e5cfe948..d18d0a6df8 100644
--- a/modules/gui/gtk/menu.c
+++ b/modules/gui/gtk/menu.c
@@ -2,9 +2,9 @@
  * menu.c : functions to handle menu items.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: menu.c,v 1.10 2003/05/05 22:23:38 gbazin Exp $
+ * $Id: menu.c,v 1.13 2003/12/22 14:32:56 sam Exp $
  *
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 #include <vlc/intf.h>
 #include <vlc/aout.h>
 #include <vlc/vout.h>
@@ -397,7 +398,7 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
         for( i = 0 ; i < p_intf->p_sys->p_input->stream.i_es_number ; i++ )
         {
             if( ( ES->i_cat == VIDEO_ES ) &&
-                    ES->p_decoder_fifo != NULL )
+                    ES->p_dec != NULL )
             {
                 input_UnselectES( p_intf->p_sys->p_input, ES );
                 input_SelectES( p_intf->p_sys->p_input, ES );
@@ -410,19 +411,19 @@ static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
     if( strcmp( psz_mode, "None" ) )
     {
         vout_thread_t *p_vout;
-	p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-				  FIND_ANYWHERE );
-	if( p_vout )
-	{
-	    vlc_value_t val;
-
-	    val.psz_string = psz_mode;
-	    if( var_Set( p_vout, "deinterlace-mode", val ) != VLC_SUCCESS )
+        p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+                                  FIND_ANYWHERE );
+        if( p_vout )
+        {
+            vlc_value_t val;
+
+            val.psz_string = psz_mode;
+            if( var_Set( p_vout, "deinterlace-mode", val ) != VLC_SUCCESS )
                 config_PutPsz( p_intf, "deinterlace-mode", psz_mode );
 
-	    vlc_object_release( p_vout );
-	}
-	else
+            vlc_object_release( p_vout );
+        }
+        else
             config_PutPsz( p_intf, "deinterlace-mode", psz_mode );
 
     }
@@ -1166,7 +1167,7 @@ static gint GtkSetupVarMenu( intf_thread_t * p_intf,
             break;
         default:
             /* FIXME */
-	    return FALSE;
+            return FALSE;
         }
 
         p_group = gtk_radio_menu_item_group( GTK_RADIO_MENU_ITEM( p_item ) );