diff options
author | 2006-12-02 17:29:56 +0000 | |
---|---|---|
committer | 2006-12-02 17:29:56 +0000 | |
commit | d45ebc8feaba4cc992222c9a7e47bf614941ffe3 (patch) | |
tree | 9013a48aaffe79d64c926627be965d15634d3d5e /Gui/interface.c | |
parent | 7a3457baea0f7d2e0cc10896174d56705441121c (diff) |
Replace deprecated vo_plugin_args by vf_settings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21445 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r-- | Gui/interface.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 2e85fa086f..33f06b5ff8 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -423,7 +423,7 @@ extern vo_functions_t * video_out; extern int frame_dropping; extern int stream_dump_type; extern int vcd_track; -extern m_obj_settings_t*vo_plugin_args; +extern m_obj_settings_t * vf_settings; void guiLoadFont( void ) { @@ -517,33 +517,33 @@ void guiLoadSubtitle( char * name ) static void add_vf( char * str ) { mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_AddingVideoFilter,str ); - if ( vo_plugin_args ) + if ( vf_settings ) { int i = 0; - while ( vo_plugin_args[i].name ) if ( !gstrcmp( vo_plugin_args[i++].name,str ) ) { i=-1; break; } + while ( vf_settings[i].name ) if ( !gstrcmp( vf_settings[i++].name,str ) ) { i=-1; break; } if ( i != -1 ) - { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( m_obj_settings_t ) ); vo_plugin_args[i].name=strdup( str );vo_plugin_args[i].attribs = NULL; vo_plugin_args[i+1].name=NULL; } - } 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; } + { vf_settings=realloc( vf_settings,( i + 2 ) * sizeof( m_obj_settings_t ) ); vf_settings[i].name=strdup( str );vf_settings[i].attribs = NULL; vf_settings[i+1].name=NULL; } + } else { vf_settings=malloc( 2 * sizeof( m_obj_settings_t ) ); vf_settings[0].name=strdup( str );vf_settings[0].attribs = NULL; vf_settings[1].name=NULL; } } static void remove_vf( char * str ) { int n = 0; - if ( !vo_plugin_args ) return; + if ( !vf_settings ) return; mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_RemovingVideoFilter,str ); - while ( vo_plugin_args[n++].name ); n--; + while ( vf_settings[n++].name ); n--; if ( n > -1 ) { int i = 0,m = -1; - while ( vo_plugin_args[i].name ) if ( !gstrcmp( vo_plugin_args[i++].name,str ) ) { m=i - 1; break; } + while ( vf_settings[i].name ) if ( !gstrcmp( vf_settings[i++].name,str ) ) { m=i - 1; break; } i--; if ( m > -1 ) { - if ( n == 1 ) { free( vo_plugin_args[0].name );free( vo_plugin_args[0].attribs ); free( vo_plugin_args ); vo_plugin_args=NULL; } - else { free( vo_plugin_args[i].name );free( vo_plugin_args[i].attribs ); memcpy( &vo_plugin_args[i],&vo_plugin_args[i + 1],( n - i ) * sizeof( m_obj_settings_t ) ); } + if ( n == 1 ) { free( vf_settings[0].name );free( vf_settings[0].attribs ); free( vf_settings ); vf_settings=NULL; } + else { free( vf_settings[i].name );free( vf_settings[i].attribs ); memcpy( &vf_settings[i],&vf_settings[i + 1],( n - i ) * sizeof( m_obj_settings_t ) ); } } } } |