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