diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
| commit | 544233bded74186eca2498e202ed82003c5e04be (patch) | |
| tree | f6360316ae6a9a2b01bac7ff6494ee94bd655cf2 /Gui | |
| parent | 6982f81d903afe3838cd743d5f0b50e10be2f2cc (diff) | |
| download | mpv-544233bded74186eca2498e202ed82003c5e04be.tar.bz2 mpv-544233bded74186eca2498e202ed82003c5e04be.tar.xz | |
Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 7 | ||||
| -rw-r--r-- | Gui/mplayer/mw.c | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index ac8597f95b..f7909be4d6 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -407,13 +407,6 @@ void ShowPreferences( void ) gtk_widget_set_sensitive( SBASSBottomMargin,FALSE ); #endif -#ifndef USE_OSD - gtk_widget_set_sensitive( RBOSDNone,FALSE ); - gtk_widget_set_sensitive( RBOSDTandP,FALSE ); - gtk_widget_set_sensitive( RBOSDIndicator,FALSE ); - gtk_widget_set_sensitive( RBOSDTPTT,FALSE ); -#endif - // -- signals gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 ); diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 34450f22be..96445298bf 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -263,7 +263,6 @@ set_volume: // printf( "!!! v: %.2f b: %.2f -> %.2f x %.2f\n",guiIntfStruct.Volume,guiIntfStruct.Balance,l,r ); mixer_setvolume( &mixer,l,r ); } -#ifdef USE_OSD if ( osd_level ) { osd_visible=(GetTimerMS() + 1000) | 1; @@ -271,7 +270,6 @@ set_volume: vo_osd_progbar_value=( ( guiIntfStruct.Volume ) * 256.0 ) / 100.0; vo_osd_changed( OSDTYPE_PROGBAR ); } -#endif break; |