Mercurial > mplayer.hg
comparison Gui/win32/dialogs.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 | 10cebc4e94ae |
children | 8106d1ecc27e |
comparison
equal
deleted
inserted
replaced
21139:65d41a1f8fc4 | 21140:b42f1c1ef651 |
---|---|
41 extern int get_video_colors(sh_video_t *sh_video, char *item, int *value); | 41 extern int get_video_colors(sh_video_t *sh_video, char *item, int *value); |
42 | 42 |
43 guiInterface_t guiIntfStruct; | 43 guiInterface_t guiIntfStruct; |
44 int addurl = 0; | 44 int addurl = 0; |
45 | 45 |
46 #ifdef USE_SUB | |
47 extern mp_osd_obj_t* vo_osd_list; | 46 extern mp_osd_obj_t* vo_osd_list; |
48 extern char **sub_name; | 47 extern char **sub_name; |
49 | 48 |
50 void guiLoadSubtitle(char *name) | 49 void guiLoadSubtitle(char *name) |
51 { | 50 { |
87 sub_name[0] = strdup(name); /* sub_name[0] will be read */ | 86 sub_name[0] = strdup(name); /* sub_name[0] will be read */ |
88 sub_name[1] = NULL; | 87 sub_name[1] = NULL; |
89 } | 88 } |
90 update_set_of_subtitles(); | 89 update_set_of_subtitles(); |
91 } | 90 } |
92 #endif | |
93 | 91 |
94 int display_openfilewindow(gui_t *gui, int add) | 92 int display_openfilewindow(gui_t *gui, int add) |
95 { | 93 { |
96 OPENFILENAME fileopen; | 94 OPENFILENAME fileopen; |
97 int result = 0; | 95 int result = 0; |
154 } while (*filespec); | 152 } while (*filespec); |
155 } | 153 } |
156 return result; | 154 return result; |
157 } | 155 } |
158 | 156 |
159 #ifdef USE_SUB | |
160 void display_opensubtitlewindow(gui_t *gui) | 157 void display_opensubtitlewindow(gui_t *gui) |
161 { | 158 { |
162 OPENFILENAME subtitleopen; | 159 OPENFILENAME subtitleopen; |
163 char subtitlefile[MAX_PATH]; | 160 char subtitlefile[MAX_PATH]; |
164 | 161 |
181 subtitleopen.nMaxFile = MAXFILE; | 178 subtitleopen.nMaxFile = MAXFILE; |
182 | 179 |
183 if(GetOpenFileName(&subtitleopen)) | 180 if(GetOpenFileName(&subtitleopen)) |
184 guiLoadSubtitle(subtitlefile); | 181 guiLoadSubtitle(subtitlefile); |
185 } | 182 } |
186 #endif | |
187 | 183 |
188 void display_loadplaylistwindow(gui_t *gui) | 184 void display_loadplaylistwindow(gui_t *gui) |
189 { | 185 { |
190 OPENFILENAME playlistopen; | 186 OPENFILENAME playlistopen; |
191 char playlistfile[MAX_PATH]; | 187 char playlistfile[MAX_PATH]; |