RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2006-12-02 17:24:17 +00:00
parent ac93dafe54
commit 7a3457baea
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gui/cfg.c
View File

@ -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",&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 },

4
Gui/cfg.h
View File

@ -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;

14
Gui/interface.c
View File

@ -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; }

8
Gui/mplayer/gtk/opts.c
View File

@ -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 **)&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();

4
Gui/win32/interface.c
View File

@ -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;