changeset 21428:47cc96df63d0

cosmetics: Rename functions and variable names from vop to vf.

--- a/Gui/cfg.c	Sat Dec 02 17:04:01 2006 +0000
+++ b/Gui/cfg.c	Sat Dec 02 17:24:17 2006 +0000
@@ -22,9 +22,9 @@
 
 int    gtkEnableAudioEqualizer = 0;
 
-int    gtkVopPP = 0;
+int    gtkVfPP = 0;
 #ifdef USE_LIBAVCODEC
- int    gtkVopLAVC = 0;
+ int    gtkVfLAVC = 0;
 #endif
 
 int    gtkAONorm = 0;
@@ -102,10 +102,10 @@
  { "v_vfm",&video_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "a_afm",&audio_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
 
- { "vf_pp",&gtkVopPP,CONF_TYPE_FLAG,0,0,1,NULL },
+ { "vf_pp",&gtkVfPP,CONF_TYPE_FLAG,0,0,1,NULL },
  { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL },
 #ifdef USE_LIBAVCODEC
- { "vf_lavc",&gtkVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
+ { "vf_lavc",&gtkVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
 #endif
 
  { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },

--- a/Gui/cfg.h	Sat Dec 02 17:04:01 2006 +0000
+++ b/Gui/cfg.h	Sat Dec 02 17:24:17 2006 +0000
@@ -4,8 +4,8 @@
 
 extern int gtkEnableAudioEqualizer;
 
-extern int    gtkVopPP;
-extern int    gtkVopLAVC;
+extern int    gtkVfPP;
+extern int    gtkVfLAVC;
 
 extern int    gtkAONorm;
 extern int    gtkAOFakeSurround;

--- a/Gui/interface.c	Sat Dec 02 17:04:01 2006 +0000
+++ b/Gui/interface.c	Sat Dec 02 17:24:17 2006 +0000
@@ -514,7 +514,7 @@
 
 }
 
-static void add_vop( char * str )
+static void add_vf( char * str )
 {
  mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_AddingVideoFilter,str );
  if ( vo_plugin_args )
@@ -526,7 +526,7 @@
   } else { vo_plugin_args=malloc( 2 * sizeof(  m_obj_settings_t ) ); vo_plugin_args[0].name=strdup( str );vo_plugin_args[0].attribs = NULL; vo_plugin_args[1].name=NULL; }
 }
 
-static void remove_vop( char * str )
+static void remove_vf( char * str )
 {
  int n = 0;
 
@@ -724,7 +724,7 @@
 #ifdef HAVE_DXR3
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
 #ifdef USE_LIBAVCODEC
-	 && !gtkVopLAVC
+	 && !gtkVfLAVC
 #endif
 	 )
 	 {
@@ -812,21 +812,21 @@
 
 #ifdef HAVE_DXR3
 #ifdef USE_LIBAVCODEC
-	remove_vop( "lavc" );
+	remove_vf( "lavc" );
 #endif
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) )
 	 {
 	  if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
 	   {
 #ifdef USE_LIBAVCODEC
-	    if ( gtkVopLAVC ) add_vop( "lavc" );
+	    if ( gtkVfLAVC ) add_vf( "lavc" );
 #endif
 	   }
 	 }
 #endif
 // ---	 
-	if ( gtkVopPP ) add_vop( "pp" );
-	 else remove_vop( "pp" );
+	if ( gtkVfPP ) add_vf( "pp" );
+	 else remove_vf( "pp" );
 		 
 // --- audio opts
 //	if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }

--- a/Gui/mplayer/gtk/opts.c	Sat Dec 02 17:04:01 2006 +0000
+++ b/Gui/mplayer/gtk/opts.c	Sat Dec 02 17:24:17 2006 +0000
@@ -366,7 +366,7 @@
  }
 
 // --- 6. page
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVopPP );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),gtkShowVideoWindow );
@@ -595,7 +595,7 @@
 	}
 
 	// --- 6. page
-	gtkVopPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); 
+	gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); 
 	gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
 	gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
 	gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
@@ -1704,7 +1704,7 @@
 
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVNone ),TRUE );
 #ifdef USE_LIBAVCODEC
- if ( gtkVopLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE );
+ if ( gtkVfLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE );
 #endif
 
  gtk_widget_show( DXR3Config );
@@ -1726,7 +1726,7 @@
   case 0: // Ok
        gfree( (void **)&gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) );
 #ifdef USE_LIBAVCODEC
-       gtkVopLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
+       gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
 #endif
   case 1: // Cancel
        HideDXR3Config();

--- a/Gui/win32/interface.c	Sat Dec 02 17:04:01 2006 +0000
+++ b/Gui/win32/interface.c	Sat Dec 02 17:24:17 2006 +0000
@@ -480,7 +480,7 @@
     cfg_write();
 }
 
-static void add_vop(char * str)
+static void add_vf(char * str)
 {
     mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_AddingVideoFilter, str);
     if (vo_plugin_args)
@@ -509,7 +509,7 @@
     }
 }
 
-static void remove_vop(char * str)
+static void remove_vf(char * str)
 {
     int n = 0;
     if (!vo_plugin_args ) return;