summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-08 00:26:51 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-08 00:26:51 +0000
commite1dc488097d28477768617cde168bd8146f834b1 (patch)
tree6852d5c932880f78db264f7eb3657a6a3c69b597 /Gui
parent304379ec71012bffc552685eff621b3906af3c55 (diff)
downloadmpv-e1dc488097d28477768617cde168bd8146f834b1.tar.bz2
mpv-e1dc488097d28477768617cde168bd8146f834b1.tar.xz
Warning fixes (approved by A'rpi).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11413 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/cfg.c1
-rw-r--r--Gui/interface.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/Gui/cfg.c b/Gui/cfg.c
index 27d1888c6d..5fe1decc1b 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -72,6 +72,7 @@ extern char * get_path( char * filename );
extern int flip;
extern int frame_dropping;
extern int stop_xscreensaver;
+extern int m_config_parse_config_file(m_config_t* config, char *conffile);
static m_config_t * gui_conf;
static m_option_t gui_opts[] =
diff --git a/Gui/interface.c b/Gui/interface.c
index 8f4348c3a8..b0502be62c 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -1051,7 +1051,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
return NULL;
case gtkSetExtraStereo:
gtkAOExtraStereoMul=fparam;
- audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul );
+ audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(void *)&gtkAOExtraStereoMul );
return NULL;
case gtkSetPanscan:
{
@@ -1082,7 +1082,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
if ( eq )
{
gtkEquChannels[eq->channel][eq->band]=eq->gain;
- audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)eq );
+ audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)eq );
}
else
{
@@ -1090,7 +1090,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
memset( gtkEquChannels,0,sizeof( gtkEquChannels ) );
for ( i=0;i<6;i++ )
for ( j=0;j<10;j++ )
- { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(int)&tmp ); }
+ { tmp.channel=i; tmp.band=j; audio_plugin_eq.control( AOCONTROL_PLUGIN_EQ_SET_GAIN,(void *)&tmp ); }
}
return NULL;
}