diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 20:48:17 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 20:48:17 +0000 |
commit | 2b50b7ddab6524345ace4e75a0b476bedf3a9c8a (patch) | |
tree | b628dffa4b7e470d2400efe716ff736abca2b846 /Gui | |
parent | 033fc8c6dd130df730215da4f2f78033153f3033 (diff) | |
download | mpv-2b50b7ddab6524345ace4e75a0b476bedf3a9c8a.tar.bz2 mpv-2b50b7ddab6524345ace4e75a0b476bedf3a9c8a.tar.xz |
Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/interface.c | 10 | ||||
-rw-r--r-- | Gui/mplayer/gtk/fs.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/gtk/opts.c | 18 | ||||
-rw-r--r-- | Gui/win32/dialogs.c | 4 | ||||
-rw-r--r-- | Gui/win32/gui.c | 8 | ||||
-rw-r--r-- | Gui/win32/gui.h | 2 | ||||
-rw-r--r-- | Gui/win32/interface.c | 2 |
7 files changed, 0 insertions, 48 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index a05458f613..d642c33e20 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -380,9 +380,7 @@ void guiInit( void ) if ( filename ) mplSetFileName( NULL,filename,STREAMTYPE_FILE ); if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE ); if ( subdata ) guiSetFilename( guiIntfStruct.Subtitlename, subdata->filename ); -#if defined( USE_OSD ) || defined( USE_SUB ) guiLoadFont(); -#endif } void guiDone( void ) @@ -427,7 +425,6 @@ extern int stream_dump_type; extern int vcd_track; extern m_obj_settings_t*vo_plugin_args; -#if defined( USE_OSD ) || defined( USE_SUB ) void guiLoadFont( void ) { #ifdef HAVE_FREETYPE @@ -469,9 +466,7 @@ void guiLoadFont( void ) } #endif } -#endif -#ifdef USE_SUB extern mp_osd_obj_t* vo_osd_list; extern char **sub_name; @@ -518,7 +513,6 @@ void guiLoadSubtitle( char * name ) update_set_of_subtitles(); } -#endif static void add_vop( char * str ) { @@ -905,16 +899,12 @@ int guiGetEvent( int type,char * arg ) } #endif // -- subtitle -#ifdef USE_SUB //subdata->filename=gstrdup( guiIntfStruct.Subtitlename ); stream_dump_type=0; if ( gtkSubDumpMPSub ) stream_dump_type=4; if ( gtkSubDumpSrt ) stream_dump_type=6; gtkSubDumpMPSub=gtkSubDumpSrt=0; -#endif -#if defined( USE_OSD ) || defined( USE_SUB ) guiLoadFont(); -#endif // --- misc if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index 714ea7b4b1..17801ed5eb 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -496,12 +496,10 @@ void fs_Ok_released( GtkButton * button,gpointer user_data ) gfree( (void **)&guiIntfStruct.Subtitlename ); fs_PersistantHistory( fsSelectedDirectory ); //totem, write into history break; -#ifdef USE_SUB case fsSubtitleSelector: guiSetDF( guiIntfStruct.Subtitlename,fsSelectedDirectory,fsSelectedFile ); guiLoadSubtitle( guiIntfStruct.Subtitlename ); break; -#endif case fsOtherSelector: guiSetDF( guiIntfStruct.Othername,fsSelectedDirectory,fsSelectedFile ); break; @@ -510,9 +508,7 @@ void fs_Ok_released( GtkButton * button,gpointer user_data ) break; case fsFontSelector: guiSetDF( font_name,fsSelectedDirectory,fsSelectedFile ); -#if defined( USE_OSD ) || defined( USE_SUB ) guiLoadFont(); -#endif if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name ); break; } diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 4b3b45b4b8..ac8597f95b 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -400,18 +400,6 @@ void ShowPreferences( void ) else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE ); // -- disables -#ifndef USE_SUB - gtk_widget_set_sensitive( AConfig,FALSE ); - gtk_widget_set_sensitive( CBNoAutoSub,FALSE ); - gtk_widget_set_sensitive( CBSubOverlap,FALSE ); - gtk_widget_set_sensitive( CBSubUnicode,FALSE ); - gtk_widget_set_sensitive( CBDumpMPSub,FALSE ); - gtk_widget_set_sensitive( CBDumpSrt,FALSE ); - gtk_widget_set_sensitive( HSSubDelay,FALSE ); - gtk_widget_set_sensitive( HSSubPosition,FALSE ); - gtk_widget_set_sensitive( HSSubFPS,FALSE ); -#endif - #ifndef USE_ASS gtk_widget_set_sensitive( CBUseASS,FALSE ); gtk_widget_set_sensitive( CBASSUseMargins,FALSE ); @@ -426,12 +414,6 @@ void ShowPreferences( void ) gtk_widget_set_sensitive( RBOSDTPTT,FALSE ); #endif -#if !defined( USE_OSD ) && !defined( USE_SUB ) - gtk_widget_set_sensitive( HSFontFactor,FALSE ); - gtk_widget_set_sensitive( prEFontName,FALSE ); - gtk_widget_set_sensitive( BLoadFont,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/win32/dialogs.c b/Gui/win32/dialogs.c index 5be4af04a6..084966604f 100644 --- a/Gui/win32/dialogs.c +++ b/Gui/win32/dialogs.c @@ -43,7 +43,6 @@ extern int get_video_colors(sh_video_t *sh_video, char *item, int *value); guiInterface_t guiIntfStruct; int addurl = 0; -#ifdef USE_SUB extern mp_osd_obj_t* vo_osd_list; extern char **sub_name; @@ -89,7 +88,6 @@ void guiLoadSubtitle(char *name) } update_set_of_subtitles(); } -#endif int display_openfilewindow(gui_t *gui, int add) { @@ -156,7 +154,6 @@ int display_openfilewindow(gui_t *gui, int add) return result; } -#ifdef USE_SUB void display_opensubtitlewindow(gui_t *gui) { OPENFILENAME subtitleopen; @@ -183,7 +180,6 @@ void display_opensubtitlewindow(gui_t *gui) if(GetOpenFileName(&subtitleopen)) guiLoadSubtitle(subtitlefile); } -#endif void display_loadplaylistwindow(gui_t *gui) { diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c index fa3c316a82..786769498f 100644 --- a/Gui/win32/gui.c +++ b/Gui/win32/gui.c @@ -216,11 +216,9 @@ static void handlemsg(HWND hWnd, int msg) if(display_openfilewindow(gui, 0) && (msg == evLoadPlay)) handlemsg(hWnd, evDropFile); return; -#ifdef USE_SUB case evLoadSubtitle: display_opensubtitlewindow(gui); break; -#endif case evPreferences: display_prefswindow(gui); return; @@ -979,11 +977,9 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM case ID_MUTE: mp_input_queue_cmd(mp_input_parse_cmd("mute")); break; -#ifdef USE_SUB case IDSUBTITLE_OPEN: display_opensubtitlewindow(gui); break; -#endif case ID_PTRACK: handlemsg(hWnd, evPrev); break; @@ -1186,9 +1182,7 @@ static void create_menu(gui_t *gui) AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT) gui->diskmenu, "Play &CD/DVD/VCD/SVCD"); AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); -#ifdef USE_SUB AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); -#endif AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, "Skin Browser"); AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); AppendMenu(gui->menu, MF_STRING, ID_PREFS, "Preferences"); @@ -1214,9 +1208,7 @@ static void create_traymenu(gui_t *gui) AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, "Toggle Mute"); AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); -#ifdef USE_SUB AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); -#endif AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, "Playlist"); AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, "Show/Hide"); diff --git a/Gui/win32/gui.h b/Gui/win32/gui.h index e777c12c34..2594d4ae01 100644 --- a/Gui/win32/gui.h +++ b/Gui/win32/gui.h @@ -111,8 +111,6 @@ extern void display_skinbrowser(gui_t *gui); extern void display_chapterselwindow(gui_t *gui); extern void display_eqwindow(gui_t *gui); extern void display_prefswindow(gui_t *gui); -#ifdef USE_SUB extern void display_opensubtitlewindow(gui_t *gui); -#endif #endif diff --git a/Gui/win32/interface.c b/Gui/win32/interface.c index 6fd964acc3..0da169da87 100644 --- a/Gui/win32/interface.c +++ b/Gui/win32/interface.c @@ -750,12 +750,10 @@ int guiGetEvent(int type, char *arg) if(fullscreen) guiSetEvent(evFullScreen); PostMessage(mygui->mainwindow, WM_COMMAND, (WPARAM) IDFILE_OPEN, 0); break; -#ifdef USE_SUB case MP_CMD_GUI_LOADSUBTITLE: if(fullscreen) guiSetEvent(evFullScreen); PostMessage(mygui->mainwindow, WM_COMMAND, (WPARAM) IDSUBTITLE_OPEN, 0); break; -#endif default: break; } |