Mercurial > mplayer.hg
annotate gui/interface.c @ 35652:f6c00eacd816
Add wsMapWait().
This waits for a map notify event which is required in order to paint
into the window.
Remove the waiting loop in interface.c and set a corresponding property
for the video window which, now, will regard vo_keepaspect.
This also closes Bugzilla #1357.
author | ib |
---|---|
date | Tue, 15 Jan 2013 11:54:22 +0000 |
parents | a30496350cb9 |
children | 59a6b817a287 |
rev | line source |
---|---|
26458 | 1 /* |
2 * This file is part of MPlayer. | |
3 * | |
4 * MPlayer is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * MPlayer is distributed in the hope that it will be useful, | |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 * GNU General Public License for more details. | |
13 * | |
14 * You should have received a copy of the GNU General Public License along | |
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., | |
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
17 */ | |
23077 | 18 |
33754 | 19 #include <stdarg.h> |
20 #include <stdio.h> | |
23077 | 21 #include <stdlib.h> |
22 #include <string.h> | |
23 | |
32984 | 24 #include "interface.h" |
35525 | 25 #include "app/app.h" |
26 #include "app/gui.h" | |
35529 | 27 #include "dialog/dialog.h" |
32984 | 28 #include "skin/skin.h" |
35528 | 29 #include "ui/ui.h" |
33741 | 30 #include "util/list.h" |
33739 | 31 #include "util/mem.h" |
33737 | 32 #include "util/string.h" |
23077 | 33 #include "wm/ws.h" |
34 #include "wm/wsxdnd.h" | |
35 | |
36 #include "access_mpcontext.h" | |
35462 | 37 #include "codec-cfg.h" |
32984 | 38 #include "config.h" |
23077 | 39 #include "help_mp.h" |
32984 | 40 #include "input/input.h" |
41 #include "libaf/equalizer.h" | |
33689
8d0290220239
Replace numeric constants for gtkEquChannels array size.
ib
parents:
33688
diff
changeset
|
42 #include "libavutil/common.h" |
32984 | 43 #include "libmpcodecs/dec_audio.h" |
44 #include "libmpcodecs/dec_video.h" | |
45 #include "libmpcodecs/vd.h" | |
46 #include "libmpcodecs/vf.h" | |
33398 | 47 #include "libvo/video_out.h" |
32984 | 48 #include "libvo/x11_common.h" |
49 #include "mixer.h" | |
50 #include "mp_msg.h" | |
32032 | 51 #include "mpcommon.h" |
30536
39a4dd7ec420
Move GUI-related extern declarations to a GUI header file.
diego
parents:
30535
diff
changeset
|
52 #include "mplayer.h" |
32984 | 53 #include "path.h" |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26458
diff
changeset
|
54 #ifdef CONFIG_DVDREAD |
23077 | 55 #include "stream/stream_dvd.h" |
56 #endif | |
35523 | 57 #include "sub/font_load.h" |
58 #include "sub/sub.h" | |
59 #include "sub/subreader.h" | |
23077 | 60 |
35524 | 61 /** |
62 * @brief Initialize interface data. | |
63 */ | |
33662 | 64 guiInterface_t guiInfo = { |
35430
2d55540614a9
Move uiProcessNextInPlaylist to the guiInfo structure.
ib
parents:
35429
diff
changeset
|
65 .StreamType = STREAMTYPE_DUMMY, |
2d55540614a9
Move uiProcessNextInPlaylist to the guiInfo structure.
ib
parents:
35429
diff
changeset
|
66 .Balance = 50.0f, |
35493 | 67 .PlaylistNext = True |
33662 | 68 }; |
23077 | 69 |
33265 | 70 static int initialized; |
71 | |
33745 | 72 /* MPlayer -> GUI */ |
73 | |
35524 | 74 /** |
75 * @brief Initialize and start the GUI. | |
76 */ | |
32984 | 77 void guiInit(void) |
23077 | 78 { |
32984 | 79 int i; |
34664
4df4d842d5fb
Remove global variable pointing to current playlist item.
ib
parents:
34663
diff
changeset
|
80 plItem *playlist; |
23077 | 81 |
33530 | 82 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI init.\n"); |
83 | |
35627 | 84 /* check options */ |
85 | |
34403 | 86 if (!cdrom_device) |
87 cdrom_device = strdup(DEFAULT_CDROM_DEVICE); | |
88 if (!dvd_device) | |
89 dvd_device = strdup(DEFAULT_DVD_DEVICE); | |
35625 | 90 #ifdef CONFIG_DXR3 |
32984 | 91 if (!gtkDXR3Device) |
92 gtkDXR3Device = strdup("/dev/em8300-0"); | |
35625 | 93 #endif |
32927 | 94 |
32984 | 95 if (stream_cache_size > 0) { |
35493 | 96 gtkCacheOn = True; |
32984 | 97 gtkCacheSize = stream_cache_size; |
98 } else if (stream_cache_size == 0) | |
35493 | 99 gtkCacheOn = False; |
32984 | 100 |
101 if (autosync && (autosync != gtkAutoSync)) { | |
35493 | 102 gtkAutoSyncOn = True; |
32984 | 103 gtkAutoSync = autosync; |
104 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
105 |
32984 | 106 gtkASS.enabled = ass_enabled; |
107 gtkASS.use_margins = ass_use_margins; | |
108 gtkASS.top_margin = ass_top_margin; | |
109 gtkASS.bottom_margin = ass_bottom_margin; | |
23077 | 110 |
35627 | 111 /* initialize graphical user interfaces */ |
112 | |
33463 | 113 wsXInit(mDisplay); |
35629 | 114 gtkInit(mDisplayName); |
32984 | 115 |
34684 | 116 /* load skin */ |
32984 | 117 |
118 skinDirInHome = get_path("skins"); | |
119 skinMPlayerDir = MPLAYER_DATADIR "/skins"; | |
120 | |
33985 | 121 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome); |
122 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinMPlayerDir); | |
32984 | 123 |
124 if (!skinName) | |
125 skinName = strdup("default"); | |
126 | |
127 i = skinRead(skinName); | |
128 | |
129 if (i == -1 && strcmp(skinName, "default") != 0) { | |
130 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName); | |
131 | |
132 skinName = strdup("default"); | |
133 i = skinRead(skinName); | |
134 } | |
135 | |
136 switch (i) { | |
137 case -1: | |
33024 | 138 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName); |
33768 | 139 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); |
23077 | 140 |
32984 | 141 case -2: |
33025 | 142 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName); |
33768 | 143 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); |
32984 | 144 } |
145 | |
34684 | 146 /* initialize windows */ |
32984 | 147 |
33555 | 148 mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize); |
32984 | 149 |
33555 | 150 if (!mainDrawBuffer) { |
33024 | 151 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB); |
33768 | 152 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); |
32984 | 153 } |
23077 | 154 |
32984 | 155 if (gui_save_pos) { |
33218
f0c2a62e3e89
Position windows initially at coordinates given in skin file.
ib
parents:
33053
diff
changeset
|
156 if (gui_main_pos_x != -3) |
33555 | 157 guiApp.main.x = gui_main_pos_x; |
33218
f0c2a62e3e89
Position windows initially at coordinates given in skin file.
ib
parents:
33053
diff
changeset
|
158 if (gui_main_pos_y != -3) |
33555 | 159 guiApp.main.y = gui_main_pos_y; |
34697 | 160 if (gui_video_pos_x != -3) |
161 guiApp.video.x = gui_video_pos_x; | |
162 if (gui_video_pos_y != -3) | |
163 guiApp.video.y = gui_video_pos_y; | |
32984 | 164 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
165 |
32984 | 166 if (WinID > 0) { |
34697 | 167 guiApp.videoWindow.Parent = WinID; |
168 guiApp.video.x = 0; | |
169 guiApp.video.y = 0; | |
32984 | 170 } |
23077 | 171 |
32984 | 172 if (guiWinID >= 0) |
33555 | 173 guiApp.mainWindow.Parent = guiWinID; |
23077 | 174 |
35652 | 175 wsCreateWindow(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow | wsWaitMap, "MPlayer - Video"); |
34697 | 176 wsDestroyImage(&guiApp.videoWindow); |
177 wsCreateImage(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height); | |
178 wsXDNDMakeAwareness(&guiApp.videoWindow); | |
32984 | 179 |
34697 | 180 WinID = guiApp.videoWindow.WindowID; |
33958 | 181 |
33555 | 182 uiMenuInit(); |
183 uiPlaybarInit(); | |
23077 | 184 |
185 // i=wsHideFrame|wsMaxSize|wsHideWindow; | |
33555 | 186 // if ( guiApp.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; |
35647 | 187 i = wsShowFrame | wsMinSize | wsMaxSize | wsHideWindow; |
33555 | 188 wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, i, "MPlayer"); |
189 wsSetShape(&guiApp.mainWindow, guiApp.main.Mask.Image); | |
190 wsXDNDMakeAwareness(&guiApp.mainWindow); | |
23077 | 191 |
33985 | 192 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] screen depth: %d\n", wsDepthOnScreen); |
193 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] mainWindow ID: 0x%x\n", (int)guiApp.mainWindow.WindowID); | |
34697 | 194 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] videoWindow ID: 0x%x\n", (int)guiApp.videoWindow.WindowID); |
23077 | 195 |
33555 | 196 guiApp.mainWindow.ReDraw = (void *)uiMainDraw; |
197 guiApp.mainWindow.MouseHandler = uiMainMouseHandle; | |
198 guiApp.mainWindow.KeyHandler = uiMainKeyHandle; | |
199 guiApp.mainWindow.DandDHandler = uiDandDHandler; | |
32984 | 200 |
34697 | 201 guiApp.videoWindow.ReDraw = (void *)uiVideoDraw; |
202 guiApp.videoWindow.MouseHandler = uiVideoMouseHandle; | |
203 guiApp.videoWindow.KeyHandler = uiMainKeyHandle; | |
204 guiApp.videoWindow.DandDHandler = uiDandDHandler; | |
23077 | 205 |
34697 | 206 wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); |
35357
80fe9ad7f318
Pass guiApp's wsTWindow parameters always by reference (if possible).
ib
parents:
35350
diff
changeset
|
207 wsClearWindow(&guiApp.videoWindow); |
23077 | 208 |
34697 | 209 if (guiApp.video.Bitmap.Image) |
210 wsConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image); | |
32984 | 211 |
33555 | 212 btnModify(evSetVolume, guiInfo.Volume); |
213 btnModify(evSetBalance, guiInfo.Balance); | |
214 btnModify(evSetMoviePosition, guiInfo.Position); | |
23077 | 215 |
33555 | 216 wsSetIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon); |
34697 | 217 wsSetIcon(wsDisplay, guiApp.videoWindow.WindowID, &guiIcon); |
32984 | 218 |
33555 | 219 if (!guiApp.mainDecoration) |
35497 | 220 wsWindowDecoration(&guiApp.mainWindow, False); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
221 |
33555 | 222 wsVisibleWindow(&guiApp.mainWindow, wsShowWindow); |
23077 | 223 |
32984 | 224 if (gtkShowVideoWindow) { |
34697 | 225 wsVisibleWindow(&guiApp.videoWindow, wsShowWindow); |
33960 | 226 |
34697 | 227 guiApp.videoWindow.Mapped = wsMapped; |
34698 | 228 guiInfo.VideoWindow = True; |
23077 | 229 |
33960 | 230 if (gtkLoadFullscreen) |
33555 | 231 uiFullScreen(); |
33960 | 232 } else |
34697 | 233 wsSetBackgroundRGB(&guiApp.videoWindow, 0, 0, 0); |
32984 | 234 |
33960 | 235 if (gtkLoadFullscreen) |
33978 | 236 btnSet(evFullScreen, btnPressed); |
32984 | 237 |
33615
1f9a31d4f114
Replace all playback integer constants by their symbolic constants.
ib
parents:
33614
diff
changeset
|
238 guiInfo.Playing = GUI_STOP; |
33609 | 239 |
35493 | 240 uiVideoRender = True; |
32984 | 241 |
34664
4df4d842d5fb
Remove global variable pointing to current playlist item.
ib
parents:
34663
diff
changeset
|
242 playlist = listMgr(PLAYLIST_ITEM_GET_CURR, 0); |
4df4d842d5fb
Remove global variable pointing to current playlist item.
ib
parents:
34663
diff
changeset
|
243 |
4df4d842d5fb
Remove global variable pointing to current playlist item.
ib
parents:
34663
diff
changeset
|
244 if (playlist && !filename) { |
35452 | 245 uiSetFile(playlist->path, playlist->name, STREAMTYPE_FILE); |
35488
9ef9131adfe5
Provide a number of tracks information for files in playlists.
ib
parents:
35484
diff
changeset
|
246 guiInfo.Tracks = (int)listMgr(PLAYLIST_ITEM_GET_POS, 0); |
35489 | 247 guiInfo.Track = 1; |
248 filename = NULL; // don't start playing | |
34064 | 249 } |
32984 | 250 |
251 if (subdata) | |
33897 | 252 setdup(&guiInfo.SubtitleFilename, subdata->filename); |
32984 | 253 |
33763 | 254 mplayerLoadFont(); |
33265 | 255 |
35493 | 256 initialized = True; |
23077 | 257 } |
258 | |
35524 | 259 /** |
260 * @brief Stop and finalize the GUI. | |
261 */ | |
32984 | 262 void guiDone(void) |
23077 | 263 { |
33307 | 264 if (initialized) { |
35493 | 265 uiMainRender = False; |
32984 | 266 |
33308 | 267 if (gui_save_pos) { |
34698 | 268 gui_main_pos_x = guiApp.mainWindow.X; |
269 gui_main_pos_y = guiApp.mainWindow.Y; | |
34697 | 270 gui_video_pos_x = guiApp.video.x; |
271 gui_video_pos_y = guiApp.video.y; | |
33308 | 272 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
273 |
33308 | 274 ass_enabled = gtkASS.enabled; |
275 ass_use_margins = gtkASS.use_margins; | |
276 ass_top_margin = gtkASS.top_margin; | |
277 ass_bottom_margin = gtkASS.bottom_margin; | |
23077 | 278 |
33308 | 279 cfg_write(); |
280 wsXDone(); | |
33307 | 281 } |
33263 | 282 |
35549 | 283 uiUnsetFile(); |
34663 | 284 listMgr(PLAYLIST_DELETE, 0); |
285 listMgr(URLLIST_DELETE, 0); | |
35550 | 286 appFreeStruct(); |
33542 | 287 free(guiIcon.collection); |
33307 | 288 |
289 if (gui_conf) { | |
290 m_config_free(gui_conf); | |
291 gui_conf = NULL; | |
292 } | |
33530 | 293 |
294 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n"); | |
33263 | 295 } |
296 | |
32984 | 297 static void add_vf(char *str) |
23077 | 298 { |
32984 | 299 void *p; |
300 | |
301 if (vf_settings) { | |
302 int i = 0; | |
303 | |
304 while (vf_settings[i].name) { | |
305 if (!gstrcmp(vf_settings[i++].name, str)) { | |
306 i = -1; | |
307 break; | |
308 } | |
309 } | |
310 | |
311 if (i != -1) { | |
312 p = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); | |
32712 | 313 |
32984 | 314 if (!p) |
315 return; | |
316 | |
317 vf_settings = p; | |
318 vf_settings[i].name = strdup(str); | |
319 vf_settings[i].attribs = NULL; | |
320 vf_settings[i + 1].name = NULL; | |
321 } | |
322 } else { | |
323 vf_settings = malloc(2 * sizeof(m_obj_settings_t)); | |
324 vf_settings[0].name = strdup(str); | |
325 vf_settings[0].attribs = NULL; | |
326 vf_settings[1].name = NULL; | |
32712 | 327 } |
328 | |
33530 | 329 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_AddingVideoFilter, str); |
23077 | 330 } |
331 | |
35524 | 332 /** |
333 * @brief Issue a command to the GUI. | |
334 * | |
335 * @note The GUI is controlled by giving it commands. | |
336 * | |
337 * @param what command to be performed | |
338 * @param data pointer to data needed for the command | |
339 * | |
340 * @return #True (ok) or #False (error) | |
341 */ | |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
342 int gui(int what, void *data) |
23077 | 343 { |
33685
ca6c9a80a062
Make assignments to variables in guiGetEvent() only if needed.
ib
parents:
33683
diff
changeset
|
344 stream_t *stream; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26458
diff
changeset
|
345 #ifdef CONFIG_DVDREAD |
33687 | 346 dvd_priv_t *dvd; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
347 #endif |
34339 | 348 int msg, state; |
35540 | 349 mixer_t *mixer = NULL; |
350 plItem *next = NULL; | |
23077 | 351 |
33726 | 352 switch (what) { |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
353 case GUI_SET_CONTEXT: |
35541 | 354 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
355 guiInfo.mpcontext = data; |
23077 | 356 break; |
32984 | 357 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
358 case GUI_SET_STATE: |
32984 | 359 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
360 switch ((int)data) { |
33631 | 361 case GUI_STOP: |
33614 | 362 case GUI_PLAY: |
34697 | 363 // if ( !gtkShowVideoWindow ) wsVisibleWindow( &guiApp.videoWindow,wsHideWindow ); |
33614 | 364 case GUI_PAUSE: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
365 guiInfo.Playing = (int)data; |
32984 | 366 break; |
367 } | |
368 | |
33555 | 369 uiState(); |
23077 | 370 break; |
32984 | 371 |
33732 | 372 case GUI_HANDLE_EVENTS: |
35541 | 373 |
33901 | 374 if (!guiInfo.Playing || !guiInfo.VideoWindow) |
33732 | 375 wsHandleEvents(); |
35541 | 376 |
34083 | 377 wsAutohideCursor(); |
33732 | 378 gtkEventHandling(); |
35541 | 379 |
33732 | 380 break; |
381 | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
382 case GUI_RUN_COMMAND: |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
383 |
33985 | 384 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)data); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
385 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
386 switch ((int)data) { |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
387 case MP_CMD_VO_FULLSCREEN: |
35605
71f19d352561
Fix bug with wrong video window size after end of fullscreen playback.
ib
parents:
35568
diff
changeset
|
388 uiEventHandling(evFullScreen, True); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
389 break; |
33696
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
390 |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
391 case MP_CMD_PLAY_TREE_STEP: |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
392 uiEventHandling(evNext, 0); |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
393 break; |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
394 |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
395 case -MP_CMD_PLAY_TREE_STEP: |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
396 uiEventHandling(evPrev, 0); |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
397 break; |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
398 |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
399 case MP_CMD_STOP: |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
400 uiEventHandling(evStop, 0); |
24d919fb6778
Don't let MPlayer directly call user interface functions.
ib
parents:
33695
diff
changeset
|
401 break; |
33697 | 402 |
403 case MP_CMD_QUIT: | |
404 uiEventHandling(evExit, 0); | |
405 break; | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
406 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
407 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
408 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
409 |
34339 | 410 case GUI_RUN_MESSAGE: |
35541 | 411 |
34339 | 412 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_MESSAGE: %s\n", (const char *)data); |
413 msg = appFindMessage((const char *)data); | |
35541 | 414 |
34458 | 415 if ((msg == evMenu) || appFindItem(msg)) |
34339 | 416 uiEventHandling(msg, 0); |
35541 | 417 |
34339 | 418 break; |
419 | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
420 case GUI_PREPARE: |
32984 | 421 |
34697 | 422 wsVisibleMouse(&guiApp.videoWindow, wsHideMouseCursor); |
32984 | 423 |
34052 | 424 if (guiInfo.NewPlay == GUI_FILE_NEW) { |
425 audio_id = -1; | |
426 video_id = -1; | |
427 dvdsub_id = -1; | |
428 vobsub_id = -1; | |
429 | |
430 stream_cache_size = -1; | |
431 autosync = 0; | |
432 force_fps = 0; | |
433 } | |
34032 | 434 |
33555 | 435 switch (guiInfo.StreamType) { |
34073 | 436 case STREAMTYPE_FILE: |
437 case STREAMTYPE_STREAM: | |
35484 | 438 filename = guiInfo.Filename; |
32984 | 439 break; |
440 | |
34387 | 441 case STREAMTYPE_CDDA: |
442 { | |
443 char tmp[512]; | |
444 | |
445 sprintf(tmp, "cdda://%d", guiInfo.Track); | |
35452 | 446 uiSetFile(NULL, tmp, SAME_STREAMTYPE); |
34387 | 447 } |
448 break; | |
449 | |
32984 | 450 case STREAMTYPE_VCD: |
451 { | |
452 char tmp[512]; | |
453 | |
33874 | 454 sprintf(tmp, "vcd://%d", guiInfo.Track); |
35452 | 455 uiSetFile(NULL, tmp, SAME_STREAMTYPE); |
32984 | 456 } |
457 break; | |
458 | |
459 case STREAMTYPE_DVD: | |
460 { | |
461 char tmp[512]; | |
462 | |
33876
4789b8eed97e
Get rid of a bunch of needless or redundant guiInfo members.
ib
parents:
33874
diff
changeset
|
463 sprintf(tmp, "dvd://%d", guiInfo.Track); |
35452 | 464 uiSetFile(NULL, tmp, SAME_STREAMTYPE); |
32984 | 465 } |
35168 | 466 #ifdef CONFIG_DVDREAD |
33555 | 467 dvd_chapter = guiInfo.Chapter; |
468 dvd_angle = guiInfo.Angle; | |
35168 | 469 #endif |
32984 | 470 break; |
471 } | |
472 | |
34684 | 473 /* video opts */ |
32984 | 474 |
475 if (!video_driver_list) { | |
476 int i = 0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
477 |
32984 | 478 while (video_out_drivers[i++]) { |
479 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) { | |
34610 | 480 listSet(&video_driver_list, (char *)video_out_drivers[i - 1]->info->short_name); |
32984 | 481 break; |
482 } | |
483 } | |
484 } | |
485 | |
486 if (!video_driver_list && !video_driver_list[0]) { | |
33024 | 487 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_IDFGCVD); |
33768 | 488 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); |
32984 | 489 } |
490 | |
491 { | |
492 int i = 0; | |
493 | |
33901 | 494 guiInfo.VideoWindow = True; |
32984 | 495 |
496 while (video_out_drivers[i++]) { | |
497 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) { | |
498 if ((video_driver_list && !gstrcmp(video_driver_list[0], (char *)video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUI_NOWINDOW, NULL) == VO_TRUE)) { | |
33901 | 499 guiInfo.VideoWindow = False; |
32984 | 500 break; |
501 } | |
502 } | |
503 } | |
504 } | |
505 | |
506 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3")) | |
33555 | 507 if (guiInfo.StreamType != STREAMTYPE_DVD && guiInfo.StreamType != STREAMTYPE_VCD) |
32984 | 508 if (gtkVfLAVC) |
509 add_vf("lavc"); | |
510 | |
511 if (gtkVfPP) | |
512 add_vf("pp"); | |
513 | |
34684 | 514 /* audio opts */ |
32984 | 515 |
516 // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } | |
517 if (gtkAONorm) | |
34610 | 518 listRepl(&af_cfg.list, "volnorm", "volnorm"); |
32984 | 519 |
520 if (gtkEnableAudioEqualizer) | |
34610 | 521 listRepl(&af_cfg.list, "equalizer", "equalizer"); |
32984 | 522 |
523 if (gtkAOExtraStereo) { | |
524 char *name; | |
525 | |
526 name = malloc(12 + 20 + 1); | |
527 snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul); | |
528 name[12 + 20] = 0; | |
34610 | 529 listRepl(&af_cfg.list, "extrastereo", name); |
32984 | 530 free(name); |
531 } | |
532 | |
533 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "oss", 3)) { | |
534 mixer_device = gtkAOOSSMixer; | |
535 mixer_channel = gtkAOOSSMixerChannel; | |
536 | |
537 if (gtkAOOSSDevice) { | |
34625 | 538 char *tmp; |
34624 | 539 |
32984 | 540 tmp = calloc(1, strlen(gtkAOOSSDevice) + 7); |
541 sprintf(tmp, "oss:%s", gtkAOOSSDevice); | |
34625 | 542 listSet(&audio_driver_list, tmp); |
543 free(tmp); | |
34624 | 544 } |
32984 | 545 } |
546 | |
547 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "alsa", 4)) { | |
548 mixer_device = gtkAOALSAMixer; | |
549 mixer_channel = gtkAOALSAMixerChannel; | |
550 | |
551 if (gtkAOALSADevice) { | |
34625 | 552 char *tmp; |
34624 | 553 |
32984 | 554 tmp = calloc(1, strlen(gtkAOALSADevice) + 14); |
555 sprintf(tmp, "alsa:device=%s", gtkAOALSADevice); | |
34625 | 556 listSet(&audio_driver_list, tmp); |
557 free(tmp); | |
34624 | 558 } |
32984 | 559 } |
560 | |
561 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "sdl", 3)) { | |
34624 | 562 if (gtkAOSDLDriver) { |
34625 | 563 char *tmp; |
32984 | 564 |
565 tmp = calloc(1, strlen(gtkAOSDLDriver) + 10); | |
566 sprintf(tmp, "sdl:%s", gtkAOSDLDriver); | |
34625 | 567 listSet(&audio_driver_list, tmp); |
568 free(tmp); | |
34624 | 569 } |
32984 | 570 } |
571 | |
572 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "esd", 3)) { | |
34624 | 573 if (gtkAOESDDevice) { |
34625 | 574 char *tmp; |
32984 | 575 |
576 tmp = calloc(1, strlen(gtkAOESDDevice) + 10); | |
577 sprintf(tmp, "esd:%s", gtkAOESDDevice); | |
34625 | 578 listSet(&audio_driver_list, tmp); |
579 free(tmp); | |
34624 | 580 } |
32984 | 581 } |
582 | |
34684 | 583 /* subtitle */ |
32984 | 584 |
33897 | 585 // subdata->filename=gstrdup( guiInfo.SubtitleFilename ); |
32984 | 586 stream_dump_type = 0; |
587 | |
588 if (gtkSubDumpMPSub) | |
589 stream_dump_type = 4; | |
590 | |
591 if (gtkSubDumpSrt) | |
592 stream_dump_type = 6; | |
593 | |
35493 | 594 gtkSubDumpMPSub = gtkSubDumpSrt = False; |
33763 | 595 mplayerLoadFont(); |
23077 | 596 |
34684 | 597 /* misc */ |
32984 | 598 |
599 if (gtkCacheOn) | |
600 stream_cache_size = gtkCacheSize; | |
601 | |
602 if (gtkAutoSyncOn) | |
603 autosync = gtkAutoSync; | |
23077 | 604 |
33897 | 605 if (guiInfo.AudioFilename) |
606 audio_stream = gstrdup(guiInfo.AudioFilename); | |
33894 | 607 else if (guiInfo.NewPlay == GUI_FILE_NEW) |
33739 | 608 nfree(audio_stream); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
609 |
32984 | 610 // audio_stream = NULL; |
611 | |
33555 | 612 guiInfo.NewPlay = 0; |
23077 | 613 |
32984 | 614 ass_enabled = gtkASS.enabled; |
615 ass_use_margins = gtkASS.use_margins; | |
616 ass_top_margin = gtkASS.top_margin; | |
23077 | 617 ass_bottom_margin = gtkASS.bottom_margin; |
618 | |
32984 | 619 break; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
620 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
621 case GUI_SET_STREAM: |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
622 |
34859 | 623 if (guiInfo.StreamType == STREAMTYPE_PLAYLIST) |
624 guiInfo.mpcontext->file_format = DEMUXER_TYPE_PLAYLIST; | |
625 | |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
626 stream = data; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
627 guiInfo.StreamType = stream->type; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
628 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
629 switch (guiInfo.StreamType) { |
34424 | 630 case STREAMTYPE_FILE: |
631 case STREAMTYPE_STREAM: | |
35488
9ef9131adfe5
Provide a number of tracks information for files in playlists.
ib
parents:
35484
diff
changeset
|
632 guiInfo.Tracks = (int)listMgr(PLAYLIST_ITEM_GET_POS, 0); |
34424 | 633 break; |
634 | |
34387 | 635 case STREAMTYPE_CDDA: |
636 guiInfo.Tracks = 0; | |
637 stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); | |
638 break; | |
639 | |
34077 | 640 case STREAMTYPE_VCD: |
641 guiInfo.Tracks = 0; | |
34388
9ee95c78e85f
Replace VCD's STREAM_CTRL_GET_NUM_CHAPTERS by STREAM_CTRL_GET_NUM_TITLES.
ib
parents:
34387
diff
changeset
|
642 stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); |
34077 | 643 break; |
644 | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
645 case STREAMTYPE_DVD: |
34389
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
646 guiInfo.Tracks = 0; |
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
647 stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); |
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
648 guiInfo.Chapters = 0; |
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
649 stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters); |
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
650 guiInfo.Angles = 0; |
b2d661762e90
Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents:
34388
diff
changeset
|
651 stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles); |
35170 | 652 guiInfo.Track = 0; |
653 stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track); | |
654 guiInfo.Track++; | |
35168 | 655 // guiInfo.Chapter will be set by mplayer |
656 guiInfo.Angle = 1; | |
657 stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle); | |
34454 | 658 #ifdef CONFIG_DVDREAD |
33730 | 659 dvd = stream->priv; |
33902 | 660 guiInfo.AudioStreams = dvd->nr_of_channels; |
661 memcpy(guiInfo.AudioStream, dvd->audio_streams, sizeof(dvd->audio_streams)); | |
662 guiInfo.Subtitles = dvd->nr_of_subtitles; | |
663 memcpy(guiInfo.Subtitle, dvd->subtitles, sizeof(dvd->subtitles)); | |
34454 | 664 #endif |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
665 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
666 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
667 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
668 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
669 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
670 case GUI_SET_AFILTER: |
35541 | 671 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
672 guiInfo.afilter = data; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
673 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
674 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
675 case GUI_SET_VIDEO: |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
676 |
34684 | 677 /* video */ |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
678 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
679 guiInfo.sh_video = data; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
680 |
35462 | 681 nfree(guiInfo.CodecName); |
682 | |
683 if (guiInfo.sh_video) | |
684 guiInfo.CodecName = strdup(guiInfo.sh_video->codec->name); | |
685 | |
34074
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
686 state = (guiInfo.StreamType == STREAMTYPE_STREAM ? btnDisabled : btnReleased); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
687 btnSet(evForward10sec, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
688 btnSet(evBackward10sec, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
689 btnSet(evForward1min, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
690 btnSet(evBackward1min, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
691 btnSet(evForward10min, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
692 btnSet(evBackward10min, state); |
360ed500a6e9
Set all buttons related to seek operations according to stream type.
ib
parents:
34073
diff
changeset
|
693 btnSet(evSetMoviePosition, state); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
694 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
695 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) { |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
696 gtkMessageBox(GTK_MB_FATAL, MSGTR_NEEDLAVC); |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
697 return False; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
698 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
699 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
700 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
701 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
702 case GUI_SET_AUDIO: |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
703 |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
704 guiInfo.AudioChannels = data ? ((sh_audio_t *)data)->channels : 0; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
705 |
35454 | 706 if (data && !guiInfo.sh_video) { |
33901 | 707 guiInfo.VideoWindow = False; |
35454 | 708 guiInfo.VideoWidth = 0; |
709 guiInfo.VideoHeight = 0; | |
710 } | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
711 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
712 gui(GUI_SET_MIXER, 0); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
713 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
714 if (gtkEnableAudioEqualizer) { |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
715 equalizer_t eq; |
33693
006a2db8bd55
Use unsigned index variable for comparison with array size.
ib
parents:
33692
diff
changeset
|
716 unsigned int i, j; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
717 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
718 for (i = 0; i < FF_ARRAY_ELEMS(gtkEquChannels); i++) { |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
719 for (j = 0; j < FF_ARRAY_ELEMS(*gtkEquChannels); j++) { |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
720 eq.channel = i; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
721 eq.band = j; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
722 eq.gain = gtkEquChannels[i][j]; |
33766 | 723 mplayer(MPLAYER_SET_EQUALIZER, 0, &eq); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
724 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
725 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
726 } |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
727 |
33960 | 728 // These must be done here (in the last call from MPlayer before |
729 // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because... | |
730 | |
731 // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW | |
732 if (!guiInfo.VideoWindow) { | |
34697 | 733 wsVisibleWindow(&guiApp.videoWindow, wsHideWindow); |
33978 | 734 btnSet(evFullScreen, (gtkLoadFullscreen ? btnPressed : btnReleased)); |
33960 | 735 } |
736 | |
737 // ...option variable fullscreen determines whether MPlayer will handle | |
738 // the window given by WinID as fullscreen window (and will do aspect | |
739 // scaling then) or not - quite rubbish | |
740 fullscreen = gtkLoadFullscreen; | |
741 | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
742 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
743 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
744 case GUI_SET_MIXER: |
35535 | 745 |
746 if (guiInfo.mpcontext) | |
747 mixer = mpctx_get_mixer(guiInfo.mpcontext); | |
748 | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
749 if (mixer) { |
35537 | 750 float l, r, b; |
35542 | 751 static float last_balance = 50.0f; |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
752 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
753 mixer_getvolume(mixer, &l, &r); |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
754 guiInfo.Volume = FFMAX(l, r); |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
755 btnModify(evSetVolume, guiInfo.Volume); |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
756 |
35537 | 757 mixer_getbalance(mixer, &b); |
35544 | 758 guiInfo.Balance = (b + 1.0) * 50.0; // transform -1..1 to 0..100 |
35542 | 759 |
760 if (guiInfo.Balance != last_balance) { | |
761 l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0; | |
762 r = guiInfo.Volume * guiInfo.Balance / 50.0; | |
763 mixer_setvolume(mixer, FFMIN(l, guiInfo.Volume), FFMIN(r, guiInfo.Volume)); | |
764 btnModify(evSetBalance, guiInfo.Balance); | |
765 last_balance = guiInfo.Balance; | |
766 } | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
767 } |
35541 | 768 |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
769 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
770 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
771 case GUI_REDRAW: |
35541 | 772 |
34333 | 773 uiEventHandling(ivRedraw, 0); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
774 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
775 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
776 case GUI_SETUP_VIDEO_WINDOW: |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
777 |
33901 | 778 guiInfo.VideoWidth = vo_dwidth; |
779 guiInfo.VideoHeight = vo_dheight; | |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
780 |
34697 | 781 if (!guiApp.videoWindow.isFullScreen || !guiApp.videoWindow.Mapped) { |
782 if (!guiApp.videoWindow.isFullScreen) | |
783 wsResizeWindow(&guiApp.videoWindow, guiInfo.VideoWidth, guiInfo.VideoHeight); | |
33960 | 784 |
34697 | 785 wsMoveWindow(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); |
33960 | 786 |
34697 | 787 if (!guiApp.videoWindow.Mapped) |
788 wsVisibleWindow(&guiApp.videoWindow, wsShowWindow); | |
33960 | 789 } |
790 | |
34697 | 791 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) |
35605
71f19d352561
Fix bug with wrong video window size after end of fullscreen playback.
ib
parents:
35568
diff
changeset
|
792 uiEventHandling(evFullScreen, True); |
33960 | 793 |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
794 if (guiWinID >= 0) |
33993 | 795 wsMoveWindow(&guiApp.mainWindow, True, 0, guiInfo.VideoHeight); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
796 |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
797 break; |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
798 |
33733 | 799 case GUI_HANDLE_X_EVENT: |
35541 | 800 |
35637 | 801 wsEvents(data); |
33692
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
802 gtkEventHandling(); |
0e9a5c0194ed
Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents:
33691
diff
changeset
|
803 break; |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
804 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
805 case GUI_END_FILE: |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
806 |
35330 | 807 guiInfo.sh_video = NULL; |
34035 | 808 |
35330 | 809 uiEventHandling(ivRedraw, 1); |
34052 | 810 |
35565
5f7a983fc838
Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents:
35564
diff
changeset
|
811 if (guiInfo.Playing) { |
35566 | 812 if (!guiInfo.PlaylistNext) { |
813 guiInfo.PlaylistNext = True; | |
814 break; | |
815 } | |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
816 |
35566 | 817 if (guiInfo.StreamType == STREAMTYPE_CDDA && guiInfo.Track < guiInfo.Tracks) { |
818 uiNext(); | |
819 break; | |
820 } | |
34387 | 821 |
35468
047fc4746236
Cosmetic: Adjust indent and move guiInfo member CodecName in structure.
ib
parents:
35467
diff
changeset
|
822 next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0); |
35565
5f7a983fc838
Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents:
35564
diff
changeset
|
823 } |
34669
697aaedfe59e
Remove global variable pointing to playlist item last played.
ib
parents:
34667
diff
changeset
|
824 |
35565
5f7a983fc838
Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents:
35564
diff
changeset
|
825 if (next) { |
35452 | 826 uiSetFile(next->path, next->name, STREAMTYPE_FILE); |
34066 | 827 guiInfo.NewPlay = GUI_FILE_NEW; |
35458 | 828 guiInfo.Track = (int)listMgr(PLAYLIST_ITEM_GET_POS, next); |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
829 } else { |
33894 | 830 if (guiInfo.NewPlay == GUI_FILE_NEW) |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
831 break; |
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
832 |
34113 | 833 filename = NULL; |
834 | |
35546
cd2c85083fdd
Reset playlist to first item after playback has stopped.
ib
parents:
35544
diff
changeset
|
835 if (isPlaylistStreamtype) { |
35555 | 836 plItem *curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0); |
837 | |
838 if (!curr) | |
35547 | 839 uiUnsetFile(); |
35558 | 840 else if ((curr != listMgr(PLAYLIST_GET, 0)) && guiInfo.Playing) { |
35555 | 841 curr = listMgr(PLAYLIST_ITEM_SET_CURR, listMgr(PLAYLIST_GET, 0)); |
35546
cd2c85083fdd
Reset playlist to first item after playback has stopped.
ib
parents:
35544
diff
changeset
|
842 uiSetFile(curr->path, curr->name, STREAMTYPE_FILE); |
35551
99a11b051705
Set track number after resetting playlist to first item.
ib
parents:
35550
diff
changeset
|
843 guiInfo.Track = 1; |
35546
cd2c85083fdd
Reset playlist to first item after playback has stopped.
ib
parents:
35544
diff
changeset
|
844 } |
35559
14e36699a6e7
Relocate code to set Track, Chapter and Angle start values.
ib
parents:
35558
diff
changeset
|
845 } else if (guiInfo.Playing) { |
35563
d4a84f674401
Reset media information for CD/VCD/DVD after playback.
ib
parents:
35559
diff
changeset
|
846 int first = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1); |
35559
14e36699a6e7
Relocate code to set Track, Chapter and Angle start values.
ib
parents:
35558
diff
changeset
|
847 |
35563
d4a84f674401
Reset media information for CD/VCD/DVD after playback.
ib
parents:
35559
diff
changeset
|
848 if (guiInfo.Track != first) { |
35568 | 849 uiUnsetMedia(True); |
35563
d4a84f674401
Reset media information for CD/VCD/DVD after playback.
ib
parents:
35559
diff
changeset
|
850 guiInfo.Track = first; |
d4a84f674401
Reset media information for CD/VCD/DVD after playback.
ib
parents:
35559
diff
changeset
|
851 } |
35564
8d4a7387d592
Relocate and change code to set Chapter and Angle start values.
ib
parents:
35563
diff
changeset
|
852 |
8d4a7387d592
Relocate and change code to set Chapter and Angle start values.
ib
parents:
35563
diff
changeset
|
853 if (guiInfo.StreamType == STREAMTYPE_DVD) { |
8d4a7387d592
Relocate and change code to set Chapter and Angle start values.
ib
parents:
35563
diff
changeset
|
854 guiInfo.Chapter = 1; |
8d4a7387d592
Relocate and change code to set Chapter and Angle start values.
ib
parents:
35563
diff
changeset
|
855 guiInfo.Angle = 1; |
8d4a7387d592
Relocate and change code to set Chapter and Angle start values.
ib
parents:
35563
diff
changeset
|
856 } |
35546
cd2c85083fdd
Reset playlist to first item after playback has stopped.
ib
parents:
35544
diff
changeset
|
857 } |
35381
746e2e0577b2
Without current playlist item, reset guiInfo's Filename and StreamType.
ib
parents:
35376
diff
changeset
|
858 |
35413 | 859 guiInfo.ElapsedTime = 0; |
860 guiInfo.Position = 0; | |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
861 |
33960 | 862 if (gtkShowVideoWindow) { |
863 guiInfo.VideoWindow = True; | |
864 | |
34697 | 865 if (!guiApp.videoWindow.isFullScreen) { |
35477 | 866 wsResizeWindow(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height); |
34697 | 867 wsMoveWindow(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); |
33960 | 868 } |
869 | |
34697 | 870 if (!guiApp.videoWindow.Mapped) |
871 wsVisibleWindow(&guiApp.videoWindow, wsShowWindow); | |
33960 | 872 |
34697 | 873 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) |
35605
71f19d352561
Fix bug with wrong video window size after end of fullscreen playback.
ib
parents:
35568
diff
changeset
|
874 uiEventHandling(evFullScreen, False); |
33960 | 875 } else { |
34697 | 876 wsVisibleWindow(&guiApp.videoWindow, wsHideWindow); |
33960 | 877 guiInfo.VideoWindow = False; |
33978 | 878 btnSet(evFullScreen, (gtkLoadFullscreen ? btnPressed : btnReleased)); |
33960 | 879 } |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
880 |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33730
diff
changeset
|
881 gui(GUI_SET_STATE, (void *)GUI_STOP); |
33959 | 882 |
883 wsHandleEvents(); | |
35493 | 884 uiVideoRender = True; |
34697 | 885 wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); |
35357
80fe9ad7f318
Pass guiApp's wsTWindow parameters always by reference (if possible).
ib
parents:
35350
diff
changeset
|
886 wsClearWindow(&guiApp.videoWindow); |
34697 | 887 wsPostRedisplay(&guiApp.videoWindow); |
888 wsVisibleMouse(&guiApp.videoWindow, wsShowMouseCursor); | |
33694
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
889 } |
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
890 |
45553d0f65c6
Don't let MPlayer directly call user interface functions.
ib
parents:
33693
diff
changeset
|
891 break; |
32984 | 892 } |
893 | |
33666
0f592e8530f1
Change return code of guiGetEvent() to indicate success.
ib
parents:
33664
diff
changeset
|
894 return True; |
23077 | 895 } |
896 | |
35517 | 897 /** |
898 * @brief Initialize the GUI playlist (i.e. import files that had been given | |
899 * on the command line) or add files "on the fly" (i.e. replace the | |
900 * current one (a playlist file) by other ones (its content)). | |
901 * | |
902 * @param what command (#GUI_PLAYLIST_INIT or #GUI_PLAYLIST_ADD) to be performed | |
903 * @param playtree MPlayer playtree to read from | |
904 * @param config MPlayer config context | |
905 * @param enqueue whether to overwrite GUI playlist (#False) or to append to it (#True) | |
906 * | |
907 * @return #True (ok) or #False (error) | |
908 */ | |
35512 | 909 int guiPlaylist(int what, play_tree_t *playtree, m_config_t *config, int enqueue) |
35510 | 910 { |
35513 | 911 play_tree_iter_t *pt_iter; |
35519
7f1be403a640
Don't unnecessarily use global MPlayer variable filename.
ib
parents:
35518
diff
changeset
|
912 const char *file; |
35510 | 913 int added = False; |
35512 | 914 plItem *curr; |
35510 | 915 |
35513 | 916 pt_iter = pt_iter_create(&playtree, config); |
917 | |
918 if (!pt_iter) | |
919 return False; | |
920 | |
35510 | 921 switch (what) { |
922 case GUI_PLAYLIST_INIT: | |
33746 | 923 |
35511 | 924 if (!enqueue) |
35517 | 925 listMgr(PLAYLIST_DELETE, 0); |
33746 | 926 |
35519
7f1be403a640
Don't unnecessarily use global MPlayer variable filename.
ib
parents:
35518
diff
changeset
|
927 while ((file = pt_iter_get_next_file(pt_iter))) |
7f1be403a640
Don't unnecessarily use global MPlayer variable filename.
ib
parents:
35518
diff
changeset
|
928 if (add_to_gui_playlist(file, PLAYLIST_ITEM_APPEND)) |
35514 | 929 added = True; |
33746 | 930 |
35511 | 931 uiCurr(); // update filename |
932 guiInfo.PlaylistNext = True; | |
33746 | 933 |
35518 | 934 if (added) |
935 guiInfo.Track = 1; | |
936 | |
35511 | 937 if (enqueue) |
938 filename = NULL; // don't start playing | |
33746 | 939 |
35510 | 940 break; |
33746 | 941 |
35510 | 942 case GUI_PLAYLIST_ADD: |
33746 | 943 |
35516 | 944 curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0); |
33746 | 945 |
35519
7f1be403a640
Don't unnecessarily use global MPlayer variable filename.
ib
parents:
35518
diff
changeset
|
946 while ((file = pt_iter_get_next_file(pt_iter))) |
7f1be403a640
Don't unnecessarily use global MPlayer variable filename.
ib
parents:
35518
diff
changeset
|
947 if (add_to_gui_playlist(file, PLAYLIST_ITEM_INSERT)) |
35514 | 948 added = True; |
33746 | 949 |
35512 | 950 if (curr) |
951 listMgr(PLAYLIST_ITEM_SET_CURR, curr); | |
35511 | 952 else |
35517 | 953 listMgr(PLAYLIST_ITEM_SET_CURR, listMgr(PLAYLIST_GET, 0)); |
33746 | 954 |
35512 | 955 if (curr && added) |
35511 | 956 listMgr(PLAYLIST_ITEM_DEL_CURR, 0); |
33746 | 957 |
35511 | 958 uiCurr(); // update filename |
33746 | 959 |
35510 | 960 break; |
961 } | |
962 | |
35513 | 963 pt_iter_destroy(&pt_iter); |
964 | |
35494 | 965 return added; |
33746 | 966 } |
967 | |
968 /* GUI -> MPlayer */ | |
969 | |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
970 void mplayer(int what, float value, void *data) |
23077 | 971 { |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
972 equalizer_t *eq = (equalizer_t *)data; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27393
diff
changeset
|
973 |
33765 | 974 switch (what) { |
34684 | 975 /* subtitle */ |
32984 | 976 |
33766 | 977 case MPLAYER_SET_FONT_FACTOR: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
978 font_factor = value; |
33763 | 979 mplayerLoadFont(); |
33744 | 980 break; |
34454 | 981 |
33766 | 982 case MPLAYER_SET_FONT_OUTLINE: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
983 subtitle_font_thickness = (8.0f / 100.0f) * value; |
33763 | 984 mplayerLoadFont(); |
33744 | 985 break; |
32984 | 986 |
33766 | 987 case MPLAYER_SET_FONT_BLUR: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
988 subtitle_font_radius = (8.0f / 100.0f) * value; |
33763 | 989 mplayerLoadFont(); |
33744 | 990 break; |
32984 | 991 |
33766 | 992 case MPLAYER_SET_FONT_TEXTSCALE: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
993 text_font_scale_factor = value; |
33763 | 994 mplayerLoadFont(); |
33744 | 995 break; |
32984 | 996 |
33766 | 997 case MPLAYER_SET_FONT_OSDSCALE: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
998 osd_font_scale_factor = value; |
33763 | 999 mplayerLoadFont(); |
33744 | 1000 break; |
32984 | 1001 |
33766 | 1002 case MPLAYER_SET_FONT_ENCODING: |
33739 | 1003 nfree(subtitle_font_encoding); |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1004 subtitle_font_encoding = gstrdup((char *)data); |
33763 | 1005 mplayerLoadFont(); |
33744 | 1006 break; |
32984 | 1007 |
33766 | 1008 case MPLAYER_SET_FONT_AUTOSCALE: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1009 subtitle_autoscale = (int)value; |
33763 | 1010 mplayerLoadFont(); |
33744 | 1011 break; |
32984 | 1012 |
33766 | 1013 case MPLAYER_SET_SUB_ENCODING: |
33739 | 1014 nfree(sub_cp); |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1015 sub_cp = gstrdup((char *)data); |
32984 | 1016 break; |
1017 | |
33766 | 1018 case MPLAYER_SET_EXTRA_STEREO: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1019 gtkAOExtraStereoMul = value; |
33555 | 1020 if (guiInfo.afilter) |
1021 af_control_any_rev(guiInfo.afilter, AF_CONTROL_ES_MUL | AF_CONTROL_SET, >kAOExtraStereoMul); | |
33744 | 1022 break; |
32984 | 1023 |
33766 | 1024 case MPLAYER_SET_PANSCAN: |
32984 | 1025 { |
1026 mp_cmd_t *mp_cmd; | |
1027 | |
1028 mp_cmd = calloc(1, sizeof(*mp_cmd)); | |
1029 mp_cmd->id = MP_CMD_PANSCAN; | |
1030 mp_cmd->name = strdup("panscan"); | |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1031 mp_cmd->args[0].v.f = value; |
32984 | 1032 mp_cmd->args[1].v.i = 1; |
1033 mp_input_queue_cmd(mp_cmd); | |
1034 } | |
33744 | 1035 break; |
32984 | 1036 |
33766 | 1037 case MPLAYER_SET_AUTO_QUALITY: |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1038 auto_quality = (int)value; |
33744 | 1039 break; |
32984 | 1040 |
34684 | 1041 /* set equalizers */ |
32984 | 1042 |
33766 | 1043 case MPLAYER_SET_CONTRAST: |
33555 | 1044 if (guiInfo.sh_video) |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1045 set_video_colors(guiInfo.sh_video, "contrast", (int)value); |
33744 | 1046 break; |
32984 | 1047 |
33766 | 1048 case MPLAYER_SET_BRIGHTNESS: |
33555 | 1049 if (guiInfo.sh_video) |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1050 set_video_colors(guiInfo.sh_video, "brightness", (int)value); |
33744 | 1051 break; |
32984 | 1052 |
33766 | 1053 case MPLAYER_SET_HUE: |
33555 | 1054 if (guiInfo.sh_video) |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1055 set_video_colors(guiInfo.sh_video, "hue", (int)value); |
33744 | 1056 break; |
32984 | 1057 |
33766 | 1058 case MPLAYER_SET_SATURATION: |
33555 | 1059 if (guiInfo.sh_video) |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1060 set_video_colors(guiInfo.sh_video, "saturation", (int)value); |
33744 | 1061 break; |
32984 | 1062 |
33766 | 1063 case MPLAYER_SET_EQUALIZER: |
32984 | 1064 { |
23077 | 1065 af_control_ext_t tmp; |
32984 | 1066 |
1067 if (eq) { | |
1068 gtkEquChannels[eq->channel][eq->band] = eq->gain; | |
1069 tmp.ch = eq->channel; | |
1070 tmp.arg = gtkEquChannels[eq->channel]; | |
1071 | |
33555 | 1072 if (guiInfo.afilter) |
1073 af_control_any_rev(guiInfo.afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp); | |
32984 | 1074 } else { |
33693
006a2db8bd55
Use unsigned index variable for comparison with array size.
ib
parents:
33692
diff
changeset
|
1075 unsigned int i; |
32984 | 1076 |
1077 memset(gtkEquChannels, 0, sizeof(gtkEquChannels)); | |
1078 | |
33555 | 1079 if (guiInfo.afilter) { |
33689
8d0290220239
Replace numeric constants for gtkEquChannels array size.
ib
parents:
33688
diff
changeset
|
1080 for (i = 0; i < FF_ARRAY_ELEMS(gtkEquChannels); i++) { |
32984 | 1081 tmp.ch = i; |
1082 tmp.arg = gtkEquChannels[i]; | |
33555 | 1083 af_control_any_rev(guiInfo.afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp); |
32984 | 1084 } |
1085 } | |
1086 } | |
1087 | |
33744 | 1088 break; |
32984 | 1089 } |
33768 | 1090 |
1091 case MPLAYER_EXIT_GUI: | |
33791
8b0c78a85a8c
Cosmetic: Change parameter names of gui() and mplayer().
ib
parents:
33790
diff
changeset
|
1092 exit_player_with_rc((enum exit_reason)value, (enum exit_reason)value >= EXIT_ERROR); |
33768 | 1093 break; |
32984 | 1094 } |
23077 | 1095 } |
1096 | |
33763 | 1097 void mplayerLoadFont(void) |
33745 | 1098 { |
1099 #ifdef CONFIG_FREETYPE | |
1100 load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor); | |
1101 #else | |
1102 if (vo_font) { | |
1103 int i; | |
1104 | |
1105 free(vo_font->name); | |
1106 free(vo_font->fpath); | |
1107 | |
1108 for (i = 0; i < 16; i++) { | |
1109 if (vo_font->pic_a[i]) { | |
1110 free(vo_font->pic_a[i]->bmp); | |
1111 free(vo_font->pic_a[i]->pal); | |
1112 } | |
1113 } | |
1114 | |
1115 for (i = 0; i < 16; i++) { | |
1116 if (vo_font->pic_b[i]) { | |
1117 free(vo_font->pic_b[i]->bmp); | |
1118 free(vo_font->pic_b[i]->pal); | |
1119 } | |
1120 } | |
1121 | |
1122 free(vo_font); | |
1123 vo_font = NULL; | |
1124 } | |
1125 | |
1126 if (font_name) { | |
1127 vo_font = read_font_desc(font_name, font_factor, 0); | |
1128 | |
1129 if (!vo_font) | |
1130 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadFont, font_name); | |
1131 } else { | |
1132 font_name = gstrdup(get_path("font/font.desc")); | |
1133 vo_font = read_font_desc(font_name, font_factor, 0); | |
1134 | |
1135 if (!vo_font) { | |
1136 nfree(font_name); | |
1137 font_name = gstrdup(MPLAYER_DATADIR "/font/font.desc"); | |
1138 vo_font = read_font_desc(font_name, font_factor, 0); | |
1139 } | |
1140 } | |
1141 #endif | |
1142 } | |
1143 | |
33790
ab6d06f5b98b
Add const to some string pointer arguments that will not be modified.
ib
parents:
33775
diff
changeset
|
1144 void mplayerLoadSubtitle(const char *name) |
33745 | 1145 { |
35495 | 1146 if (guiInfo.Playing == GUI_STOP) |
33745 | 1147 return; |
1148 | |
1149 if (subdata) { | |
1150 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles); | |
1151 | |
1152 sub_free(subdata); | |
1153 subdata = NULL; | |
1154 vo_sub = NULL; | |
1155 | |
1156 if (vo_osd_list) { | |
1157 int len; | |
1158 mp_osd_obj_t *osd; | |
1159 | |
1160 osd = vo_osd_list; | |
1161 | |
1162 while (osd) { | |
1163 if (osd->type == OSDTYPE_SUBTITLE) | |
1164 break; | |
1165 | |
1166 osd = osd->next; | |
1167 } | |
1168 | |
1169 if (osd && (osd->flags & OSDFLAG_VISIBLE)) { | |
1170 len = osd->stride * (osd->bbox.y2 - osd->bbox.y1); | |
1171 memset(osd->bitmap_buffer, 0, len); | |
1172 memset(osd->alpha_buffer, 0, len); | |
1173 } | |
1174 } | |
1175 } | |
1176 | |
1177 if (name) { | |
1178 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name); | |
1179 | |
33775 | 1180 subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0)); |
33745 | 1181 |
1182 if (!subdata) | |
1183 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name); | |
1184 | |
1185 sub_name = (malloc(2 * sizeof(char *))); // when mplayer will be restarted | |
1186 sub_name[0] = strdup(name); // sub_name[0] will be read | |
1187 sub_name[1] = NULL; | |
1188 } | |
1189 | |
1190 update_set_of_subtitles(); | |
1191 } | |
1192 | |
33023 | 1193 // NOTE TO MYSELF: This function is nonsense. |
33289 | 1194 // MPlayer should pass messages to the GUI |
1195 // which must decide then which message has | |
1196 // to be shown (MSGL_FATAL, for example). | |
1197 // But with this function it is at least | |
1198 // possible to show GUI's very critical or | |
1199 // abort messages. | |
33023 | 1200 void gmp_msg(int mod, int lev, const char *format, ...) |
1201 { | |
1202 char msg[512]; | |
1203 va_list va; | |
1204 | |
1205 va_start(va, format); | |
1206 vsnprintf(msg, sizeof(msg), format, va); | |
1207 va_end(va); | |
1208 | |
1209 mp_msg(mod, lev, msg); | |
1210 | |
1211 if (mp_msg_test(mod, lev)) | |
1212 gtkMessageBox(GTK_MB_FATAL, msg); | |
1213 } |