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