RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 05:15:12 +00:00
Code Issues Releases Wiki Activity

Replace deprecated vo_plugin_args by vf_settings.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21445 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-12-02 17:29:56 +00:00
parent 7a3457baea
commit d45ebc8fea
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Gui/interface.c
View File

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

46
Gui/win32/interface.c
View File

@ -42,7 +42,7 @@
#include <cdio/cdio.h>
#endif
extern m_obj_settings_t* vo_plugin_args;
extern m_obj_settings_t *vf_settings;
extern vo_functions_t *video_out;
extern ao_functions_t *audio_out;
extern void exit_player(const char *how);
@ -483,46 +483,46 @@ void guiDone(void)
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 (!strcmp(vo_plugin_args[i++].name, str))
while (vf_settings[i].name)
if (!strcmp(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;
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
{
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 = 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);
while (vf_settings[n++].name);
n--;
if ( n > -1 )
{
int i = 0, m = -1;
while (vo_plugin_args[i].name)
if (!strcmp(vo_plugin_args[i++].name, str))
while (vf_settings[i].name)
if (!strcmp(vf_settings[i++].name, str))
{
m = i - 1;
break;
@ -532,16 +532,16 @@ static void remove_vf(char * str)
{
if (n == 1)
{
free(vo_plugin_args[0].name);
free(vo_plugin_args[0].attribs);
free(vo_plugin_args);
vo_plugin_args=NULL;
free(vf_settings[0].name);
free(vf_settings[0].attribs);
free(vf_settings);
vf_settings=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));
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));
}
}
}