annotate gui/interface.c @ 37158:08bbd1e9036d

vd_ffmpeg: Rewrite ticket reference in comment Omit the issue tracking software's name. Despite the migration from Bugzilla to Trac we were able to keep the ticket numbers.
author al
date Fri, 15 Aug 2014 22:27:52 +0000
parents 8643426b12de
children
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>
36772
0da6c7ff95d2 Revise code of listMgr() command PLAYLIST_ITEM_GET_POS.
ib
parents: 36762
diff changeset
20 #include <stdint.h>
33754
1909e4015a3c Add missing #includes <stdarg.h> and <stdio.h>.
ib
parents: 33752
diff changeset
21 #include <stdio.h>
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
25 #include "interface.h"
35525
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35524
diff changeset
26 #include "app/app.h"
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
27 #include "app/cfg.h"
35525
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35524
diff changeset
28 #include "app/gui.h"
35529
8ad4d2fb46e8 Rebuild GUI directory structure.
ib
parents: 35528
diff changeset
29 #include "dialog/dialog.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
30 #include "skin/skin.h"
35772
3fec1d4b2736 Relocate uiMainEvent() prototype.
ib
parents: 35768
diff changeset
31 #include "ui/actions.h"
35528
ab07b17fddfb Rebuild GUI directory structure.
ib
parents: 35525
diff changeset
32 #include "ui/ui.h"
33741
962dc701989d Create new file list.c for list related functions.
ib
parents: 33740
diff changeset
33 #include "util/list.h"
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
34 #include "util/mem.h"
33737
71c29e8ec68f Move string functions from interface.c to string.c.
ib
parents: 33734
diff changeset
35 #include "util/string.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
36 #include "wm/ws.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
37 #include "wm/wsxdnd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
38
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
39 #include "access_mpcontext.h"
35462
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
40 #include "codec-cfg.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
41 #include "config.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
42 #include "help_mp.h"
36032
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35796
diff changeset
43 #include "mixer.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35796
diff changeset
44 #include "mp_msg.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35796
diff changeset
45 #include "mpcommon.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35796
diff changeset
46 #include "mplayer.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35796
diff changeset
47 #include "path.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
48 #include "input/input.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
49 #include "libaf/equalizer.h"
33689
8d0290220239 Replace numeric constants for gtkEquChannels array size.
ib
parents: 33688
diff changeset
50 #include "libavutil/common.h"
36966
ef9dea4785bc Detect audio AC3/DTS pass-through S/PDIF.
ib
parents: 36964
diff changeset
51 #include "libmpcodecs/ad.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
52 #include "libmpcodecs/dec_audio.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
53 #include "libmpcodecs/dec_video.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
54 #include "libmpcodecs/vd.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
55 #include "libmpcodecs/vf.h"
33398
3feb6b8799a1 Revert r33482.
ib
parents: 33395
diff changeset
56 #include "libvo/video_out.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
57 #include "libvo/x11_common.h"
36292
d626e6b9fbc3 Add a redraw and event handling to GUI_PREPARE.
ib
parents: 36282
diff changeset
58 #include "osdep/timer.h"
36869
80536f6e6f07 Add missing #include.
ib
parents: 36864
diff changeset
59 #include "stream/stream.h"
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
60 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 #include "stream/stream_dvd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62 #endif
35523
1857fa5cbfcb Rearrange #includes and add missing one.
ib
parents: 35519
diff changeset
63 #include "sub/font_load.h"
1857fa5cbfcb Rearrange #includes and add missing one.
ib
parents: 35519
diff changeset
64 #include "sub/sub.h"
1857fa5cbfcb Rearrange #includes and add missing one.
ib
parents: 35519
diff changeset
65 #include "sub/subreader.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
66
35524
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
67 /**
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
68 * @brief Initialize interface data.
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
69 */
33662
03117468ae0e Remove needless memset initialization of guiInfo.
ib
parents: 33661
diff changeset
70 guiInterface_t guiInfo = {
35430
2d55540614a9 Move uiProcessNextInPlaylist to the guiInfo structure.
ib
parents: 35429
diff changeset
71 .StreamType = STREAMTYPE_DUMMY,
36960
1911049add93 Add definition of a default volume.
ib
parents: 36959
diff changeset
72 .Volume = 50.0f,
35430
2d55540614a9 Move uiProcessNextInPlaylist to the guiInfo structure.
ib
parents: 35429
diff changeset
73 .Balance = 50.0f,
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35489
diff changeset
74 .PlaylistNext = True
33662
03117468ae0e Remove needless memset initialization of guiInfo.
ib
parents: 33661
diff changeset
75 };
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76
36049
31f6a88593b3 Cosmetic: Rename static variables.
ib
parents: 36043
diff changeset
77 static int guiInitialized;
36650
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
78 static int orig_fontconfig;
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
79
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
80 /**
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
81 * @brief Set option 'fontconfig' depending on #font_name.
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
82 */
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
83 static void set_fontconfig(void)
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
84 {
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
85 font_fontconfig = (font_name && strchr(font_name, '/') ? -1 : orig_fontconfig);
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
86 }
33265
62c0471bcf8c Free config.
ib
parents: 33263
diff changeset
87
37078
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
88 /**
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
89 * @brief Add a video filter
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
90 * (or change the parameter/value pairs of an existing one).
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
91 *
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
92 * @param vf video filter to be added or changed
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
93 * @param argvf pointer to an array of (new) parameter/value pairs
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
94 */
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
95 static void add_vf(const char *vf, const char *const *argvf)
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
96 {
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
97 if (vf_settings) {
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
98 int i = 0;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
99
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
100 while (vf_settings[i].name) {
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
101 if (strcmp(vf_settings[i].name, vf) == 0)
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
102 break;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
103
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
104 i++;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
105 }
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
106
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
107 if (vf_settings[i].name) {
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
108 listFree(&vf_settings[i].attribs);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
109 vf_settings[i].attribs = listDup(argvf);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
110 } else {
37083
ae4f30c4ef02 Determine size from variable declaration.
ib
parents: 37081
diff changeset
111 void *settings = realloc(vf_settings, (i + 2) * sizeof(*vf_settings));
37078
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
112
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
113 if (!settings)
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
114 return;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
115
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
116 vf_settings = settings;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
117 vf_settings[i].name = strdup(vf);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
118 vf_settings[i].attribs = listDup(argvf);
37084
e1453cdb2bed Determine size from variable declaration.
ib
parents: 37083
diff changeset
119 memset(&vf_settings[i + 1], 0, sizeof(*vf_settings));
37078
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
120 }
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
121 } else {
37083
ae4f30c4ef02 Determine size from variable declaration.
ib
parents: 37081
diff changeset
122 vf_settings = calloc(2, sizeof(*vf_settings));
37078
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
123
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
124 if (!vf_settings)
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
125 return;
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
126
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
127 vf_settings[0].name = strdup(vf);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
128 vf_settings[0].attribs = listDup(argvf);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
129 }
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
130
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
131 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf);
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
132 }
7471626e943e Relocate add_vf().
ib
parents: 37077
diff changeset
133
37079
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
134 /**
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
135 * @brief Get a video filter's array of parameter/value pairs.
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
136 *
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
137 * @param vf video filter in question
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
138 *
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
139 * @return pointer to the array of parameter/value pairs
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
140 */
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
141 static char **get_vf(const char *vf)
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
142 {
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
143 char **attribs = NULL;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
144
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
145 if (vf_settings) {
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
146 int i = 0;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
147
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
148 while (vf_settings[i].name) {
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
149 if (strcmp(vf_settings[i].name, vf) == 0) {
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
150 attribs = vf_settings[i].attribs;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
151 break;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
152 }
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
153
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
154 i++;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
155 }
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
156 }
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
157
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
158 return attribs;
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
159 }
83aa0570d6be Add get_vf().
ib
parents: 37078
diff changeset
160
37080
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
161 /**
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
162 * @brief Remove a video filter.
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
163 *
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
164 * @param vf video filter to be removed
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
165 */
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
166 static void remove_vf(char *vf)
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
167 {
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
168 if (vf_settings) {
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
169 int i = 0;
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
170
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
171 while (vf_settings[i].name) {
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
172 if (strcmp(vf_settings[i].name, vf) == 0) {
37085
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
173 int j;
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
174
37080
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
175 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingVideoFilter, vf);
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
176
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
177 free(vf_settings[i].name);
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
178 listFree(&vf_settings[i].attribs);
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
179
37085
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
180 j = i + 1;
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
181
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
182 while (vf_settings[j].name)
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
183 j++;
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
184
aadeccf8159b Copy subsequent video filter settings at once.
ib
parents: 37084
diff changeset
185 memmove(&vf_settings[i], &vf_settings[i + 1], (j - i) * sizeof(*vf_settings));
37080
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
186
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
187 break;
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
188 }
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
189
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
190 i++;
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
191 }
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
192 }
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
193 }
0b0528ba3344 Add remove_vf().
ib
parents: 37079
diff changeset
194
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
195 /* MPlayer -> GUI */
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
196
35524
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
197 /**
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
198 * @brief Initialize and start the GUI.
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
199 */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
200 void guiInit(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
201 {
37081
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
202 char **argvf;
35794
153a4c76e291 Cosmetic: Rename variable.
ib
parents: 35790
diff changeset
203 int ret;
34664
4df4d842d5fb Remove global variable pointing to current playlist item.
ib
parents: 34663
diff changeset
204 plItem *playlist;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
205
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
206 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI init.\n");
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
207
35627
51358e7bde85 Cosmetic: Add and adjust comments.
ib
parents: 35626
diff changeset
208 /* check options */
51358e7bde85 Cosmetic: Add and adjust comments.
ib
parents: 35626
diff changeset
209
34403
bca629bb50cf Initialize device options in guiInit().
ib
parents: 34399
diff changeset
210 if (!cdrom_device)
bca629bb50cf Initialize device options in guiInit().
ib
parents: 34399
diff changeset
211 cdrom_device = strdup(DEFAULT_CDROM_DEVICE);
bca629bb50cf Initialize device options in guiInit().
ib
parents: 34399
diff changeset
212 if (!dvd_device)
bca629bb50cf Initialize device options in guiInit().
ib
parents: 34399
diff changeset
213 dvd_device = strdup(DEFAULT_DVD_DEVICE);
35625
4188b70dc3ff Don't unconditionally set gtkDXR3Device.
ib
parents: 35605
diff changeset
214 #ifdef CONFIG_DXR3
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
215 if (!gtkDXR3Device)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
216 gtkDXR3Device = strdup("/dev/em8300-0");
35625
4188b70dc3ff Don't unconditionally set gtkDXR3Device.
ib
parents: 35605
diff changeset
217 #endif
32927
edb972e22021 Fix memory leak in appInitStruct().
ib
parents: 32900
diff changeset
218
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
219 if (stream_cache_size > 0) {
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35489
diff changeset
220 gtkCacheOn = True;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
221 gtkCacheSize = stream_cache_size;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
222 } else if (stream_cache_size == 0)
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35489
diff changeset
223 gtkCacheOn = False;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
224
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
225 if (autosync && (autosync != gtkAutoSync)) {
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35489
diff changeset
226 gtkAutoSyncOn = True;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
227 gtkAutoSync = autosync;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
228 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
229
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
230 gtkASS.enabled = ass_enabled;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
231 gtkASS.use_margins = ass_use_margins;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
232 gtkASS.top_margin = ass_top_margin;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
233 gtkASS.bottom_margin = ass_bottom_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
234
37081
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
235 argvf = get_vf("rotate");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
236 guiInfo.Rotation = (argvf && argvf[1] ? atoi(argvf[1]) : -1);
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
237
35627
51358e7bde85 Cosmetic: Add and adjust comments.
ib
parents: 35626
diff changeset
238 /* initialize graphical user interfaces */
51358e7bde85 Cosmetic: Add and adjust comments.
ib
parents: 35626
diff changeset
239
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
240 wsInit(mDisplay);
35629
365dc9336f0d Pass parameter instead of using global variable.
ib
parents: 35627
diff changeset
241 gtkInit(mDisplayName);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
242
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
243 /* load skin */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
244
36043
40c13df3d953 Cosmetic: Rename variables (consistently).
ib
parents: 36036
diff changeset
245 skinDirInHome = get_path("skins");
40c13df3d953 Cosmetic: Rename variables (consistently).
ib
parents: 36036
diff changeset
246 skinDirInData = MPLAYER_DATADIR "/skins";
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
247
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33978
diff changeset
248 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
36043
40c13df3d953 Cosmetic: Rename variables (consistently).
ib
parents: 36036
diff changeset
249 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinDirInData);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
250
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
251 if (!skinName)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
252 skinName = strdup("default");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
253
35794
153a4c76e291 Cosmetic: Rename variable.
ib
parents: 35790
diff changeset
254 ret = skinRead(skinName);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
255
35794
153a4c76e291 Cosmetic: Rename variable.
ib
parents: 35790
diff changeset
256 if (ret == -1 && strcmp(skinName, "default") != 0) {
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
257 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_SkinCfgSelectedNotFound, skinName);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
258
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
259 skinName = strdup("default");
35794
153a4c76e291 Cosmetic: Rename variable.
ib
parents: 35790
diff changeset
260 ret = skinRead(skinName);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
261 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
262
35794
153a4c76e291 Cosmetic: Rename variable.
ib
parents: 35790
diff changeset
263 switch (ret) {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
264 case -1:
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
265 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
266 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
267
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
268 case -2:
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
269 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
270 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
271 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
272
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
273 /* initialize windows */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
274
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
275 if (gui_save_pos) {
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
276 if (gui_main_pos_x != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
277 guiApp.main.x = gui_main_pos_x;
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
278 if (gui_main_pos_y != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
279 guiApp.main.y = gui_main_pos_y;
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
280 if (gui_video_pos_x != -3)
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
281 guiApp.video.x = gui_video_pos_x;
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
282 if (gui_video_pos_y != -3)
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
283 guiApp.video.y = gui_video_pos_y;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
284 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
285
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
286 if (WinID > 0) {
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
287 guiApp.videoWindow.Parent = WinID;
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
288 guiApp.video.x = 0;
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
289 guiApp.video.y = 0;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
290 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
291
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
292 if (guiWinID >= 0)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
293 guiApp.mainWindow.Parent = guiWinID;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294
35780
4073fff5efc7 Add new functions uiMainInit() and uiVideoInit().
ib
parents: 35773
diff changeset
295 uiMainInit(); // main window must be first!
35781
454b0d784d95 Add comment on order of window initialization.
ib
parents: 35780
diff changeset
296 uiVideoInit(); // video window must be second!
35780
4073fff5efc7 Add new functions uiMainInit() and uiVideoInit().
ib
parents: 35773
diff changeset
297 uiPlaybarInit();
4073fff5efc7 Add new functions uiMainInit() and uiVideoInit().
ib
parents: 35773
diff changeset
298 uiMenuInit();
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
299
36843
1078b8dd7625 Cast appropriately.
ib
parents: 36842
diff changeset
300 WinID = (Window)guiApp.videoWindow.WindowID;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
301
36959
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
302 btnValue(evSetVolume, &guiInfo.Volume);
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
303 btnValue(evSetBalance, &guiInfo.Balance);
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
304 btnValue(evSetMoviePosition, &guiInfo.Position);
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
305
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
306 if (guiInfo.Position)
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
307 uiEvent(evSetMoviePosition, guiInfo.Position);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
308
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
309 wsWindowVisibility(&guiApp.mainWindow, wsShowWindow);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
310
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
311 if (gtkShowVideoWindow) {
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
312 wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
313
35654
4d7f8eba65ee Cosmetic: Adjust indent.
ib
parents: 35653
diff changeset
314 guiInfo.VideoWindow = True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
315
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
316 if (gtkLoadFullscreen)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
317 uiFullScreen();
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
318 } else
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
319 wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
320
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
321 if (gtkLoadFullscreen)
33978
81aaa1420337 Replace some btnModify() calls by btnSet().
ib
parents: 33961
diff changeset
322 btnSet(evFullScreen, btnPressed);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
323
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
324 guiInfo.Playing = GUI_STOP;
33609
beec78d9146f Enable fullscreen with inactive video window.
ib
parents: 33595
diff changeset
325
34664
4df4d842d5fb Remove global variable pointing to current playlist item.
ib
parents: 34663
diff changeset
326 playlist = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
4df4d842d5fb Remove global variable pointing to current playlist item.
ib
parents: 34663
diff changeset
327
4df4d842d5fb Remove global variable pointing to current playlist item.
ib
parents: 34663
diff changeset
328 if (playlist && !filename) {
35452
f42cc2361ee4 Cosmetic: Rename uiSetFileName().
ib
parents: 35430
diff changeset
329 uiSetFile(playlist->path, playlist->name, STREAMTYPE_FILE);
36772
0da6c7ff95d2 Revise code of listMgr() command PLAYLIST_ITEM_GET_POS.
ib
parents: 36762
diff changeset
330 guiInfo.Tracks = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, 0);
35489
214c3f971eb0 Cosmetic: Adjust indent.
ib
parents: 35488
diff changeset
331 guiInfo.Track = 1;
214c3f971eb0 Cosmetic: Adjust indent.
ib
parents: 35488
diff changeset
332 filename = NULL; // don't start playing
34064
54becc464788 Set MPlayer filename in uiSetFileName().
ib
parents: 34058
diff changeset
333 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
334
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
335 if (subdata)
33897
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33895
diff changeset
336 setdup(&guiInfo.SubtitleFilename, subdata->filename);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
337
36650
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
338 orig_fontconfig = font_fontconfig;
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
339 set_fontconfig();
8b2c68d6fd89 Enable specifying a font file in the GUI preferences.
ib
parents: 36648
diff changeset
340
36049
31f6a88593b3 Cosmetic: Rename static variables.
ib
parents: 36043
diff changeset
341 guiInitialized = True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
342 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
343
35524
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
344 /**
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
345 * @brief Stop and finalize the GUI.
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
346 */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
347 void guiDone(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
348 {
36049
31f6a88593b3 Cosmetic: Rename static variables.
ib
parents: 36043
diff changeset
349 if (guiInitialized) {
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
350 if (gui_save_pos) {
34698
456784c6c904 Cosmetic: Adjust indent.
ib
parents: 34697
diff changeset
351 gui_main_pos_x = guiApp.mainWindow.X;
456784c6c904 Cosmetic: Adjust indent.
ib
parents: 34697
diff changeset
352 gui_main_pos_y = guiApp.mainWindow.Y;
35664
9162585304d0 Save the correct video window position.
ib
parents: 35663
diff changeset
353 gui_video_pos_x = guiApp.videoWindow.X;
9162585304d0 Save the correct video window position.
ib
parents: 35663
diff changeset
354 gui_video_pos_y = guiApp.videoWindow.Y;
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
355 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
356
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
357 ass_enabled = gtkASS.enabled;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
358 ass_use_margins = gtkASS.use_margins;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
359 ass_top_margin = gtkASS.top_margin;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
360 ass_bottom_margin = gtkASS.bottom_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
361
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
362 cfg_write();
35746
e745b22750f6 Add some notes for later checking and fixing.
ib
parents: 35744
diff changeset
363
35796
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
364 if (guiApp.menuIsPresent)
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
365 uiMenuDone();
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
366 if (guiApp.playbarIsPresent)
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
367 uiPlaybarDone();
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
368
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
369 uiVideoDone();
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35794
diff changeset
370 uiMainDone();
35746
e745b22750f6 Add some notes for later checking and fixing.
ib
parents: 35744
diff changeset
371
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
372 wsDone();
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
373 }
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
374
35549
463d8e512c38 Free guiInfo when GUI ends.
ib
parents: 35547
diff changeset
375 uiUnsetFile();
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34625
diff changeset
376 listMgr(PLAYLIST_DELETE, 0);
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34625
diff changeset
377 listMgr(URLLIST_DELETE, 0);
35550
d31d6a5c1e94 Deallocate in reverse order of allocation.
ib
parents: 35549
diff changeset
378 appFreeStruct();
33542
107084241b00 Add support for _NET_WM_ICON
ib
parents: 33541
diff changeset
379 free(guiIcon.collection);
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
380
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
381 if (gui_conf) {
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
382 m_config_free(gui_conf);
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
383 gui_conf = NULL;
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
384 }
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
385
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
386 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n");
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
387 }
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
388
35524
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
389 /**
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
390 * @brief Issue a command to the GUI.
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
391 *
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
392 * @note The GUI is controlled by giving it commands.
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
393 *
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
394 * @param what command to be performed
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
395 * @param data pointer to data needed for the command
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
396 *
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
397 * @return #True (ok) or #False (error)
dd7de6052739 Add doxygen comments.
ib
parents: 35523
diff changeset
398 */
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
399 int gui(int what, void *data)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
400 {
36959
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
401 static float last_balance = -1.0f;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
402 #ifdef CONFIG_DVDREAD
33687
f23d139ded5b Cosmetic: Rename variable dvdp dvd.
ib
parents: 33686
diff changeset
403 dvd_priv_t *dvd;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
404 #endif
36779
f5320e43d458 Simplify code.
ib
parents: 36772
diff changeset
405 int idata = (intptr_t)data, msg, state;
36456
514b38743990 Fix small bug with GUI_SET_STREAM.
ib
parents: 36455
diff changeset
406 stream_t *stream = NULL;
36455
c9fb71a139bb Use variable for passed data in GUI_SET_AUDIO.
ib
parents: 36454
diff changeset
407 sh_audio_t *sh_audio;
36454
9a28d5c4320a Provide GUI_SET_MIXER call with argument.
ib
parents: 36437
diff changeset
408 mixer_t *mixer;
36944
6dab81ea03c3 Remove pointless condition.
ib
parents: 36943
diff changeset
409 float l, r, b;
36457
31120561a9da Cosmetic: Adjust indent.
ib
parents: 36456
diff changeset
410 plItem *next = NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
411
33726
a800f30c40d1 Cosmetic: Rename gui() parameter.
ib
parents: 33725
diff changeset
412 switch (what) {
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
413 case GUI_SET_CONTEXT:
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
414
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
415 guiInfo.mpcontext = data;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
416 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
417
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
418 case GUI_SET_STATE:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
419
36779
f5320e43d458 Simplify code.
ib
parents: 36772
diff changeset
420 switch (idata) {
33631
3f6782208075 Simplify code for guiGetEvent type guiSetState.
ib
parents: 33630
diff changeset
421 case GUI_STOP:
33614
79743a5cf4f0 Rename the symbolic playback state constants.
ib
parents: 33611
diff changeset
422 case GUI_PLAY:
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
423 // if ( !gtkShowVideoWindow ) wsWindowVisibility( &guiApp.videoWindow,wsHideWindow );
33614
79743a5cf4f0 Rename the symbolic playback state constants.
ib
parents: 33611
diff changeset
424 case GUI_PAUSE:
36779
f5320e43d458 Simplify code.
ib
parents: 36772
diff changeset
425 guiInfo.Playing = idata;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
426 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
427 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
428
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
429 uiState();
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
430 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
431
36294
a73127c786e8 Remove GUI_HANDLE_EVENTS.
ib
parents: 36293
diff changeset
432 case GUI_REDRAW:
a73127c786e8 Remove GUI_HANDLE_EVENTS.
ib
parents: 36293
diff changeset
433
a73127c786e8 Remove GUI_HANDLE_EVENTS.
ib
parents: 36293
diff changeset
434 uiEvent(ivRedraw, 0);
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
435
33901
d4f80f889106 Cosmetic: Rename guiInfo members.
ib
parents: 33899
diff changeset
436 if (!guiInfo.Playing || !guiInfo.VideoWindow)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
437 wsEvents();
36068
5fb59898a798 Add comment.
ib
parents: 36049
diff changeset
438 /* else it's handled by the vo driver calling GUI_HANDLE_X_EVENT */
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
439
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
440 wsMouseAutohide();
36070
6c3dc8fec01f Rename gtkEventHandling() gtkEvents().
ib
parents: 36069
diff changeset
441 gtkEvents();
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
442
33732
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
443 break;
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
444
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
445 case GUI_RUN_COMMAND:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
446
36779
f5320e43d458 Simplify code.
ib
parents: 36772
diff changeset
447 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", idata);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
448
36779
f5320e43d458 Simplify code.
ib
parents: 36772
diff changeset
449 switch (idata) {
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
450 case MP_CMD_VO_FULLSCREEN:
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
451 uiEvent(evFullScreen, True);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
452 break;
33696
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
453
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
454 case MP_CMD_PLAY_TREE_STEP:
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
455 uiEvent(evNext, 0);
33696
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
456 break;
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
457
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
458 case -MP_CMD_PLAY_TREE_STEP:
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
459 uiEvent(evPrev, 0);
33696
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
460 break;
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
461
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
462 case MP_CMD_STOP:
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
463 uiEvent(evStop, 0);
33696
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
464 break;
33697
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
465
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
466 case MP_CMD_QUIT:
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
467 uiEvent(evExit, 0);
33697
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
468 break;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
469 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
470
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
471 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
472
34339
f05c75392897 Enable gui slave commands.
ib
parents: 34333
diff changeset
473 case GUI_RUN_MESSAGE:
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
474
34339
f05c75392897 Enable gui slave commands.
ib
parents: 34333
diff changeset
475 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
476 msg = appFindMessage((const char *)data);
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
477
34458
1e84148527ab Add user event evMenu.
ib
parents: 34454
diff changeset
478 if ((msg == evMenu) || appFindItem(msg))
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
479 uiEvent(msg, 0);
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
480
34339
f05c75392897 Enable gui slave commands.
ib
parents: 34333
diff changeset
481 break;
f05c75392897 Enable gui slave commands.
ib
parents: 34333
diff changeset
482
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
483 case GUI_PREPARE:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
484
36292
d626e6b9fbc3 Add a redraw and event handling to GUI_PREPARE.
ib
parents: 36282
diff changeset
485 uiEvent(ivRedraw, True);
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
486 wsMouseVisibility(&guiApp.videoWindow, wsHideMouseCursor);
36292
d626e6b9fbc3 Add a redraw and event handling to GUI_PREPARE.
ib
parents: 36282
diff changeset
487 usec_sleep(20000);
d626e6b9fbc3 Add a redraw and event handling to GUI_PREPARE.
ib
parents: 36282
diff changeset
488 wsEvents();
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
489
36937
ad939f49bb28 Cosmetic: Rename guiInfo member NewPlay MediumChanged.
ib
parents: 36936
diff changeset
490 if (guiInfo.MediumChanged == GUI_MEDIUM_NEW) {
34052
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
491 audio_id = -1;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
492 video_id = -1;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
493 dvdsub_id = -1;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
494 vobsub_id = -1;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
495
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
496 stream_cache_size = -1;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
497 autosync = 0;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
498 force_fps = 0;
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
499 }
34032
afb361a00e1f Hide cursor during playback in GUI.
ib
parents: 33993
diff changeset
500
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
501 switch (guiInfo.StreamType) {
34073
ac52c68c17f5 Remove check for STREAMTYPE_PLAYLIST.
ib
parents: 34070
diff changeset
502 case STREAMTYPE_FILE:
ac52c68c17f5 Remove check for STREAMTYPE_PLAYLIST.
ib
parents: 34070
diff changeset
503 case STREAMTYPE_STREAM:
35484
9dceffa5d9b2 Set filename for MPlayer in GUI_PREPARE.
ib
parents: 35481
diff changeset
504 filename = guiInfo.Filename;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
505 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
506
34387
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
507 case STREAMTYPE_CDDA:
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
508 {
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
509 char tmp[512];
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
510
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
511 sprintf(tmp, "cdda://%d", guiInfo.Track);
35452
f42cc2361ee4 Cosmetic: Rename uiSetFileName().
ib
parents: 35430
diff changeset
512 uiSetFile(NULL, tmp, SAME_STREAMTYPE);
34387
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
513 }
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
514 break;
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
515
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
516 case STREAMTYPE_VCD:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
517 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
518 char tmp[512];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
519
33874
e1bec41397bb Don't let VCD track number and guiInfo.Track differ.
ib
parents: 33791
diff changeset
520 sprintf(tmp, "vcd://%d", guiInfo.Track);
35452
f42cc2361ee4 Cosmetic: Rename uiSetFileName().
ib
parents: 35430
diff changeset
521 uiSetFile(NULL, tmp, SAME_STREAMTYPE);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
522 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
523 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
524
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
525 case STREAMTYPE_DVD:
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 char tmp[512];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
528
33876
4789b8eed97e Get rid of a bunch of needless or redundant guiInfo members.
ib
parents: 33874
diff changeset
529 sprintf(tmp, "dvd://%d", guiInfo.Track);
35452
f42cc2361ee4 Cosmetic: Rename uiSetFileName().
ib
parents: 35430
diff changeset
530 uiSetFile(NULL, tmp, SAME_STREAMTYPE);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
531 }
35168
627bdd8915ca Fix building GUI without DVD support.
ib
parents: 35159
diff changeset
532 #ifdef CONFIG_DVDREAD
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
533 dvd_chapter = guiInfo.Chapter;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
534 dvd_angle = guiInfo.Angle;
35168
627bdd8915ca Fix building GUI without DVD support.
ib
parents: 35159
diff changeset
535 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
536 break;
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
537
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
538 case STREAMTYPE_TV:
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
539 case STREAMTYPE_DVB:
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
540 {
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
541 char tmp[512];
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
542
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
543 sprintf(tmp, "%s://", guiTV[gui_tv_digital].SchemeName);
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
544 uiSetFile(NULL, tmp, SAME_STREAMTYPE);
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
545 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
546 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
547
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
548 /* video opts */
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 if (!video_driver_list) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
551 int i = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
552
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
553 while (video_out_drivers[i++]) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
554 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) {
36841
c659d33157e3 Remove unnecessary casts.
ib
parents: 36779
diff changeset
555 listSet(&video_driver_list, video_out_drivers[i - 1]->info->short_name);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
556 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
557 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
558 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
559 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
560
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
561 if (!video_driver_list && !video_driver_list[0]) {
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
562 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_VideoOutError);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
563 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
32984
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
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
566 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
567 int i = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
568
36863
8c331bcef482 Get rid of VOCTRL_GUI_NOWINDOW.
ib
parents: 36843
diff changeset
569 guiInfo.VideoWindow = False;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
570
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
571 while (video_out_drivers[i++]) {
36864
c17524b27039 Cosmetic: Adjust indent.
ib
parents: 36863
diff changeset
572 if ((video_driver_list && !gstrcmp(video_driver_list[0], video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE)) {
c17524b27039 Cosmetic: Adjust indent.
ib
parents: 36863
diff changeset
573 guiInfo.VideoWindow = True;
c17524b27039 Cosmetic: Adjust indent.
ib
parents: 36863
diff changeset
574 break;
c17524b27039 Cosmetic: Adjust indent.
ib
parents: 36863
diff changeset
575 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
576 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
577 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
578
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
579 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3"))
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
580 if (guiInfo.StreamType != STREAMTYPE_DVD && guiInfo.StreamType != STREAMTYPE_VCD)
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
581 if (gtkVfLAVC)
37075
3021ac203d3c Rewrite add_vf().
ib
parents: 37074
diff changeset
582 add_vf("lavc", NULL);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
583
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
584 if (gtkVfPP)
37075
3021ac203d3c Rewrite add_vf().
ib
parents: 37074
diff changeset
585 add_vf("pp", NULL);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
586
37081
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
587 switch (guiInfo.Rotation) {
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
588 static const char *argvf[] = { "_oldargs_", NULL, NULL };
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
589
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
590 case -1:
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
591 remove_vf("rotate");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
592 remove_vf("flip");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
593 remove_vf("mirror");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
594 break;
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
595
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
596 case 1:
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
597 argvf[1] = "1";
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
598 add_vf("rotate", argvf);
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
599 remove_vf("flip");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
600 remove_vf("mirror");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
601 break;
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
602
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
603 case 2:
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
604 argvf[1] = "2";
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
605 add_vf("rotate", argvf);
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
606 remove_vf("flip");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
607 remove_vf("mirror");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
608 break;
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
609
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
610 case 8:
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
611 remove_vf("rotate");
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
612 add_vf("flip", NULL);
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
613 add_vf("mirror", NULL);
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
614 break;
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
615 }
e8559b9913ff New GUI feature: Rotate a video.
ib
parents: 37080
diff changeset
616
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
617 /* audio opts */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
618
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
619 // 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
620 if (gtkAONorm)
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34600
diff changeset
621 listRepl(&af_cfg.list, "volnorm", "volnorm");
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
622
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
623 if (gtkEnableAudioEqualizer)
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34600
diff changeset
624 listRepl(&af_cfg.list, "equalizer", "equalizer");
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
625
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
626 if (gtkAOExtraStereo) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
627 char *name;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
628
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
629 name = malloc(12 + 20 + 1);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
630 snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
631 name[12 + 20] = 0;
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34600
diff changeset
632 listRepl(&af_cfg.list, "extrastereo", name);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
633 free(name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
634 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
635
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
636 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "oss", 3)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
637 mixer_device = gtkAOOSSMixer;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
638 mixer_channel = gtkAOOSSMixerChannel;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
639
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
640 if (gtkAOOSSDevice) {
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
641 char *tmp;
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
642
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
643 tmp = calloc(1, strlen(gtkAOOSSDevice) + 7);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
644 sprintf(tmp, "oss:%s", gtkAOOSSDevice);
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
645 listSet(&audio_driver_list, tmp);
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
646 free(tmp);
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
647 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
648 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
649
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
650 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "alsa", 4)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
651 mixer_device = gtkAOALSAMixer;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
652 mixer_channel = gtkAOALSAMixerChannel;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
653
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
654 if (gtkAOALSADevice) {
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
655 char *tmp;
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
656
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
657 tmp = calloc(1, strlen(gtkAOALSADevice) + 14);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
658 sprintf(tmp, "alsa:device=%s", gtkAOALSADevice);
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
659 listSet(&audio_driver_list, tmp);
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
660 free(tmp);
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
661 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
662 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
663
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
664 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
665 if (gtkAOSDLDriver) {
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
666 char *tmp;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
667
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
668 tmp = calloc(1, strlen(gtkAOSDLDriver) + 10);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
669 sprintf(tmp, "sdl:%s", gtkAOSDLDriver);
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
670 listSet(&audio_driver_list, tmp);
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
671 free(tmp);
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
672 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
673 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
674
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
675 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
676 if (gtkAOESDDevice) {
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
677 char *tmp;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
678
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
679 tmp = calloc(1, strlen(gtkAOESDDevice) + 10);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
680 sprintf(tmp, "esd:%s", gtkAOESDDevice);
34625
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
681 listSet(&audio_driver_list, tmp);
82d1cef6bcee Cosmetic: Adjust indent.
ib
parents: 34624
diff changeset
682 free(tmp);
34624
5d6367c875c2 Don't unnecessarily destroy audio_driver_list.
ib
parents: 34610
diff changeset
683 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
684 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
685
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
686 /* subtitle */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
687
33897
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33895
diff changeset
688 // subdata->filename=gstrdup( guiInfo.SubtitleFilename );
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
689 stream_dump_type = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
690
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
691 if (gtkSubDumpMPSub)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
692 stream_dump_type = 4;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
693
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
694 if (gtkSubDumpSrt)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
695 stream_dump_type = 6;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
696
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35489
diff changeset
697 gtkSubDumpMPSub = gtkSubDumpSrt = False;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
698
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
699 /* misc */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
700
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
701 if (gtkCacheOn)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
702 stream_cache_size = gtkCacheSize;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
703
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
704 if (gtkAutoSyncOn)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
705 autosync = gtkAutoSync;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
706
33897
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33895
diff changeset
707 if (guiInfo.AudioFilename)
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33895
diff changeset
708 audio_stream = gstrdup(guiInfo.AudioFilename);
36937
ad939f49bb28 Cosmetic: Rename guiInfo member NewPlay MediumChanged.
ib
parents: 36936
diff changeset
709 else if (guiInfo.MediumChanged == GUI_MEDIUM_NEW)
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
710 nfree(audio_stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
711
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
712 // audio_stream = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
713
36939
2f9f23ba7da8 Don't assign numeric constant.
ib
parents: 36938
diff changeset
714 guiInfo.MediumChanged = False;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
715
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
716 ass_enabled = gtkASS.enabled;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
717 ass_use_margins = gtkASS.use_margins;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
718 ass_top_margin = gtkASS.top_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
719 ass_bottom_margin = gtkASS.bottom_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
720
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
721 break;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
722
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
723 case GUI_SET_STREAM:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
724
34859
203d0d5cac1f Add playlist support to the GUI.
ib
parents: 34698
diff changeset
725 if (guiInfo.StreamType == STREAMTYPE_PLAYLIST)
203d0d5cac1f Add playlist support to the GUI.
ib
parents: 34698
diff changeset
726 guiInfo.mpcontext->file_format = DEMUXER_TYPE_PLAYLIST;
36456
514b38743990 Fix small bug with GUI_SET_STREAM.
ib
parents: 36455
diff changeset
727 else {
36457
31120561a9da Cosmetic: Adjust indent.
ib
parents: 36456
diff changeset
728 stream = data;
31120561a9da Cosmetic: Adjust indent.
ib
parents: 36456
diff changeset
729 guiInfo.StreamType = stream->type;
36456
514b38743990 Fix small bug with GUI_SET_STREAM.
ib
parents: 36455
diff changeset
730 }
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
731
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
732 switch (guiInfo.StreamType) {
34424
7f04823f744c Explicitly enumerate all stream types.
ib
parents: 34403
diff changeset
733 case STREAMTYPE_FILE:
7f04823f744c Explicitly enumerate all stream types.
ib
parents: 34403
diff changeset
734 case STREAMTYPE_STREAM:
36772
0da6c7ff95d2 Revise code of listMgr() command PLAYLIST_ITEM_GET_POS.
ib
parents: 36762
diff changeset
735 guiInfo.Tracks = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, 0);
34424
7f04823f744c Explicitly enumerate all stream types.
ib
parents: 34403
diff changeset
736 break;
7f04823f744c Explicitly enumerate all stream types.
ib
parents: 34403
diff changeset
737
34387
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
738 case STREAMTYPE_CDDA:
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
739 guiInfo.Tracks = 0;
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
740 stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks);
36437
eb6cdd6b9b86 Update track information at GUI_SET_STREAM for CDDA and VCD.
ib
parents: 36430
diff changeset
741 if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK)
eb6cdd6b9b86 Update track information at GUI_SET_STREAM for CDDA and VCD.
ib
parents: 36430
diff changeset
742 guiInfo.Track++;
34387
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
743 break;
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
744
34077
deff81b57903 Cosmetic: Order STREAMTYPE related code.
ib
parents: 34074
diff changeset
745 case STREAMTYPE_VCD:
deff81b57903 Cosmetic: Order STREAMTYPE related code.
ib
parents: 34074
diff changeset
746 guiInfo.Tracks = 0;
34388
9ee95c78e85f Replace VCD's STREAM_CTRL_GET_NUM_CHAPTERS by STREAM_CTRL_GET_NUM_TITLES.
ib
parents: 34387
diff changeset
747 stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks);
36437
eb6cdd6b9b86 Update track information at GUI_SET_STREAM for CDDA and VCD.
ib
parents: 36430
diff changeset
748 if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK)
eb6cdd6b9b86 Update track information at GUI_SET_STREAM for CDDA and VCD.
ib
parents: 36430
diff changeset
749 guiInfo.Track++;
34077
deff81b57903 Cosmetic: Order STREAMTYPE related code.
ib
parents: 34074
diff changeset
750 break;
deff81b57903 Cosmetic: Order STREAMTYPE related code.
ib
parents: 34074
diff changeset
751
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
752 case STREAMTYPE_DVD:
34389
b2d661762e90 Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents: 34388
diff changeset
753 guiInfo.Tracks = 0;
b2d661762e90 Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents: 34388
diff changeset
754 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
755 guiInfo.Chapters = 0;
b2d661762e90 Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents: 34388
diff changeset
756 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
757 guiInfo.Angles = 0;
b2d661762e90 Retrieve DVD's titles, chapters and angles by stream control commands.
ib
parents: 34388
diff changeset
758 stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles);
36430
08f21a09a545 Don't discard current DVD track information without cause.
ib
parents: 36429
diff changeset
759 if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK)
08f21a09a545 Don't discard current DVD track information without cause.
ib
parents: 36429
diff changeset
760 guiInfo.Track++;
35168
627bdd8915ca Fix building GUI without DVD support.
ib
parents: 35159
diff changeset
761 // guiInfo.Chapter will be set by mplayer
627bdd8915ca Fix building GUI without DVD support.
ib
parents: 35159
diff changeset
762 guiInfo.Angle = 1;
627bdd8915ca Fix building GUI without DVD support.
ib
parents: 35159
diff changeset
763 stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle);
34454
5a45efc630b8 Remove all unnecessary #ifdefs from GUI code.
ib
parents: 34424
diff changeset
764 #ifdef CONFIG_DVDREAD
33730
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
765 dvd = stream->priv;
33902
dd0e5dc6ebbf Add guiDVDStruct members to guiInfo.
ib
parents: 33901
diff changeset
766 guiInfo.AudioStreams = dvd->nr_of_channels;
dd0e5dc6ebbf Add guiDVDStruct members to guiInfo.
ib
parents: 33901
diff changeset
767 memcpy(guiInfo.AudioStream, dvd->audio_streams, sizeof(dvd->audio_streams));
dd0e5dc6ebbf Add guiDVDStruct members to guiInfo.
ib
parents: 33901
diff changeset
768 guiInfo.Subtitles = dvd->nr_of_subtitles;
dd0e5dc6ebbf Add guiDVDStruct members to guiInfo.
ib
parents: 33901
diff changeset
769 memcpy(guiInfo.Subtitle, dvd->subtitles, sizeof(dvd->subtitles));
34454
5a45efc630b8 Remove all unnecessary #ifdefs from GUI code.
ib
parents: 34424
diff changeset
770 #endif
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
771 break;
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
772
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
773 case STREAMTYPE_TV:
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
774 case STREAMTYPE_DVB:
36437
eb6cdd6b9b86 Update track information at GUI_SET_STREAM for CDDA and VCD.
ib
parents: 36430
diff changeset
775 guiInfo.Tracks = guiInfo.Track = 1;
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
776 break;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
777 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
778
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
779 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
780
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
781 case GUI_SET_VIDEO:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
782
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
783 /* video */
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
784
36265
cb8ef00df29f Cosmetic: Adjust indent.
ib
parents: 36264
diff changeset
785 guiInfo.sh_video = data;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
786
35462
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
787 nfree(guiInfo.CodecName);
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
788
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
789 if (guiInfo.sh_video)
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
790 guiInfo.CodecName = strdup(guiInfo.sh_video->codec->name);
e671bb33230f Add video codec name to guiInfo structure.
ib
parents: 35458
diff changeset
791
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36294
diff changeset
792 state = (isSeekableStreamtype ? btnReleased : btnDisabled);
34074
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
793 btnSet(evForward10sec, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
794 btnSet(evBackward10sec, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
795 btnSet(evForward1min, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
796 btnSet(evBackward1min, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
797 btnSet(evForward10min, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
798 btnSet(evBackward10min, state);
360ed500a6e9 Set all buttons related to seek operations according to stream type.
ib
parents: 34073
diff changeset
799 btnSet(evSetMoviePosition, state);
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 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
802 gtkMessageBox(MSGBOX_FATAL, MSGTR_GUI_MSG_DXR3NeedsLavc);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
803 return False;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
804 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
805
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
806 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
807
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
808 case GUI_SET_AUDIO:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
809
36455
c9fb71a139bb Use variable for passed data in GUI_SET_AUDIO.
ib
parents: 36454
diff changeset
810 sh_audio = data;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
811
37090
91628537e24e Fix segmentation fault.
ib
parents: 37085
diff changeset
812 if (sh_audio) {
37095
6cce7a87e800 Cosmetic: Adjust indent.
ib
parents: 37094
diff changeset
813 guiInfo.AudioChannels = sh_audio->channels;
37094
09c3f76bc780 Remove unnecessary variable.
ib
parents: 37093
diff changeset
814 guiInfo.AudioPassthrough = (gstrcmp(sh_audio->ad_driver->info->short_name, "hwac3") == 0);
37096
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
815
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
816 if (!guiInfo.sh_video) {
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
817 guiInfo.VideoWindow = False;
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
818 guiInfo.VideoWidth = 0;
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
819 guiInfo.VideoHeight = 0;
8643426b12de Simplify code.
ib
parents: 37095
diff changeset
820 }
37092
4eeb8a38a971 Simplify code.
ib
parents: 37090
diff changeset
821 } else {
4eeb8a38a971 Simplify code.
ib
parents: 37090
diff changeset
822 guiInfo.AudioChannels = 0;
37090
91628537e24e Fix segmentation fault.
ib
parents: 37085
diff changeset
823 guiInfo.AudioPassthrough = False;
37092
4eeb8a38a971 Simplify code.
ib
parents: 37090
diff changeset
824 }
36455
c9fb71a139bb Use variable for passed data in GUI_SET_AUDIO.
ib
parents: 36454
diff changeset
825
36972
a56291ee9bf9 Disable volume control for AudioPassthrough.
ib
parents: 36971
diff changeset
826 if (guiInfo.AudioPassthrough)
a56291ee9bf9 Disable volume control for AudioPassthrough.
ib
parents: 36971
diff changeset
827 btnSet(evSetVolume, btnDisabled);
36971
fedc8214f8b1 Disable balance control for AudioPassthrough as well.
ib
parents: 36968
diff changeset
828 if (guiInfo.AudioChannels < 2 || guiInfo.AudioPassthrough)
36954
44dcc6c54014 Disable balance control if number of audio channels is too small.
ib
parents: 36946
diff changeset
829 btnSet(evSetBalance, btnDisabled);
44dcc6c54014 Disable balance control if number of audio channels is too small.
ib
parents: 36946
diff changeset
830
36959
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
831 if (last_balance < 0.0f) {
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
832 uiEvent(ivSetVolume, guiInfo.Volume);
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
833
36968
f6bc6cf0fa90 Re-enable balance start value (skin default).
ib
parents: 36966
diff changeset
834 if (guiInfo.AudioChannels == 2 && !guiInfo.AudioPassthrough)
f6bc6cf0fa90 Re-enable balance start value (skin default).
ib
parents: 36966
diff changeset
835 uiEvent(ivSetBalance, guiInfo.Balance);
36959
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
836
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
837 last_balance = guiInfo.Balance;
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
838 }
97a4746e7888 Utilize item defaults given in the skin configuration as start values.
ib
parents: 36954
diff changeset
839
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
840 if (gtkEnableAudioEqualizer) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
841 equalizer_t eq;
33693
006a2db8bd55 Use unsigned index variable for comparison with array size.
ib
parents: 33692
diff changeset
842 unsigned int i, j;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
843
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
844 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
845 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
846 eq.channel = i;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
847 eq.band = j;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
848 eq.gain = gtkEquChannels[i][j];
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
849 mplayer(MPLAYER_SET_EQUALIZER, 0, &eq);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
850 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
851 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
852 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
853
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
854 // These must be done here (in the last call from MPlayer before
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
855 // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because...
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
856
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
857 // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
858 if (!guiInfo.VideoWindow) {
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
859 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
36975
91f11a849d4d Remove unnecessary, bothering parentheses.
ib
parents: 36972
diff changeset
860 btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
861 }
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
862
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
863 // ...option variable fullscreen determines whether MPlayer will handle
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
864 // the window given by WinID as fullscreen window (and will do aspect
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
865 // scaling then) or not - quite rubbish
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
866 fullscreen = gtkLoadFullscreen;
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
867
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
868 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
869
36946
cbaa08dbc9aa Cosmetic: Rename GUI_SET_MIXER GUI_SET_VOLUME_BALANCE.
ib
parents: 36945
diff changeset
870 case GUI_SET_VOLUME_BALANCE:
35535
dad7efd97bbb Relocate mixer assignment.
ib
parents: 35529
diff changeset
871
36454
9a28d5c4320a Provide GUI_SET_MIXER call with argument.
ib
parents: 36437
diff changeset
872 mixer = data;
35535
dad7efd97bbb Relocate mixer assignment.
ib
parents: 35529
diff changeset
873
36945
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
874 mixer_getvolume(mixer, &l, &r);
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
875 guiInfo.Volume = FFMAX(l, r);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
876
36945
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
877 mixer_getbalance(mixer, &b);
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
878 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
879
36945
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
880 if (guiInfo.Balance != last_balance) {
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
881 uiEvent(ivSetVolume, guiInfo.Volume);
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
882 last_balance = guiInfo.Balance;
22750a12bdc7 Cosmetic: Adjust indent.
ib
parents: 36944
diff changeset
883 }
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
884
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
885 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
886
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
887 case GUI_SETUP_VIDEO_WINDOW:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
888
33901
d4f80f889106 Cosmetic: Rename guiInfo members.
ib
parents: 33899
diff changeset
889 guiInfo.VideoWidth = vo_dwidth;
d4f80f889106 Cosmetic: Rename guiInfo members.
ib
parents: 33899
diff changeset
890 guiInfo.VideoHeight = vo_dheight;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
891
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
892 if (!guiApp.videoWindow.isFullScreen || !guiApp.videoWindow.Mapped) {
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
893 if (!guiApp.videoWindow.isFullScreen)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
894 wsWindowResize(&guiApp.videoWindow, guiInfo.VideoWidth, guiInfo.VideoHeight);
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
895 if (!guiApp.videoWindow.Mapped)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
896 wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
897 }
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
898
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
899 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
900 uiEvent(evFullScreen, True);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
901
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
902 if (guiWinID >= 0)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
903 wsWindowMove(&guiApp.mainWindow, True, 0, guiInfo.VideoHeight);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
904
35755
589cf8a5f165 Realize a smooth and flicker-free video when resizing during playback.
ib
parents: 35748
diff changeset
905 wsWindowBackground(&guiApp.videoWindow, -1, -1, -1);
589cf8a5f165 Realize a smooth and flicker-free video when resizing during playback.
ib
parents: 35748
diff changeset
906
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
907 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
908
33733
7458d793b38b Cosmetic: Rename GUI_X_EVENT GUI_HANDLE_X_EVENT.
ib
parents: 33732
diff changeset
909 case GUI_HANDLE_X_EVENT:
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35540
diff changeset
910
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
911 wsEvent(data);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
912 break;
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
913
36940
6410fe917eac Cosmetic: Rename symbolic constant GUI_END_FILE GUI_END_PLAY.
ib
parents: 36939
diff changeset
914 case GUI_END_PLAY:
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
915
35330
5fbd422b355e Fix segmentation fault after end of file playback.
ib
parents: 35170
diff changeset
916 guiInfo.sh_video = NULL;
34035
5daa51a194ed Force redraw of main window after playback has ended.
ib
parents: 34032
diff changeset
917
36972
a56291ee9bf9 Disable volume control for AudioPassthrough.
ib
parents: 36971
diff changeset
918 btnSet(evSetVolume, btnReleased);
36954
44dcc6c54014 Disable balance control if number of audio channels is too small.
ib
parents: 36946
diff changeset
919 btnSet(evSetBalance, btnReleased);
44dcc6c54014 Disable balance control if number of audio channels is too small.
ib
parents: 36946
diff changeset
920
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
921 uiEvent(ivRedraw, True);
34052
9f19a87d2062 Remove gui() instruction GUI_SET_FILE.
ib
parents: 34035
diff changeset
922
35565
5f7a983fc838 Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents: 35564
diff changeset
923 if (guiInfo.Playing) {
35566
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
924 if (!guiInfo.PlaylistNext) {
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
925 guiInfo.PlaylistNext = True;
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
926 break;
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
927 }
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
928
35566
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
929 if (guiInfo.StreamType == STREAMTYPE_CDDA && guiInfo.Track < guiInfo.Tracks) {
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
930 uiNext();
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
931 break;
5053be8dbab2 Cosmetic: Adjust indent.
ib
parents: 35565
diff changeset
932 }
34387
0ba85cad4c7e Add audio CD playback support to the X11/GTK GUI.
ib
parents: 34339
diff changeset
933
35468
047fc4746236 Cosmetic: Adjust indent and move guiInfo member CodecName in structure.
ib
parents: 35467
diff changeset
934 next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0);
35565
5f7a983fc838 Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents: 35564
diff changeset
935 }
34669
697aaedfe59e Remove global variable pointing to playlist item last played.
ib
parents: 34667
diff changeset
936
35565
5f7a983fc838 Embrace several individual "if (guiInfo.Playing)" conditions.
ib
parents: 35564
diff changeset
937 if (next) {
35452
f42cc2361ee4 Cosmetic: Rename uiSetFileName().
ib
parents: 35430
diff changeset
938 uiSetFile(next->path, next->name, STREAMTYPE_FILE);
36937
ad939f49bb28 Cosmetic: Rename guiInfo member NewPlay MediumChanged.
ib
parents: 36936
diff changeset
939 guiInfo.MediumChanged = GUI_MEDIUM_NEW;
36938
c53705079a9d Cosmetic: Adjust indent.
ib
parents: 36937
diff changeset
940 guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
941 } else {
36937
ad939f49bb28 Cosmetic: Rename guiInfo member NewPlay MediumChanged.
ib
parents: 36936
diff changeset
942 if (guiInfo.MediumChanged == GUI_MEDIUM_NEW)
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
943 break;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
944
34113
b3e209516ae0 Allow GUI to use filename related config.
ib
parents: 34083
diff changeset
945 filename = NULL;
b3e209516ae0 Allow GUI to use filename related config.
ib
parents: 34083
diff changeset
946
35546
cd2c85083fdd Reset playlist to first item after playback has stopped.
ib
parents: 35544
diff changeset
947 if (isPlaylistStreamtype) {
35555
069de6f47ec1 Simplify code.
ib
parents: 35553
diff changeset
948 plItem *curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
069de6f47ec1 Simplify code.
ib
parents: 35553
diff changeset
949
069de6f47ec1 Simplify code.
ib
parents: 35553
diff changeset
950 if (!curr)
35547
fb9968ad466e Cosmetic: Adjust indent and add a blank line.
ib
parents: 35546
diff changeset
951 uiUnsetFile();
35558
59361080b09e Limit playlist reset to first item after playback.
ib
parents: 35557
diff changeset
952 else if ((curr != listMgr(PLAYLIST_GET, 0)) && guiInfo.Playing) {
35555
069de6f47ec1 Simplify code.
ib
parents: 35553
diff changeset
953 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
954 uiSetFile(curr->path, curr->name, STREAMTYPE_FILE);
35551
99a11b051705 Set track number after resetting playlist to first item.
ib
parents: 35550
diff changeset
955 guiInfo.Track = 1;
35546
cd2c85083fdd Reset playlist to first item after playback has stopped.
ib
parents: 35544
diff changeset
956 }
35559
14e36699a6e7 Relocate code to set Track, Chapter and Angle start values.
ib
parents: 35558
diff changeset
957 } else if (guiInfo.Playing) {
35563
d4a84f674401 Reset media information for CD/VCD/DVD after playback.
ib
parents: 35559
diff changeset
958 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
959
35563
d4a84f674401 Reset media information for CD/VCD/DVD after playback.
ib
parents: 35559
diff changeset
960 if (guiInfo.Track != first) {
35568
9f58ee705989 Add a parameter to uiUnsetMedia().
ib
parents: 35566
diff changeset
961 uiUnsetMedia(True);
35563
d4a84f674401 Reset media information for CD/VCD/DVD after playback.
ib
parents: 35559
diff changeset
962 guiInfo.Track = first;
d4a84f674401 Reset media information for CD/VCD/DVD after playback.
ib
parents: 35559
diff changeset
963 }
35564
8d4a7387d592 Relocate and change code to set Chapter and Angle start values.
ib
parents: 35563
diff changeset
964
8d4a7387d592 Relocate and change code to set Chapter and Angle start values.
ib
parents: 35563
diff changeset
965 if (guiInfo.StreamType == STREAMTYPE_DVD) {
8d4a7387d592 Relocate and change code to set Chapter and Angle start values.
ib
parents: 35563
diff changeset
966 guiInfo.Chapter = 1;
8d4a7387d592 Relocate and change code to set Chapter and Angle start values.
ib
parents: 35563
diff changeset
967 guiInfo.Angle = 1;
8d4a7387d592 Relocate and change code to set Chapter and Angle start values.
ib
parents: 35563
diff changeset
968 }
35546
cd2c85083fdd Reset playlist to first item after playback has stopped.
ib
parents: 35544
diff changeset
969 }
35381
746e2e0577b2 Without current playlist item, reset guiInfo's Filename and StreamType.
ib
parents: 35376
diff changeset
970
35413
b092553a25c1 Cosmetic: Adjust indent.
ib
parents: 35412
diff changeset
971 guiInfo.ElapsedTime = 0;
36279
79519749ef4e Be more pedantic about type of the constant.
ib
parents: 36265
diff changeset
972 guiInfo.Position = 0.0f;
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
973
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
974 if (gtkShowVideoWindow) {
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
975 guiInfo.VideoWindow = True;
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
976
35663
d1f84b219340 Don't unnecessarily and annoyingly move the video window.
ib
parents: 35658
diff changeset
977 if (!guiApp.videoWindow.isFullScreen)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
978 wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
979
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
980 if (!guiApp.videoWindow.Mapped)
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
981 wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
982
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
983 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
984 uiEvent(evFullScreen, False);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
985 } else {
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
986 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
987 guiInfo.VideoWindow = False;
36975
91f11a849d4d Remove unnecessary, bothering parentheses.
ib
parents: 36972
diff changeset
988 btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
33960
1cd81338af07 Rework fullscreen handling.
ib
parents: 33959
diff changeset
989 }
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
990
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
991 gui(GUI_SET_STATE, (void *)GUI_STOP);
33959
ef089a8affc6 Perform a wsHandleEvents() when playback ends.
ib
parents: 33958
diff changeset
992
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
993 wsWindowRedraw(&guiApp.videoWindow);
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35678
diff changeset
994 wsMouseVisibility(&guiApp.videoWindow, wsShowMouseCursor);
36293
c74ca4ce7103 Relocate wsEvents().
ib
parents: 36292
diff changeset
995 wsEvents();
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
996 }
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
997
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
998 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
999 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1000
33666
0f592e8530f1 Change return code of guiGetEvent() to indicate success.
ib
parents: 33664
diff changeset
1001 return True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1002 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1003
35517
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1004 /**
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1005 * @brief Initialize the GUI playlist (i.e. import files that had been given
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1006 * on the command line) or add files "on the fly" (i.e. replace the
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1007 * current one (a playlist file) by other ones (its content)).
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1008 *
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1009 * @param what command (#GUI_PLAYLIST_INIT or #GUI_PLAYLIST_ADD) to be performed
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1010 * @param playtree MPlayer playtree to read from
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1011 * @param config MPlayer config context
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1012 * @param enqueue whether to overwrite GUI playlist (#False) or to append to it (#True)
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1013 *
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1014 * @return #True (ok) or #False (error)
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1015 */
35512
ce2cda8acb4e Cosmetic: Change variable names.
ib
parents: 35511
diff changeset
1016 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
1017 {
35513
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1018 play_tree_iter_t *pt_iter;
35519
7f1be403a640 Don't unnecessarily use global MPlayer variable filename.
ib
parents: 35518
diff changeset
1019 const char *file;
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1020 int added = False;
35512
ce2cda8acb4e Cosmetic: Change variable names.
ib
parents: 35511
diff changeset
1021 plItem *curr;
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1022
35513
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1023 pt_iter = pt_iter_create(&playtree, config);
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1024
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1025 if (!pt_iter)
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1026 return False;
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1027
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1028 switch (what) {
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1029 case GUI_PLAYLIST_INIT:
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1030
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1031 if (!enqueue)
35517
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1032 listMgr(PLAYLIST_DELETE, 0);
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1033
35519
7f1be403a640 Don't unnecessarily use global MPlayer variable filename.
ib
parents: 35518
diff changeset
1034 while ((file = pt_iter_get_next_file(pt_iter)))
7f1be403a640 Don't unnecessarily use global MPlayer variable filename.
ib
parents: 35518
diff changeset
1035 if (add_to_gui_playlist(file, PLAYLIST_ITEM_APPEND))
35514
a3ca6d31b29f Cosmetic: Adjust indent.
ib
parents: 35513
diff changeset
1036 added = True;
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1037
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1038 uiCurr(); // update filename
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1039 guiInfo.PlaylistNext = True;
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1040
35518
7d695302b856 Move instruction up.
ib
parents: 35517
diff changeset
1041 if (added)
7d695302b856 Move instruction up.
ib
parents: 35517
diff changeset
1042 guiInfo.Track = 1;
7d695302b856 Move instruction up.
ib
parents: 35517
diff changeset
1043
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1044 if (enqueue)
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1045 filename = NULL; // don't start playing
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1046
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1047 break;
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1048
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1049 case GUI_PLAYLIST_ADD:
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1050
35516
70a577baeccc Remove unnecessary cast.
ib
parents: 35515
diff changeset
1051 curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1052
35519
7f1be403a640 Don't unnecessarily use global MPlayer variable filename.
ib
parents: 35518
diff changeset
1053 while ((file = pt_iter_get_next_file(pt_iter)))
7f1be403a640 Don't unnecessarily use global MPlayer variable filename.
ib
parents: 35518
diff changeset
1054 if (add_to_gui_playlist(file, PLAYLIST_ITEM_INSERT))
35514
a3ca6d31b29f Cosmetic: Adjust indent.
ib
parents: 35513
diff changeset
1055 added = True;
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1056
35512
ce2cda8acb4e Cosmetic: Change variable names.
ib
parents: 35511
diff changeset
1057 if (curr)
ce2cda8acb4e Cosmetic: Change variable names.
ib
parents: 35511
diff changeset
1058 listMgr(PLAYLIST_ITEM_SET_CURR, curr);
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1059 else
35517
4664688b4f63 Make comments doxygen comments.
ib
parents: 35516
diff changeset
1060 listMgr(PLAYLIST_ITEM_SET_CURR, listMgr(PLAYLIST_GET, 0));
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1061
35512
ce2cda8acb4e Cosmetic: Change variable names.
ib
parents: 35511
diff changeset
1062 if (curr && added)
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1063 listMgr(PLAYLIST_ITEM_DEL_CURR, 0);
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1064
35511
6616645f91ea Cosmetic: Adjust indent.
ib
parents: 35510
diff changeset
1065 uiCurr(); // update filename
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1066
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1067 break;
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1068 }
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35497
diff changeset
1069
35513
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1070 pt_iter_destroy(&pt_iter);
a24abc593a88 Revise guiPlaylist() concerning pt_iter.
ib
parents: 35512
diff changeset
1071
35494
9cc5a5de6aa1 Cosmetic: Choose better variable name.
ib
parents: 35493
diff changeset
1072 return added;
33746
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1073 }
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1074
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1075 /* GUI -> MPlayer */
23c804f4efbf Cosmetic: Separate interface functions.
ib
parents: 33745
diff changeset
1076
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1077 void mplayer(int what, float value, void *data)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1078 {
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1079 af_stream_t *afilter;
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1080 equalizer_t *eq = (equalizer_t *)data;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1081
33765
c29fc64a28c4 Cosmetic: Rename mplayer() parameter.
ib
parents: 33763
diff changeset
1082 switch (what) {
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
1083 /* subtitle */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1084
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1085 case MPLAYER_SET_FONT_FACTOR:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1086 font_factor = value;
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1087 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1088 break;
34454
5a45efc630b8 Remove all unnecessary #ifdefs from GUI code.
ib
parents: 34424
diff changeset
1089
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1090 case MPLAYER_SET_FONT_OUTLINE:
36282
872298702c15 Increase precision of calculation by using constants of type double.
ib
parents: 36279
diff changeset
1091 subtitle_font_thickness = 8.0 * value / 100.0; // transform 0..100 to 0..8
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1092 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1093 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1094
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1095 case MPLAYER_SET_FONT_BLUR:
36282
872298702c15 Increase precision of calculation by using constants of type double.
ib
parents: 36279
diff changeset
1096 subtitle_font_radius = 8.0 * value / 100.0; // transform 0..100 to 0..8
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1097 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1098 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1099
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1100 case MPLAYER_SET_FONT_TEXTSCALE:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1101 text_font_scale_factor = value;
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1102 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1103 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1104
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1105 case MPLAYER_SET_FONT_OSDSCALE:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1106 osd_font_scale_factor = value;
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1107 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1108 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1109
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1110 case MPLAYER_SET_FONT_ENCODING:
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1111 nfree(subtitle_font_encoding);
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1112 subtitle_font_encoding = gstrdup(data);
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1113 mplayer(MPLAYER_LOAD_FONT, 0, 0);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1114 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1115
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1116 case MPLAYER_SET_FONT_AUTOSCALE:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1117 subtitle_autoscale = (int)value;
36658
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1118 mplayer(MPLAYER_LOAD_FONT, 0, 0);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1119 break;
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1120
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1121 case MPLAYER_LOAD_FONT:
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1122 #ifdef CONFIG_FREETYPE
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1123 set_fontconfig();
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1124
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1125 force_load_font = 1;
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1126 #else
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1127 free_font_desc(vo_font);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1128
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1129 if (font_name) {
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1130 vo_font = read_font_desc(font_name, font_factor, 0);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1131
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1132 if (!vo_font)
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1133 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadFont, font_name);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1134 } else {
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1135 char *fname = get_path("font/font.desc");
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1136
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1137 setdup(&font_name, fname);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1138 free(fname);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1139 vo_font = read_font_desc(font_name, font_factor, 0);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1140
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1141 if (!vo_font) {
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1142 setdup(&font_name, MPLAYER_DATADIR "/font/font.desc");
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1143 vo_font = read_font_desc(font_name, font_factor, 0);
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1144 }
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1145 }
f8d0a552f7a5 Relocate mplayerLoadFont() code.
ib
parents: 36657
diff changeset
1146 #endif
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1147 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1148
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1149 case MPLAYER_SET_SUB_ENCODING:
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1150 nfree(sub_cp);
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1151 sub_cp = gstrdup(data);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1152 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1153
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1154 case MPLAYER_SET_EXTRA_STEREO:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1155 gtkAOExtraStereoMul = value;
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1156 afilter = mpctx_get_afilter(guiInfo.mpcontext);
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1157 if (afilter)
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1158 af_control_any_rev(afilter, AF_CONTROL_ES_MUL | AF_CONTROL_SET, &gtkAOExtraStereoMul);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1159 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1160
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1161 case MPLAYER_SET_PANSCAN:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1162 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1163 mp_cmd_t *mp_cmd;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1164
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1165 mp_cmd = calloc(1, sizeof(*mp_cmd));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1166 mp_cmd->id = MP_CMD_PANSCAN;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1167 mp_cmd->name = strdup("panscan");
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1168 mp_cmd->args[0].v.f = value;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1169 mp_cmd->args[1].v.i = 1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1170 mp_input_queue_cmd(mp_cmd);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1171 }
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1172 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1173
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1174 case MPLAYER_SET_AUTO_QUALITY:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1175 auto_quality = (int)value;
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1176 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1177
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
1178 /* set equalizers */
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1179
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1180 case MPLAYER_SET_CONTRAST:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1181 if (guiInfo.sh_video)
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1182 set_video_colors(guiInfo.sh_video, "contrast", value);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1183 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1184
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1185 case MPLAYER_SET_BRIGHTNESS:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1186 if (guiInfo.sh_video)
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1187 set_video_colors(guiInfo.sh_video, "brightness", value);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1188 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1189
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1190 case MPLAYER_SET_HUE:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1191 if (guiInfo.sh_video)
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1192 set_video_colors(guiInfo.sh_video, "hue", value);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1193 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1194
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1195 case MPLAYER_SET_SATURATION:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1196 if (guiInfo.sh_video)
36842
d8b2651bfeab Remove unnecessary casts.
ib
parents: 36841
diff changeset
1197 set_video_colors(guiInfo.sh_video, "saturation", value);
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1198 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1199
33766
515a3b5f291e Rename the mplayer() symbolic constants.
ib
parents: 33765
diff changeset
1200 case MPLAYER_SET_EQUALIZER:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1201 {
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1202 af_control_ext_t tmp;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1203
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1204 afilter = mpctx_get_afilter(guiInfo.mpcontext);
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1205
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1206 if (eq) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1207 gtkEquChannels[eq->channel][eq->band] = eq->gain;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1208 tmp.ch = eq->channel;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1209 tmp.arg = gtkEquChannels[eq->channel];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1210
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1211 if (afilter)
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1212 af_control_any_rev(afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1213 } else {
33693
006a2db8bd55 Use unsigned index variable for comparison with array size.
ib
parents: 33692
diff changeset
1214 unsigned int i;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1215
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1216 memset(gtkEquChannels, 0, sizeof(gtkEquChannels));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1217
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1218 if (afilter) {
33689
8d0290220239 Replace numeric constants for gtkEquChannels array size.
ib
parents: 33688
diff changeset
1219 for (i = 0; i < FF_ARRAY_ELEMS(gtkEquChannels); i++) {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1220 tmp.ch = i;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1221 tmp.arg = gtkEquChannels[i];
36461
ed153683310d Get rid of guiInfo member afilter.
ib
parents: 36457
diff changeset
1222 af_control_any_rev(afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1223 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1224 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1225 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1226
33744
8497620cefca Remove pointless return code from mplayer().
ib
parents: 33743
diff changeset
1227 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1228 }
33768
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
1229
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
1230 case MPLAYER_EXIT_GUI:
33791
8b0c78a85a8c Cosmetic: Change parameter names of gui() and mplayer().
ib
parents: 33790
diff changeset
1231 exit_player_with_rc((enum exit_reason)value, (enum exit_reason)value >= EXIT_ERROR);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33766
diff changeset
1232 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1233 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1234 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1235
33790
ab6d06f5b98b Add const to some string pointer arguments that will not be modified.
ib
parents: 33775
diff changeset
1236 void mplayerLoadSubtitle(const char *name)
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1237 {
35495
78c44be4e671 Use symbolic constant defined for playing states.
ib
parents: 35494
diff changeset
1238 if (guiInfo.Playing == GUI_STOP)
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1239 return;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1240
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1241 if (subdata) {
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
1242 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingSubtitle);
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1243
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1244 sub_free(subdata);
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1245 subdata = NULL;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1246 vo_sub = NULL;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1247
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1248 if (vo_osd_list) {
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1249 int len;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1250 mp_osd_obj_t *osd;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1251
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1252 osd = vo_osd_list;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1253
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1254 while (osd) {
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1255 if (osd->type == OSDTYPE_SUBTITLE)
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1256 break;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1257
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1258 osd = osd->next;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1259 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1260
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1261 if (osd && (osd->flags & OSDFLAG_VISIBLE)) {
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1262 len = osd->stride * (osd->bbox.y2 - osd->bbox.y1);
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1263 memset(osd->bitmap_buffer, 0, len);
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1264 memset(osd->alpha_buffer, 0, len);
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1265 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1266 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1267 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1268
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1269 if (name) {
36694
eed2fb870f43 Rename symbolic constants of GUI help message texts.
ib
parents: 36658
diff changeset
1270 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1271
36975
91f11a849d4d Remove unnecessary, bothering parentheses.
ib
parents: 36972
diff changeset
1272 subdata = sub_read_file(name, guiInfo.sh_video ? guiInfo.sh_video->fps : 0);
33745
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1273
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1274 if (!subdata)
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1275 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1276
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1277 sub_name = (malloc(2 * sizeof(char *))); // when mplayer will be restarted
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1278 sub_name[0] = strdup(name); // sub_name[0] will be read
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1279 sub_name[1] = NULL;
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1280 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1281
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1282 update_set_of_subtitles();
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1283 }
2d1babde7b29 Cosmetic: Separate interface functions.
ib
parents: 33744
diff changeset
1284
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1285 // NOTE TO MYSELF: This function is nonsense.
33289
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1286 // MPlayer should pass messages to the GUI
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1287 // which must decide then which message has
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1288 // to be shown (MSGL_FATAL, for example).
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1289 // But with this function it is at least
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1290 // possible to show GUI's very critical or
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1291 // abort messages.
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1292 void gmp_msg(int mod, int lev, const char *format, ...)
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1293 {
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1294 char msg[512];
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1295 va_list va;
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1296
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1297 va_start(va, format);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1298 vsnprintf(msg, sizeof(msg), format, va);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1299 va_end(va);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1300
36644
8d39d6874ec0 Do not use non-literal arguments for mp_msg format string
al
parents: 36461
diff changeset
1301 mp_msg(mod, lev, "%s", msg);
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1302
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1303 if (mp_msg_test(mod, lev))
36036
2421356e2a03 Make #defines enums.
ib
parents: 36032
diff changeset
1304 gtkMessageBox(MSGBOX_FATAL, msg);
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1305 }