annotate gui/interface.c @ 35570:ca631388b039

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