Mercurial > mplayer.hg
comparison Gui/win32/gui.c @ 21140:b42f1c1ef651
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.
author | uau |
---|---|
date | Tue, 21 Nov 2006 20:48:17 +0000 |
parents | 6289755ce7c7 |
children | 309992959801 |
comparison
equal
deleted
inserted
replaced
21139:65d41a1f8fc4 | 21140:b42f1c1ef651 |
---|---|
214 case evLoadPlay: | 214 case evLoadPlay: |
215 case evLoad: | 215 case evLoad: |
216 if(display_openfilewindow(gui, 0) && (msg == evLoadPlay)) | 216 if(display_openfilewindow(gui, 0) && (msg == evLoadPlay)) |
217 handlemsg(hWnd, evDropFile); | 217 handlemsg(hWnd, evDropFile); |
218 return; | 218 return; |
219 #ifdef USE_SUB | |
220 case evLoadSubtitle: | 219 case evLoadSubtitle: |
221 display_opensubtitlewindow(gui); | 220 display_opensubtitlewindow(gui); |
222 break; | 221 break; |
223 #endif | |
224 case evPreferences: | 222 case evPreferences: |
225 display_prefswindow(gui); | 223 display_prefswindow(gui); |
226 return; | 224 return; |
227 case evPlayList: | 225 case evPlayList: |
228 display_playlistwindow(gui); | 226 display_playlistwindow(gui); |
977 display_openurlwindow(gui, 0); | 975 display_openurlwindow(gui, 0); |
978 break; | 976 break; |
979 case ID_MUTE: | 977 case ID_MUTE: |
980 mp_input_queue_cmd(mp_input_parse_cmd("mute")); | 978 mp_input_queue_cmd(mp_input_parse_cmd("mute")); |
981 break; | 979 break; |
982 #ifdef USE_SUB | |
983 case IDSUBTITLE_OPEN: | 980 case IDSUBTITLE_OPEN: |
984 display_opensubtitlewindow(gui); | 981 display_opensubtitlewindow(gui); |
985 break; | 982 break; |
986 #endif | |
987 case ID_PTRACK: | 983 case ID_PTRACK: |
988 handlemsg(hWnd, evPrev); | 984 handlemsg(hWnd, evPrev); |
989 break; | 985 break; |
990 case ID_SEEKB: | 986 case ID_SEEKB: |
991 handlemsg(hWnd, evBackward10sec); | 987 handlemsg(hWnd, evBackward10sec); |
1184 AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, "Url..."); | 1180 AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, "Url..."); |
1185 AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, "Directory..."); | 1181 AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, "Directory..."); |
1186 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); | 1182 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); |
1187 AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT) gui->diskmenu, "Play &CD/DVD/VCD/SVCD"); | 1183 AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT) gui->diskmenu, "Play &CD/DVD/VCD/SVCD"); |
1188 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); | 1184 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); |
1189 #ifdef USE_SUB | |
1190 AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); | 1185 AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); |
1191 #endif | |
1192 AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, "Skin Browser"); | 1186 AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, "Skin Browser"); |
1193 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); | 1187 AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); |
1194 AppendMenu(gui->menu, MF_STRING, ID_PREFS, "Preferences"); | 1188 AppendMenu(gui->menu, MF_STRING, ID_PREFS, "Preferences"); |
1195 AppendMenu(gui->menu, MF_STRING, ID_CONSOLE, "Debug Console"); | 1189 AppendMenu(gui->menu, MF_STRING, ID_CONSOLE, "Debug Console"); |
1196 AppendMenu(gui->menu, MF_STRING, ID_ONLINEHELP, "Online Help"); | 1190 AppendMenu(gui->menu, MF_STRING, ID_ONLINEHELP, "Online Help"); |
1212 AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_NTRACK, "Next Track"); | 1206 AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_NTRACK, "Next Track"); |
1213 AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKF, "Seek Forwards"); | 1207 AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKF, "Seek Forwards"); |
1214 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); | 1208 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); |
1215 AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, "Toggle Mute"); | 1209 AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, "Toggle Mute"); |
1216 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); | 1210 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); |
1217 #ifdef USE_SUB | |
1218 AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); | 1211 AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); |
1219 #endif | |
1220 AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, "Playlist"); | 1212 AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, "Playlist"); |
1221 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); | 1213 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); |
1222 AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, "Show/Hide"); | 1214 AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, "Show/Hide"); |
1223 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); | 1215 AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); |
1224 AppendMenu(gui->traymenu, MF_STRING, ID_PREFS, "Preferences"); | 1216 AppendMenu(gui->traymenu, MF_STRING, ID_PREFS, "Preferences"); |