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