diff options
Diffstat (limited to 'Gui/win32')
-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 |
4 files changed, 0 insertions, 16 deletions
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; } |