From 7a3457baea0f7d2e0cc10896174d56705441121c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 2 Dec 2006 17:24:17 +0000 Subject: [PATCH] cosmetics: Rename functions and variable names from vop to vf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21444 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/cfg.c | 8 ++++---- Gui/cfg.h | 4 ++-- Gui/interface.c | 14 +++++++------- Gui/mplayer/gtk/opts.c | 8 ++++---- Gui/win32/interface.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Gui/cfg.c b/Gui/cfg.c index e380de905c..f12ce3a422 100644 --- a/Gui/cfg.c +++ b/Gui/cfg.c @@ -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 @@ static m_option_t gui_opts[] = { "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",>kVopPP,CONF_TYPE_FLAG,0,0,1,NULL }, + { "vf_pp",>kVfPP,CONF_TYPE_FLAG,0,0,1,NULL }, { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL }, #ifdef USE_LIBAVCODEC - { "vf_lavc",>kVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL }, + { "vf_lavc",>kVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL }, #endif { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, diff --git a/Gui/cfg.h b/Gui/cfg.h index afc4b74033..f78e983524 100644 --- a/Gui/cfg.h +++ b/Gui/cfg.h @@ -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; diff --git a/Gui/interface.c b/Gui/interface.c index a92254fde8..2e85fa086f 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -514,7 +514,7 @@ void guiLoadSubtitle( char * name ) } -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 @@ static void add_vop( char * str ) } 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 @@ int guiGetEvent( int type,char * arg ) #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 @@ int guiGetEvent( int type,char * arg ) #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; } diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 25a86f2c09..286cc1498e 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -366,7 +366,7 @@ void ShowPreferences( void ) } // --- 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 @@ void prButton( GtkButton * button,gpointer user_data ) } // --- 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 @@ void ShowDXR3Config( void ) 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 @@ static void dxr3Button( GtkButton * button,gpointer user_data ) case 0: // Ok gfree( (void **)>kDXR3Device ); 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(); diff --git a/Gui/win32/interface.c b/Gui/win32/interface.c index 0da169da87..a157243872 100644 --- a/Gui/win32/interface.c +++ b/Gui/win32/interface.c @@ -480,7 +480,7 @@ void guiDone(void) 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 add_vop(char * str) } } -static void remove_vop(char * str) +static void remove_vf(char * str) { int n = 0; if (!vo_plugin_args ) return;