diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-21 19:14:49 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-21 19:14:49 +0000 |
commit | e65e0651d5fb3b5de97426d1ae7364eda7839bdb (patch) | |
tree | 1692abb4888a234f61144885af44eaf6c42ef402 /Gui/mplayer | |
parent | 122cd3e7068e5f0fea9a624ff308e52e91f8419d (diff) | |
download | mpv-e65e0651d5fb3b5de97426d1ae7364eda7839bdb.tar.bz2 mpv-e65e0651d5fb3b5de97426d1ae7364eda7839bdb.tar.xz |
Fix GUI compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22304 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/common.c | 5 | ||||
-rw-r--r-- | Gui/mplayer/gtk/menu.c | 9 | ||||
-rw-r--r-- | Gui/mplayer/mw.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Gui/mplayer/common.c b/Gui/mplayer/common.c index 40bbc3f98b..e337981e2a 100644 --- a/Gui/mplayer/common.c +++ b/Gui/mplayer/common.c @@ -30,8 +30,6 @@ #include "play.h" #include "widgets.h" -extern mixer_t mixer; // mixer from mplayer.c - extern unsigned int GetTimerMS( void ); inline void TranslateFilename( int c,char * tmp,size_t tmplen ) @@ -83,6 +81,7 @@ inline void TranslateFilename( int c,char * tmp,size_t tmplen ) /* Unsafe! Pass only null-terminated strings as (char *)str. */ char * Translate( char * str ) { + mixer_t *mixer = mpctx_get_mixer(guiIntfStruct.mpcontext); static char trbuf[512]; char tmp[512]; int i,c; @@ -145,7 +144,7 @@ calclengthmmmmss: case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break; case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break; case 'a': - if ( mixer.muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; } + if ( mixer->muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; } switch ( guiIntfStruct.AudioType ) { case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break; diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 10b8bb6bce..df4ed1d35c 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -6,6 +6,7 @@ #include "../../config.h" #include "../../help_mp.h" #include "../../mplayer.h" +#include "../../access_mpcontext.h" #include "../../mixer.h" #include "../app.h" @@ -61,8 +62,6 @@ #include "../pixmaps/playvcd.xpm" #endif -extern mixer_t mixer; // mixer from mplayer.c - void ActivateMenuItem( int Item ) { // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 ); @@ -378,7 +377,6 @@ const char * GetLanguage( int language ) return NULL; } -extern int global_sub_size; GtkWidget * DVDSubMenu; GtkWidget * DVDTitleMenu; @@ -400,6 +398,9 @@ GtkWidget * create_PopUpMenu( void ) Menu=gtk_menu_new(); gtk_widget_realize (Menu); window1 = gtk_widget_get_toplevel(Menu); + mixer_t *mixer = mpctx_get_mixer(guiIntfStruct.mpcontext); + int global_sub_size = mpctx_get_global_sub_size(guiIntfStruct.mpcontext); + AddMenuItem( window1, (const char*)ab_xpm, Menu,MSGTR_MENU_AboutMPlayer" ", evAbout ); AddSeparator( Menu ); @@ -590,7 +591,7 @@ GtkWidget * create_PopUpMenu( void ) } AddSeparator( Menu ); - MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_MENU_Mute,mixer.muted,evMute ); + MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_MENU_Mute,mixer->muted,evMute ); if ( !guiIntfStruct.AudioType ) gtk_widget_set_sensitive( MenuItem,FALSE ); AddMenuItem( window1, (const char*)pl_xpm, Menu,MSGTR_MENU_PlayList, evPlayList ); AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser ); diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 96445298bf..ec00f2e09c 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -21,6 +21,7 @@ #include "../mixer.h" #include "../libvo/sub.h" #include "../mplayer.h" +#include "../access_mpcontext.h" #include "../libmpdemux/demuxer.h" #include "../libmpdemux/stheader.h" @@ -33,8 +34,6 @@ #include "play.h" #include "widgets.h" -extern mixer_t mixer; // mixer from mplayer.c - extern unsigned int GetTimerMS( void ); unsigned char * mplDrawBuffer = NULL; @@ -80,6 +79,7 @@ static unsigned last_redraw_time = 0; void mplEventHandling( int msg,float param ) { int iparam = (int)param; + mixer_t *mixer = mpctx_get_mixer(guiIntfStruct.mpcontext); switch( msg ) { @@ -108,7 +108,7 @@ void mplEventHandling( int msg,float param ) goto play; case evSetSubtitle: - mp_property_do("sub",M_PROPERTY_SET,&iparam); + mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); break; #ifdef HAVE_VCD @@ -247,7 +247,7 @@ NoPause: case evIncVolume: vo_x11_putkey( wsGrayMul ); break; case evDecVolume: vo_x11_putkey( wsGrayDiv ); break; - case evMute: mixer_mute( &mixer ); break; + case evMute: mixer_mute( mixer ); break; case evSetVolume: guiIntfStruct.Volume=param; @@ -261,7 +261,7 @@ set_volume: if ( l > guiIntfStruct.Volume ) l=guiIntfStruct.Volume; if ( r > guiIntfStruct.Volume ) r=guiIntfStruct.Volume; // printf( "!!! v: %.2f b: %.2f -> %.2f x %.2f\n",guiIntfStruct.Volume,guiIntfStruct.Balance,l,r ); - mixer_setvolume( &mixer,l,r ); + mixer_setvolume( mixer,l,r ); } if ( osd_level ) { |