[MPlayer-cvslog] r32201 - in trunk/gui: cfg.c interface.c mplayer/gtk/opts.c

[diego]

Author: diego
Date: Sun Sep 12 17:38:21 2010
New Revision: 32201

Log:
Remove libavcodec ifdeffery from the GUI code.
The GUI depends on libavcodec, so the #ifdefs are unneeded.

Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/mplayer/gtk/opts.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Sun Sep 12 17:35:41 2010	(r32200)
+++ trunk/gui/cfg.c	Sun Sep 12 17:38:21 2010	(r32201)
@@ -49,9 +49,7 @@
 int    gtkEnableAudioEqualizer = 0;
 
 int    gtkVfPP = 0;
-#ifdef CONFIG_LIBAVCODEC
- int    gtkVfLAVC = 0;
-#endif
+int    gtkVfLAVC = 0;
 
 int    gtkAONorm = 0;
 int    gtkAOSurround = 0;
@@ -124,9 +122,7 @@ static const m_option_t gui_opts[] =
 
  { "vf_pp",&gtkVfPP,CONF_TYPE_FLAG,0,0,1,NULL },
  { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL },
-#ifdef CONFIG_LIBAVCODEC
  { "vf_lavc",&gtkVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
-#endif
 
  { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "ao_volnorm",&gtkAONorm,CONF_TYPE_FLAG,0,0,1,NULL },

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Sep 12 17:35:41 2010	(r32200)
+++ trunk/gui/interface.c	Sun Sep 12 17:38:21 2010	(r32201)
@@ -659,11 +659,7 @@ int guiGetEvent( int type,void * arg )
 	 }
 // -- subtitle
 #ifdef CONFIG_DXR3
-	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
-#ifdef CONFIG_LIBAVCODEC
-	 && !gtkVfLAVC
-#endif
-	 )
+	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVfLAVC )
 	 {
 	  gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVC );
 	  guiIntfStruct.Playing=0;
@@ -748,16 +744,12 @@ int guiGetEvent( int type,void * arg )
 	}
 
 #ifdef CONFIG_DXR3
-#ifdef CONFIG_LIBAVCODEC
 	remove_vf( "lavc" );
-#endif
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) )
 	 {
 	  if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
 	   {
-#ifdef CONFIG_LIBAVCODEC
 	    if ( gtkVfLAVC ) add_vf( "lavc" );
-#endif
 	   }
 	 }
 #endif

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Sun Sep 12 17:35:41 2010	(r32200)
+++ trunk/gui/mplayer/gtk/opts.c	Sun Sep 12 17:38:21 2010	(r32201)
@@ -1718,9 +1718,7 @@ static GtkWidget * DXR3Config;
 static GtkWidget * CBDevice;
 static GtkWidget * CEDXR3Device;
 static GtkWidget * RBVNone;
-#ifdef CONFIG_LIBAVCODEC
- static GtkWidget * RBVLavc;
-#endif
+static GtkWidget * RBVLavc;
 static GtkWidget * dxr3BOk;
 static GtkWidget * dxr3BCancel;
 
@@ -1734,9 +1732,7 @@ void ShowDXR3Config( void )
  gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device );
 
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVNone ),TRUE );
-#ifdef CONFIG_LIBAVCODEC
  if ( gtkVfLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE );
-#endif
 
  gtk_widget_show( DXR3Config );
  gtkSetLayer( DXR3Config );
@@ -1756,9 +1752,7 @@ static void dxr3Button( GtkButton * butt
  {
   case 0: // Ok
        gfree( (void **)&gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) );
-#ifdef CONFIG_LIBAVCODEC
        gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
-#endif
   case 1: // Cancel
        HideDXR3Config();
        break;
@@ -1811,13 +1805,11 @@ GtkWidget * create_DXR3Config( void )
  gtk_widget_show( CEDXR3Device );
  gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" );
 
-#ifdef CONFIG_LIBAVCODEC
  AddHSeparator( vbox2 );
  vbox3=AddVBox( vbox2,0 );
  AddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 );
  RBVNone=AddRadioButton( MSGTR_PREFERENCES_None,&VEncoder_group,vbox3 );
  RBVLavc=AddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 );
-#endif
 
  AddHSeparator( vbox1 );