annotate gui/interface.c @ 33741:962dc701989d

Create new file list.c for list related functions. Move gaddlist() and greplace() from interface.c to list.c.
author ib
date Thu, 07 Jul 2011 10:37:58 +0000
parents 2c02269701bd
children e1539e14d60f
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
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
19 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
20 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
22 #include "interface.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
23 #include "app.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
24 #include "skin/skin.h"
33556
520fb0f7544c Rename GUI directory 'mplayer' and some files in it.
ib
parents: 33555
diff changeset
25 #include "ui/gmplayer.h"
520fb0f7544c Rename GUI directory 'mplayer' and some files in it.
ib
parents: 33555
diff changeset
26 #include "ui/widgets.h"
33741
962dc701989d Create new file list.c for list related functions.
ib
parents: 33740
diff changeset
27 #include "util/list.h"
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
28 #include "util/mem.h"
33737
71c29e8ec68f Move string functions from interface.c to string.c.
ib
parents: 33734
diff changeset
29 #include "util/string.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
30 #include "wm/ws.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
31 #include "wm/wsxdnd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
32
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
33 #include "access_mpcontext.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
34 #include "config.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
35 #include "help_mp.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
36 #include "input/input.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
37 #include "libaf/equalizer.h"
33689
8d0290220239 Replace numeric constants for gtkEquChannels array size.
ib
parents: 33688
diff changeset
38 #include "libavutil/common.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
39 #include "libmpcodecs/dec_audio.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
40 #include "libmpcodecs/dec_video.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
41 #include "libmpcodecs/vd.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
42 #include "libmpcodecs/vf.h"
33398
3feb6b8799a1 Revert r33482.
ib
parents: 33395
diff changeset
43 #include "libvo/video_out.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
44 #include "libvo/x11_common.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
45 #include "mixer.h"
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
46 #include "mp_msg.h"
32032
52b0385d2d7a Move **sub_name extern declaration to mpcommon.h.
diego
parents: 32030
diff changeset
47 #include "mpcommon.h"
30536
39a4dd7ec420 Move GUI-related extern declarations to a GUI header file.
diego
parents: 30535
diff changeset
48 #include "mplayer.h"
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
49 #include "path.h"
32466
9e627a1793b1 Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents: 32461
diff changeset
50 #include "sub/font_load.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32466
diff changeset
51 #include "sub/sub.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
53 #ifdef CONFIG_DVDREAD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54 #include "stream/stream_dvd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
55 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
56
33662
03117468ae0e Remove needless memset initialization of guiInfo.
ib
parents: 33661
diff changeset
57 guiInterface_t guiInfo = {
33664
4bdf796503ad Cosmetic: Adjust indent.
ib
parents: 33663
diff changeset
58 .StreamType = STREAMTYPE_DUMMY,
33663
8b27d1369c5e Fix bug introduced in r33743.
ib
parents: 33662
diff changeset
59 .MovieWindow = True,
33664
4bdf796503ad Cosmetic: Adjust indent.
ib
parents: 33663
diff changeset
60 .Balance = 50.0f
33662
03117468ae0e Remove needless memset initialization of guiInfo.
ib
parents: 33661
diff changeset
61 };
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
63 int guiWinID = -1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64
32900
1481268ccd30 Move global skin directory variables.
ib
parents: 32847
diff changeset
65 char *skinName;
1481268ccd30 Move global skin directory variables.
ib
parents: 32847
diff changeset
66 char *skinDirInHome;
1481268ccd30 Move global skin directory variables.
ib
parents: 32847
diff changeset
67 char *skinMPlayerDir;
1481268ccd30 Move global skin directory variables.
ib
parents: 32847
diff changeset
68
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
69 plItem *plCurrent = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
70 plItem *plList = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
71 plItem *plLastPlayed = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
72
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
73 urlItem *URLList = NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
74
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
75 char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL };
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
76
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
77 float gtkEquChannels[6][10];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
78
33265
62c0471bcf8c Free config.
ib
parents: 33263
diff changeset
79 static int initialized;
62c0471bcf8c Free config.
ib
parents: 33263
diff changeset
80
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
81 void guiInit(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82 {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
83 int i;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
85 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI init.\n");
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
86
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
87 #ifdef CONFIG_DXR3
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
88 if (!gtkDXR3Device)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
89 gtkDXR3Device = strdup("/dev/em8300-0");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
90 #endif
32927
edb972e22021 Fix memory leak in appInitStruct().
ib
parents: 32900
diff changeset
91
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
92 if (stream_cache_size > 0) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
93 gtkCacheOn = 1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
94 gtkCacheSize = stream_cache_size;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
95 } else if (stream_cache_size == 0)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
96 gtkCacheOn = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
97
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
98 if (autosync && (autosync != gtkAutoSync)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
99 gtkAutoSyncOn = 1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
100 gtkAutoSync = autosync;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
101 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
102
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
103 #ifdef CONFIG_ASS
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
104 gtkASS.enabled = ass_enabled;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
105 gtkASS.use_margins = ass_use_margins;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
106 gtkASS.top_margin = ass_top_margin;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
107 gtkASS.bottom_margin = ass_bottom_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
108 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
109
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
110 gtkInit();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
111
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
112 // initialize X
33463
47b5846b20b6 Don't pointlessly cast Display pointer.
ib
parents: 33398
diff changeset
113 wsXInit(mDisplay);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
114
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
115 // load skin
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
116
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
117 skinDirInHome = get_path("skins");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
118 skinMPlayerDir = MPLAYER_DATADIR "/skins";
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
119
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
120 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
121 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinMPlayerDir);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
122
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
123 if (!skinName)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
124 skinName = strdup("default");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
125
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
126 i = skinRead(skinName);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
127
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
128 if (i == -1 && strcmp(skinName, "default") != 0) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
129 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
130
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
131 skinName = strdup("default");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
132 i = skinRead(skinName);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
133 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
134
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
135 switch (i) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
136 case -1:
33024
21e0de9c355f Show GUI message when GUI must exit.
ib
parents: 33023
diff changeset
137 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName);
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
138 guiExit(EXIT_ERROR);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
140 case -2:
33025
7f06781043d9 Revise some GUI error message texts.
ib
parents: 33024
diff changeset
141 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName);
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
142 guiExit(EXIT_ERROR);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
143 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
144
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
145 // initialize windows
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
146
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
147 mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
148
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
149 if (!mainDrawBuffer) {
33024
21e0de9c355f Show GUI message when GUI must exit.
ib
parents: 33023
diff changeset
150 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB);
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
151 guiExit(EXIT_ERROR);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
152 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
153
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
154 if (gui_save_pos) {
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
155 if (gui_main_pos_x != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
156 guiApp.main.x = gui_main_pos_x;
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
157 if (gui_main_pos_y != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
158 guiApp.main.y = gui_main_pos_y;
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
159 if (gui_sub_pos_x != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
160 guiApp.sub.x = gui_sub_pos_x;
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33053
diff changeset
161 if (gui_sub_pos_y != -3)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
162 guiApp.sub.y = gui_sub_pos_y;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
163 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
164
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
165 if (WinID > 0) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
166 guiApp.subWindow.Parent = WinID;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
167 guiApp.sub.x = 0;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
168 guiApp.sub.y = 0;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
169 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
170
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
171 if (guiWinID >= 0)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
172 guiApp.mainWindow.Parent = guiWinID;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
173
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
174 wsCreateWindow(&guiApp.subWindow, guiApp.sub.x, guiApp.sub.y, guiApp.sub.width, guiApp.sub.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow, "MPlayer - Video");
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
175 wsDestroyImage(&guiApp.subWindow);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
176 wsCreateImage(&guiApp.subWindow, guiApp.sub.Bitmap.Width, guiApp.sub.Bitmap.Height);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
177 wsXDNDMakeAwareness(&guiApp.subWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
178
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
179 uiMenuInit();
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
180 uiPlaybarInit();
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
181
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
182 // i=wsHideFrame|wsMaxSize|wsHideWindow;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
183 // if ( guiApp.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
184 i = wsShowFrame | wsMaxSize | wsHideWindow;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
185 wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, i, "MPlayer");
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
186 wsSetShape(&guiApp.mainWindow, guiApp.main.Mask.Image);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
187 wsXDNDMakeAwareness(&guiApp.mainWindow);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
188
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
189 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] screen depth: %d\n", wsDepthOnScreen);
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
190 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] mainWindow ID: 0x%x\n", (int)guiApp.mainWindow.WindowID);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
191 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] subWindow ID: 0x%x\n", (int)guiApp.subWindow.WindowID);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
192
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
193 guiApp.mainWindow.ReDraw = (void *)uiMainDraw;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
194 guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
195 guiApp.mainWindow.KeyHandler = uiMainKeyHandle;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
196 guiApp.mainWindow.DandDHandler = uiDandDHandler;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
197
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
198 guiApp.subWindow.ReDraw = (void *)uiSubDraw;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
199 guiApp.subWindow.MouseHandler = uiSubMouseHandle;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
200 guiApp.subWindow.KeyHandler = uiMainKeyHandle;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
201 guiApp.subWindow.DandDHandler = uiDandDHandler;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
202
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
203 wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
204 wsClearWindow(guiApp.subWindow);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
205
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
206 if (guiApp.sub.Bitmap.Image)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
207 wsConvert(&guiApp.subWindow, guiApp.sub.Bitmap.Image);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
208
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
209 btnModify(evSetVolume, guiInfo.Volume);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
210 btnModify(evSetBalance, guiInfo.Balance);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
211 btnModify(evSetMoviePosition, guiInfo.Position);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
212
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
213 wsSetIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
214 wsSetIcon(wsDisplay, guiApp.subWindow.WindowID, &guiIcon);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
215
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
216 if (!guiApp.mainDecoration)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
217 wsWindowDecoration(&guiApp.mainWindow, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
218
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
219 wsVisibleWindow(&guiApp.mainWindow, wsShowWindow);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
220
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
221 #if 0
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
222 wsVisibleWindow(&guiApp.subWindow, wsShowWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
223 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
224 XEvent xev;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
225
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
226 do
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
227 XNextEvent(wsDisplay, &xev);
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
228 while (xev.type != MapNotify || xev.xmap.event != guiApp.subWindow.WindowID);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
229
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
230 guiApp.subWindow.Mapped = wsMapped;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
231 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
232
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
233 if (!fullscreen)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
234 fullscreen = gtkLoadFullscreen;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
235
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
236 if (fullscreen) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
237 uiFullScreen();
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
238 btnModify(evFullScreen, btnPressed);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
239 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
240 #else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
241 if (!fullscreen)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
242 fullscreen = gtkLoadFullscreen;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
243
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
244 if (gtkShowVideoWindow) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
245 wsVisibleWindow(&guiApp.subWindow, wsShowWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
246 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
247 XEvent xev;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
248
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
249 do
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
250 XNextEvent(wsDisplay, &xev);
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
251 while (xev.type != MapNotify || xev.xmap.event != guiApp.subWindow.WindowID);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
252
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
253 guiApp.subWindow.Mapped = wsMapped;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
254 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
255
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
256 if (fullscreen) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
257 uiFullScreen();
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
258 btnModify(evFullScreen, btnPressed);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
259 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
260 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
261 if (fullscreen) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
262 wsVisibleWindow(&guiApp.subWindow, wsShowWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
263 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
264 XEvent xev;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
265
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
266 do
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
267 XNextEvent(wsDisplay, &xev);
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
268 while (xev.type != MapNotify || xev.xmap.event != guiApp.subWindow.WindowID);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
269
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
270 guiApp.subWindow.Mapped = wsMapped;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
271 }
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
272 guiInfo.Playing = GUI_PAUSE; // because of !gtkShowVideoWindow...
33630
442726a401f1 Cosmetic: Adjust indent.
ib
parents: 33615
diff changeset
273 uiFullScreen(); // ...guiInfo.Playing is required
33609
beec78d9146f Enable fullscreen with inactive video window.
ib
parents: 33595
diff changeset
274 wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
275 btnModify(evFullScreen, btnPressed);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
276 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
277 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
278 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
279
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
280 guiInfo.Playing = GUI_STOP;
33609
beec78d9146f Enable fullscreen with inactive video window.
ib
parents: 33595
diff changeset
281
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
282 uiSubRender = 1;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
283
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
284 if (plCurrent && !filename)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
285 uiSetFileName(plCurrent->path, plCurrent->name, STREAMTYPE_FILE);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
286
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
287 if (subdata)
33740
2c02269701bd Remove macros guiSetFilename() and guiSetDF() from interface.h.
ib
parents: 33739
diff changeset
288 setdup(&guiInfo.Subtitlename, subdata->filename);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
289
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
290 guiLoadFont();
33265
62c0471bcf8c Free config.
ib
parents: 33263
diff changeset
291
62c0471bcf8c Free config.
ib
parents: 33263
diff changeset
292 initialized = 1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
293 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
295 void guiDone(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
296 {
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
297 if (initialized) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
298 uiMainRender = 0;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
299
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
300 if (gui_save_pos) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
301 gui_main_pos_x = guiApp.mainWindow.X;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
302 gui_main_pos_y = guiApp.mainWindow.Y;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
303 gui_sub_pos_x = guiApp.subWindow.X;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
304 gui_sub_pos_y = guiApp.subWindow.Y;
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
305 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
306
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
307 #ifdef CONFIG_ASS
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
308 ass_enabled = gtkASS.enabled;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
309 ass_use_margins = gtkASS.use_margins;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
310 ass_top_margin = gtkASS.top_margin;
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
311 ass_bottom_margin = gtkASS.bottom_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
312 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
313
33308
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
314 cfg_write();
0c2f2368a031 Cosmetic: Adjust indent.
ib
parents: 33307
diff changeset
315 wsXDone();
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
316 }
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
317
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
318 appFreeStruct();
33542
107084241b00 Add support for _NET_WM_ICON
ib
parents: 33541
diff changeset
319 free(guiIcon.collection);
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
320
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
321 if (gui_conf) {
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
322 m_config_free(gui_conf);
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
323 gui_conf = NULL;
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
324 }
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
325
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
326 mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n");
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
327 }
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
328
33309
733376438418 Declare parameter type for guiExit() more precisely.
ib
parents: 33308
diff changeset
329 void guiExit(enum exit_reason how)
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
330 {
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33289
diff changeset
331 exit_player_with_rc(how, how >= EXIT_ERROR);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
332 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
333
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
334 void guiLoadFont(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
335 {
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
336 #ifdef CONFIG_FREETYPE
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
337 load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
338 #else
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
339 if (vo_font) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
340 int i;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
341
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
342 free(vo_font->name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
343 free(vo_font->fpath);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
344
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
345 for (i = 0; i < 16; i++) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
346 if (vo_font->pic_a[i]) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
347 free(vo_font->pic_a[i]->bmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
348 free(vo_font->pic_a[i]->pal);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
349 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
350 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
351
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
352 for (i = 0; i < 16; i++) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
353 if (vo_font->pic_b[i]) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
354 free(vo_font->pic_b[i]->bmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
355 free(vo_font->pic_b[i]->pal);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
356 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
357 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
358
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
359 free(vo_font);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
360 vo_font = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
361 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
362
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
363 if (font_name) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
364 vo_font = read_font_desc(font_name, font_factor, 0);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
365
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
366 if (!vo_font)
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
367 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadFont, font_name);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
368 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
369 font_name = gstrdup(get_path("font/font.desc"));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
370 vo_font = read_font_desc(font_name, font_factor, 0);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
371
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
372 if (!vo_font) {
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
373 nfree(font_name);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
374 font_name = gstrdup(MPLAYER_DATADIR "/font/font.desc");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
375 vo_font = read_font_desc(font_name, font_factor, 0);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
376 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
377 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
378 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
379 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
380
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
381 void guiLoadSubtitle(char *name)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
382 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
383 if (guiInfo.Playing == 0) {
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
384 guiInfo.SubtitleChanged = 1; // what is this for? (mw)
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
385 return;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
386 }
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
387
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
388 if (subdata) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
389 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
390
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
391 sub_free(subdata);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
392 subdata = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
393 vo_sub = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
394
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
395 if (vo_osd_list) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
396 int len;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
397 mp_osd_obj_t *osd;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
398
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
399 osd = vo_osd_list;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
400
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
401 while (osd) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
402 if (osd->type == OSDTYPE_SUBTITLE)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
403 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
404
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
405 osd = osd->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
406 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
407
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
408 if (osd && (osd->flags & OSDFLAG_VISIBLE)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
409 len = osd->stride * (osd->bbox.y2 - osd->bbox.y1);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
410 memset(osd->bitmap_buffer, 0, len);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
411 memset(osd->alpha_buffer, 0, len);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
412 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
413 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
414 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
415
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
416 if (name) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
417 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
418
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
419 subdata = sub_read_file(name, guiInfo.FPS);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
420
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
421 if (!subdata)
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
422 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
423
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
424 sub_name = (malloc(2 * sizeof(char *))); // when mplayer will be restarted
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
425 sub_name[0] = strdup(name); // sub_name[0] will be read
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
426 sub_name[1] = NULL;
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
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
429 update_set_of_subtitles();
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
430 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
431
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
432 static void add_vf(char *str)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
433 {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
434 void *p;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
435
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
436 if (vf_settings) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
437 int i = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
438
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
439 while (vf_settings[i].name) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
440 if (!gstrcmp(vf_settings[i++].name, str)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
441 i = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
442 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
443 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
444 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
445
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
446 if (i != -1) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
447 p = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t));
32712
6ff3cc81d602 Fix resource leaks and check for realloc failures
ib
parents: 32543
diff changeset
448
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
449 if (!p)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
450 return;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
451
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
452 vf_settings = p;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
453 vf_settings[i].name = strdup(str);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
454 vf_settings[i].attribs = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
455 vf_settings[i + 1].name = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
456 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
457 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
458 vf_settings = malloc(2 * sizeof(m_obj_settings_t));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
459 vf_settings[0].name = strdup(str);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
460 vf_settings[0].attribs = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
461 vf_settings[1].name = NULL;
32712
6ff3cc81d602 Fix resource leaks and check for realloc failures
ib
parents: 32543
diff changeset
462 }
6ff3cc81d602 Fix resource leaks and check for realloc failures
ib
parents: 32543
diff changeset
463
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
464 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_AddingVideoFilter, str);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
465 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
466
33726
a800f30c40d1 Cosmetic: Rename gui() parameter.
ib
parents: 33725
diff changeset
467 int gui(int what, void *arg)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
468 {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
469 mixer_t *mixer = NULL;
33685
ca6c9a80a062 Make assignments to variables in guiGetEvent() only if needed.
ib
parents: 33683
diff changeset
470 stream_t *stream;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
471 #ifdef CONFIG_DVDREAD
33687
f23d139ded5b Cosmetic: Rename variable dvdp dvd.
ib
parents: 33686
diff changeset
472 dvd_priv_t *dvd;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
473 #endif
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
474 plItem *next;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
475
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
476 if (guiInfo.mpcontext)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
477 mixer = mpctx_get_mixer(guiInfo.mpcontext);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
478
33726
a800f30c40d1 Cosmetic: Rename gui() parameter.
ib
parents: 33725
diff changeset
479 switch (what) {
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
480 case GUI_SET_CONTEXT:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
481 guiInfo.mpcontext = arg;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
482 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
483
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
484 case GUI_SET_STATE:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
485
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
486 switch ((int)arg) {
33631
3f6782208075 Simplify code for guiGetEvent type guiSetState.
ib
parents: 33630
diff changeset
487 case GUI_STOP:
33614
79743a5cf4f0 Rename the symbolic playback state constants.
ib
parents: 33611
diff changeset
488 case GUI_PLAY:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
489 // if ( !gtkShowVideoWindow ) wsVisibleWindow( &guiApp.subWindow,wsHideWindow );
33614
79743a5cf4f0 Rename the symbolic playback state constants.
ib
parents: 33611
diff changeset
490 case GUI_PAUSE:
33631
3f6782208075 Simplify code for guiGetEvent type guiSetState.
ib
parents: 33630
diff changeset
491 guiInfo.Playing = (int)arg;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
492 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
493 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
494
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
495 uiState();
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
496 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
497
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
498 case GUI_SET_FILE:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
499
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
500 // if ( guiInfo.Playing == 1 && guiInfo.FilenameChanged )
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
501 if (guiInfo.FilenameChanged) {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
502 audio_id = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
503 video_id = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
504 dvdsub_id = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
505 vobsub_id = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
506 stream_cache_size = -1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
507 autosync = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
508 dvd_title = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
509 force_fps = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
510 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
511
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
512 guiInfo.sh_video = NULL;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
513 wsPostRedisplay(&guiApp.subWindow);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
514
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
515 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
516
33732
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
517 case GUI_HANDLE_EVENTS:
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
518 if (!guiInfo.Playing || !guiInfo.MovieWindow)
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
519 wsHandleEvents();
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
520 gtkEventHandling();
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
521 break;
90c992ac5011 Make guiEventHandling() a gui() call.
ib
parents: 33731
diff changeset
522
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
523 case GUI_RUN_COMMAND:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
524
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
525 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)arg);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
526
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
527 switch ((int)arg) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
528 case MP_CMD_VO_FULLSCREEN:
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
529 uiEventHandling(evFullScreen, 0);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
530 break;
33696
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
531
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
532 case MP_CMD_PLAY_TREE_STEP:
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
533 uiEventHandling(evNext, 0);
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
534 break;
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
535
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
536 case -MP_CMD_PLAY_TREE_STEP:
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
537 uiEventHandling(evPrev, 0);
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
538 break;
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
539
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
540 case MP_CMD_STOP:
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
541 uiEventHandling(evStop, 0);
24d919fb6778 Don't let MPlayer directly call user interface functions.
ib
parents: 33695
diff changeset
542 break;
33697
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
543
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
544 case MP_CMD_QUIT:
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
545 uiEventHandling(evExit, 0);
7c93ed3e80cd Cosmetic: Move command MP_CMD_QUIT to the end.
ib
parents: 33696
diff changeset
546 break;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
547 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
548
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
549 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
550
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
551 case GUI_PREPARE:
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
552
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
553 gui(GUI_SET_FILE, 0);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
554
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
555 switch (guiInfo.StreamType) {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
556 case STREAMTYPE_PLAYLIST:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
557 break;
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 #ifdef CONFIG_VCD
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
560 case STREAMTYPE_VCD:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
561 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
562 char tmp[512];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
563
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
564 sprintf(tmp, "vcd://%d", guiInfo.Track + 1);
33740
2c02269701bd Remove macros guiSetFilename() and guiSetDF() from interface.h.
ib
parents: 33739
diff changeset
565 setdup(&guiInfo.Filename, tmp);
32984
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 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
568 #endif
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
569
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
570 #ifdef CONFIG_DVDREAD
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
571 case STREAMTYPE_DVD:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
572 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
573 char tmp[512];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
574
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
575 sprintf(tmp, "dvd://%d", guiInfo.Title);
33740
2c02269701bd Remove macros guiSetFilename() and guiSetDF() from interface.h.
ib
parents: 33739
diff changeset
576 setdup(&guiInfo.Filename, tmp);
32984
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
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
579 dvd_chapter = guiInfo.Chapter;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
580 dvd_angle = guiInfo.Angle;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
581
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
582 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
583 #endif
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
584 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
585
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
586 // if ( guiInfo.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore!
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
587 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
588 if (guiInfo.Filename)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
589 filename = gstrdup(guiInfo.Filename);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
590 else if (filename)
33740
2c02269701bd Remove macros guiSetFilename() and guiSetDF() from interface.h.
ib
parents: 33739
diff changeset
591 setdup(&guiInfo.Filename, filename);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
592 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
593
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
594 // video opts
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
595
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
596 if (!video_driver_list) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
597 int i = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
598
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
599 while (video_out_drivers[i++]) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
600 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
601 gaddlist(&video_driver_list, (char *)video_out_drivers[i - 1]->info->short_name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
602 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
603 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
604 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
605 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
606
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
607 if (!video_driver_list && !video_driver_list[0]) {
33024
21e0de9c355f Show GUI message when GUI must exit.
ib
parents: 33023
diff changeset
608 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_IDFGCVD);
33263
5f527a9a9521 Add an exit function.
ib
parents: 33244
diff changeset
609 guiExit(EXIT_ERROR);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
610 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
611
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
612 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
613 int i = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
614
33655
cbb7cfeb8c71 Rename guiInterface_t member NoWindow MovieWindow.
ib
parents: 33654
diff changeset
615 guiInfo.MovieWindow = True;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
616
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
617 while (video_out_drivers[i++]) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
618 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
619 if ((video_driver_list && !gstrcmp(video_driver_list[0], (char *)video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUI_NOWINDOW, NULL) == VO_TRUE)) {
33655
cbb7cfeb8c71 Rename guiInterface_t member NoWindow MovieWindow.
ib
parents: 33654
diff changeset
620 guiInfo.MovieWindow = False;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
621 break;
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 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
624 }
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
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
627 #ifdef CONFIG_DXR3
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
628 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3"))
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
629 if (guiInfo.StreamType != STREAMTYPE_DVD && guiInfo.StreamType != STREAMTYPE_VCD)
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
630 if (gtkVfLAVC)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
631 add_vf("lavc");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
632 #endif
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
633
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
634 if (gtkVfPP)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
635 add_vf("pp");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
636
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
637 // audio opts
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
638
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
639 // 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
640 if (gtkAONorm)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
641 greplace(&af_cfg.list, "volnorm", "volnorm");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
642
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
643 if (gtkEnableAudioEqualizer)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
644 greplace(&af_cfg.list, "equalizer", "equalizer");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
645
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
646 if (gtkAOExtraStereo) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
647 char *name;
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 name = malloc(12 + 20 + 1);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
650 snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
651 name[12 + 20] = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
652 greplace(&af_cfg.list, "extrastereo", name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
653 free(name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
654 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
655
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
656 #ifdef CONFIG_OSS_AUDIO
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
657 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "oss", 3)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
658 char *tmp;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
659
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
660 mixer_device = gtkAOOSSMixer;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
661 mixer_channel = gtkAOOSSMixerChannel;
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 if (gtkAOOSSDevice) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
664 tmp = calloc(1, strlen(gtkAOOSSDevice) + 7);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
665 sprintf(tmp, "oss:%s", gtkAOOSSDevice);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
666 } else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
667 tmp = strdup("oss");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
668
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
669 gaddlist(&audio_driver_list, tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
670 free(tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
671 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
672 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
673
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
674 #ifdef CONFIG_ALSA
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
675 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "alsa", 4)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
676 char *tmp;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
677
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
678 mixer_device = gtkAOALSAMixer;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
679 mixer_channel = gtkAOALSAMixerChannel;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
680
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
681 if (gtkAOALSADevice) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
682 tmp = calloc(1, strlen(gtkAOALSADevice) + 14);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
683 sprintf(tmp, "alsa:device=%s", gtkAOALSADevice);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
684 } else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
685 tmp = strdup("alsa");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
686
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
687 gaddlist(&audio_driver_list, tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
688 free(tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
689 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
690 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
691
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
692 #ifdef CONFIG_SDL
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
693 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "sdl", 3)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
694 char *tmp;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
695
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
696 if (gtkAOSDLDriver) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
697 tmp = calloc(1, strlen(gtkAOSDLDriver) + 10);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
698 sprintf(tmp, "sdl:%s", gtkAOSDLDriver);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
699 } else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
700 tmp = strdup("sdl");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
701
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
702 gaddlist(&audio_driver_list, tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
703 free(tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
704 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
705 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
706
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
707 #ifdef CONFIG_ESD
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
708 if (audio_driver_list && !gstrncmp(audio_driver_list[0], "esd", 3)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
709 char *tmp;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
710
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
711 if (gtkAOESDDevice) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
712 tmp = calloc(1, strlen(gtkAOESDDevice) + 10);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
713 sprintf(tmp, "esd:%s", gtkAOESDDevice);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
714 } else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
715 tmp = strdup("esd");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
716
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
717 gaddlist(&audio_driver_list, tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
718 free(tmp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
719 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
720 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
721
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
722 // subtitle
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
723
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
724 // subdata->filename=gstrdup( guiInfo.Subtitlename );
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
725 stream_dump_type = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
726
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
727 if (gtkSubDumpMPSub)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
728 stream_dump_type = 4;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
729
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
730 if (gtkSubDumpSrt)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
731 stream_dump_type = 6;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
732
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
733 gtkSubDumpMPSub = gtkSubDumpSrt = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
734 guiLoadFont();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
735
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
736 // misc
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
737
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
738 if (gtkCacheOn)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
739 stream_cache_size = gtkCacheSize;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
740
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
741 if (gtkAutoSyncOn)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
742 autosync = gtkAutoSync;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
743
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
744 if (guiInfo.AudioFile)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
745 audio_stream = gstrdup(guiInfo.AudioFile);
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
746 else if (guiInfo.FilenameChanged)
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
747 nfree(audio_stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
748
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
749 // audio_stream = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
750
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
751 guiInfo.DiskChanged = 0;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
752 guiInfo.FilenameChanged = 0;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
753 guiInfo.NewPlay = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
754
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
755 #ifdef CONFIG_ASS
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
756 ass_enabled = gtkASS.enabled;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
757 ass_use_margins = gtkASS.use_margins;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
758 ass_top_margin = gtkASS.top_margin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
759 ass_bottom_margin = gtkASS.bottom_margin;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
760 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
761
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
762 break;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
763
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
764 case GUI_SET_STREAM:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
765
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
766 stream = arg;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
767 guiInfo.StreamType = stream->type;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
768
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
769 switch (guiInfo.StreamType) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
770 #ifdef CONFIG_DVDREAD
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
771 case STREAMTYPE_DVD:
33730
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
772 dvd = stream->priv;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
773 guiInfo.DVD.titles = dvd->vmg_file->tt_srpt->nr_of_srpts;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
774 guiInfo.DVD.chapters = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
775 guiInfo.DVD.angles = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
776 guiInfo.DVD.nr_of_audio_channels = dvd->nr_of_channels;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
777 memcpy(guiInfo.DVD.audio_streams, dvd->audio_streams, sizeof(dvd->audio_streams));
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
778 guiInfo.DVD.nr_of_subtitles = dvd->nr_of_subtitles;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
779 memcpy(guiInfo.DVD.subtitles, dvd->subtitles, sizeof(dvd->subtitles));
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
780 guiInfo.DVD.current_title = dvd_title + 1;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
781 guiInfo.DVD.current_chapter = dvd_chapter + 1;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
782 guiInfo.DVD.current_angle = dvd_angle + 1;
b4c64f168b29 Remove gui() GMP_SET_DVD.
ib
parents: 33726
diff changeset
783 guiInfo.Track = dvd_title + 1;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
784 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
785 #endif
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
786
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
787 #ifdef CONFIG_VCD
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
788 case STREAMTYPE_VCD:
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
789 guiInfo.VCDTracks = 0;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
790 stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.VCDTracks);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
791 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
792 #endif
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
793
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
794 default:
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
795 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
796 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
797
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
798 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
799
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
800 case GUI_SET_AFILTER:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
801 guiInfo.afilter = arg;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
802 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
803
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
804 case GUI_SET_VIDEO:
33692
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 // video
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
807
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
808 guiInfo.sh_video = arg;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
809
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
810 if (arg) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
811 sh_video_t *sh = arg;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
812 guiInfo.FPS = sh->fps;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
813 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
814
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
815 if (guiInfo.StreamType == STREAMTYPE_STREAM)
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
816 btnSet(evSetMoviePosition, btnDisabled);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
817 else
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
818 btnSet(evSetMoviePosition, btnReleased);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
819
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
820 #ifdef CONFIG_DXR3
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
821 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
822 gtkMessageBox(GTK_MB_FATAL, MSGTR_NEEDLAVC);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
823 return False;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
824 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
825 #endif
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
826
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
827 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
828
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
829 case GUI_SET_AUDIO:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
830
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
831 guiInfo.AudioChannels = arg ? ((sh_audio_t *)arg)->channels : 0;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
832
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
833 if (arg && !guiInfo.sh_video)
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
834 guiInfo.MovieWindow = False;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
835
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
836 gui(GUI_SET_MIXER, 0);
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
837
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
838 if (gtkEnableAudioEqualizer) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
839 equalizer_t eq;
33693
006a2db8bd55 Use unsigned index variable for comparison with array size.
ib
parents: 33692
diff changeset
840 unsigned int i, j;
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
841
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
842 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
843 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
844 eq.channel = i;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
845 eq.band = j;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
846 eq.gain = gtkEquChannels[i][j];
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
847 gtkSet(gtkSetEqualizer, 0, &eq);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
848 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
849 }
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 wsVisibleWindow(&guiApp.subWindow, (guiInfo.MovieWindow ? wsShowWindow : wsHideWindow));
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
853 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
854
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
855 case GUI_SET_MIXER:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
856 if (mixer) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
857 float l, r;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
858 static float last_balance = -1;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
859
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
860 mixer_getvolume(mixer, &l, &r);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
861
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
862 guiInfo.Volume = FFMAX(l, r);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
863 btnModify(evSetVolume, guiInfo.Volume);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
864
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
865 if (guiInfo.Balance != last_balance) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
866 if (guiInfo.Volume)
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
867 guiInfo.Balance = ((r - l) / guiInfo.Volume + 1.0) * 50.0;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
868 else
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
869 guiInfo.Balance = 50.0f;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
870
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
871 last_balance = guiInfo.Balance;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
872 btnModify(evSetBalance, guiInfo.Balance);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
873 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
874 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
875 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
876
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
877 case GUI_REDRAW:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
878 uiEventHandling(evRedraw, 0);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
879 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
880
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
881 case GUI_SETUP_VIDEO_WINDOW:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
882
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
883 if (!guiApp.subWindow.isFullScreen) {
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
884 wsResizeWindow(&guiApp.subWindow, vo_dwidth, vo_dheight);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
885 wsMoveWindow(&guiApp.subWindow, True, guiApp.sub.x, guiApp.sub.y);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
886 }
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
887
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
888 guiInfo.MovieWidth = vo_dwidth;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
889 guiInfo.MovieHeight = vo_dheight;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
890
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
891 if (guiWinID >= 0)
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
892 wsMoveWindow(&guiApp.mainWindow, False, 0, vo_dheight);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
893
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
894 WinID = guiApp.subWindow.WindowID;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
895 break;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
896
33733
7458d793b38b Cosmetic: Rename GUI_X_EVENT GUI_HANDLE_X_EVENT.
ib
parents: 33732
diff changeset
897 case GUI_HANDLE_X_EVENT:
33692
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
898 guiInfo.event_struct = arg;
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
899 wsEvents(wsDisplay, arg);
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
900 gtkEventHandling();
0e9a5c0194ed Cosmetic: Arrange guiGetEvent() types in the sequence they are called.
ib
parents: 33691
diff changeset
901 break;
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
902
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
903 case GUI_END_FILE:
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
904
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
905 if (!uiGotoTheNext && guiInfo.Playing) {
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
906 uiGotoTheNext = 1;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
907 break;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
908 }
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
909
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
910 if (guiInfo.Playing && (next = gtkSet(gtkGetNextPlItem, 0, NULL)) && (plLastPlayed != next)) {
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
911 plLastPlayed = next;
33740
2c02269701bd Remove macros guiSetFilename() and guiSetDF() from interface.h.
ib
parents: 33739
diff changeset
912 setddup(&guiInfo.Filename, next->path, next->name);
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
913 guiInfo.StreamType = STREAMTYPE_FILE;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
914 guiInfo.FilenameChanged = guiInfo.NewPlay = 1;
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
915 nfree(guiInfo.AudioFile);
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
916 nfree(guiInfo.Subtitlename);
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
917 } else {
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
918 if (guiInfo.FilenameChanged || guiInfo.NewPlay)
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
919 break;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
920
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
921 guiInfo.TimeSec = 0;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
922 guiInfo.Position = 0;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
923 guiInfo.AudioChannels = 0;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
924 guiInfo.MovieWindow = True;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
925
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
926 #ifdef CONFIG_DVDREAD
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
927 guiInfo.DVD.current_title = 1;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
928 guiInfo.DVD.current_chapter = 1;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
929 guiInfo.DVD.current_angle = 1;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
930 #endif
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
931
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
932 if (!guiApp.subWindow.isFullScreen && gtkShowVideoWindow) {
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
933 wsResizeWindow(&guiApp.subWindow, guiApp.sub.width, guiApp.sub.height);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
934 wsMoveWindow(&guiApp.subWindow, True, guiApp.sub.x, guiApp.sub.y);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
935 } else
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
936 wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
937
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33730
diff changeset
938 gui(GUI_SET_STATE, (void *)GUI_STOP);
33694
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
939 uiSubRender = 1;
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
940 wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
941 wsClearWindow(guiApp.subWindow);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
942 wsPostRedisplay(&guiApp.subWindow);
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
943 }
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
944
45553d0f65c6 Don't let MPlayer directly call user interface functions.
ib
parents: 33693
diff changeset
945 break;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
946 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
947
33666
0f592e8530f1 Change return code of guiGetEvent() to indicate success.
ib
parents: 33664
diff changeset
948 return True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
949 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
950
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
951 // ---
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
952 #if defined(MP_DEBUG) && 0
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
953 void list(void)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
954 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
955 plItem *next = plList;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
956
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
957 printf("--- list ---\n");
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
958
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
959 while (next || next->next) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
960 printf("item: %s/%s\n", next->path, next->name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
961
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
962 if (next->next)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
963 next = next->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
964 else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
965 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
966 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
967
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
968 printf("--- end of list ---\n");
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
969 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
970 #else
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
971 #define list();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
972 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
973
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
974 void *gtkSet(int cmd, float fparam, void *vparam)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
975 {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
976 equalizer_t *eq = (equalizer_t *)vparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
977 plItem *item = (plItem *)vparam;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
978 urlItem *url_item = (urlItem *)vparam;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
979 int is_added = True;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
980
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
981 switch (cmd) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
982 // handle playlist
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
983
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
984 // add item to playlist
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
985 case gtkAddPlItem:
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
986
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
987 if (plList) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
988 plItem *next = plList;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
989
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
990 while (next->next)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
991 // {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
992 // printf( "%s\n",next->name );
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
993 next = next->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
994 // }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
995
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
996 next->next = item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
997 item->prev = next;
33475
b1bda1dded08 When adding a playlist item, preventively set its next pointer to NULL.
ib
parents: 33473
diff changeset
998 item->next = NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
999 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1000 item->prev = item->next = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1001 plCurrent = plList = item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1002 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1003
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1004 list();
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1005
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1006 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1007
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1008 // add item into playlist after current
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1009 case gtkInsertPlItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1010 if (plCurrent) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1011 plItem *curr = plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1012 item->next = curr->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1013
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1014 if (item->next)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1015 item->next->prev = item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1016
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1017 item->prev = curr;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1018 curr->next = item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1019 plCurrent = plCurrent->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1020
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1021 return plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1022 } else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1023 return gtkSet(gtkAddPlItem, 0, (void *)item);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1024 return NULL; // NOTE TO MYSELF: remove this
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1025
33473
74db5e584741 Cosmetic: Correct a comment and add a new one.
ib
parents: 33463
diff changeset
1026 // get next item from playlist
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1027 case gtkGetNextPlItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1028 if (plCurrent && plCurrent->next) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1029 plCurrent = plCurrent->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1030 // if (!plCurrent && plList)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1031 // {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1032 // plItem *next = plList;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1033 //
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1034 // while (next->next)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1035 // {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1036 // if (!next->next) break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1037 // next = next->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1038 // }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1039 //
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1040 // plCurrent = next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1041 // }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1042 return plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1043 }
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1044
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1045 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1046
33473
74db5e584741 Cosmetic: Correct a comment and add a new one.
ib
parents: 33463
diff changeset
1047 // get previous item from playlist
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1048 case gtkGetPrevPlItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1049 if (plCurrent && plCurrent->prev) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1050 plCurrent = plCurrent->prev;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1051 // if ( !plCurrent && plList ) plCurrent=plList;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1052 return plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1053 }
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1054
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1055 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1056
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1057 // set current item
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1058 case gtkSetCurrPlItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1059 plCurrent = item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1060 return plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1061
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1062 // get current item
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1063 case gtkGetCurrPlItem:
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1064 return plCurrent;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1065
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1066 // delete current item
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1067 case gtkDelCurrPlItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1068 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1069 plItem *curr = plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1070
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1071 if (!curr)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1072 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1073
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1074 if (curr->prev)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1075 curr->prev->next = curr->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1076 if (curr->next)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1077 curr->next->prev = curr->prev;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1078 if (curr == plList)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1079 plList = curr->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1080
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1081 plCurrent = curr->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1082
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1083 // free it
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1084 free(curr->path);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1085 free(curr->name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1086 free(curr);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1087 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1088
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1089 uiCurr(); // instead of using uiNext && uiPrev
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1090
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1091 return plCurrent;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1092
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1093 // delete list
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1094 case gtkDelPl:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1095 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1096 plItem *curr = plList;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1097 plItem *next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1098
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1099 if (!plList)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1100 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1101
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1102 if (!curr->next) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1103 free(curr->path);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1104 free(curr->name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1105 free(curr);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1106 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1107 while (curr->next) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1108 next = curr->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1109 free(curr->path);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1110 free(curr->name);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1111 free(curr);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1112 curr = next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1113 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1114 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1115
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1116 plList = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1117 plCurrent = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1118 }
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1119
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1120 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1121
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1122 // handle url
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1123 case gtkAddURLItem:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1124 if (URLList) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1125 urlItem *next_url = URLList;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1126 is_added = False;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1127
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1128 while (next_url->next) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1129 if (!gstrcmp(next_url->url, url_item->url)) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1130 is_added = True;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1131 break;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1132 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1133
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1134 next_url = next_url->next;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1135 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1136
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1137 if (!is_added && gstrcmp(next_url->url, url_item->url))
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1138 next_url->next = url_item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1139 } else {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1140 url_item->next = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1141 URLList = url_item;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1142 }
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1143
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1144 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1145
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1146 // subtitle
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1147
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
1148 #ifndef CONFIG_FREETYPE
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1149 case gtkSetFontFactor:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1150 font_factor = fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1151 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1152 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1153 #else
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1154 case gtkSetFontOutLine:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1155 subtitle_font_thickness = (8.0f / 100.0f) * fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1156 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1157 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1158
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1159 case gtkSetFontBlur:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1160 subtitle_font_radius = (8.0f / 100.0f) * fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1161 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1162 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1163
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1164 case gtkSetFontTextScale:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1165 text_font_scale_factor = fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1166 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1167 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1168
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1169 case gtkSetFontOSDScale:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1170 osd_font_scale_factor = fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1171 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1172 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1173
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1174 case gtkSetFontEncoding:
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1175 nfree(subtitle_font_encoding);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1176 subtitle_font_encoding = gstrdup((char *)vparam);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1177 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1178 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1179
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1180 case gtkSetFontAutoScale:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1181 subtitle_autoscale = (int)fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1182 guiLoadFont();
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1183 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1184 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1185
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
1186 #ifdef CONFIG_ICONV
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1187 case gtkSetSubEncoding:
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1188 nfree(sub_cp);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1189 sub_cp = gstrdup((char *)vparam);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1190 break;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1191 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1192
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1193 // misc
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1194
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1195 case gtkClearStruct:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1196
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1197 if ((unsigned int)vparam & guiFilenames) {
33739
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1198 nfree(guiInfo.Filename);
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1199 nfree(guiInfo.Subtitlename);
9f6d46d325de Remove gfree() from interface.c.
ib
parents: 33737
diff changeset
1200 nfree(guiInfo.AudioFile);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1201 gtkSet(gtkDelPl, 0, NULL);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1202 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1203
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
1204 #ifdef CONFIG_DVDREAD
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1205 if ((unsigned int)vparam & guiDVD)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1206 memset(&guiInfo.DVD, 0, sizeof(guiDVDStruct));
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1207 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1208
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
1209 #ifdef CONFIG_VCD
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1210 if ((unsigned int)vparam & guiVCD)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1211 guiInfo.VCDTracks = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1212 #endif
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1213
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1214 return NULL;
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 case gtkSetExtraStereo:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1217 gtkAOExtraStereoMul = fparam;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1218 if (guiInfo.afilter)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1219 af_control_any_rev(guiInfo.afilter, AF_CONTROL_ES_MUL | AF_CONTROL_SET, &gtkAOExtraStereoMul);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1220 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1221
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1222 case gtkSetPanscan:
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 mp_cmd_t *mp_cmd;
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 mp_cmd = calloc(1, sizeof(*mp_cmd));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1227 mp_cmd->id = MP_CMD_PANSCAN;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1228 mp_cmd->name = strdup("panscan");
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1229 mp_cmd->args[0].v.f = fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1230 mp_cmd->args[1].v.i = 1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1231 mp_input_queue_cmd(mp_cmd);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1232 }
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33025
diff changeset
1233
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1234 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1235
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1236 case gtkSetAutoq:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1237 auto_quality = (int)fparam;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1238 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1239
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1240 // set equalizers
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1241
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1242 case gtkSetContrast:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1243 if (guiInfo.sh_video)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1244 set_video_colors(guiInfo.sh_video, "contrast", (int)fparam);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1245 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1246
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1247 case gtkSetBrightness:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1248 if (guiInfo.sh_video)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1249 set_video_colors(guiInfo.sh_video, "brightness", (int)fparam);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1250 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1251
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1252 case gtkSetHue:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1253 if (guiInfo.sh_video)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1254 set_video_colors(guiInfo.sh_video, "hue", (int)fparam);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1255 return NULL;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1256
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1257 case gtkSetSaturation:
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1258 if (guiInfo.sh_video)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1259 set_video_colors(guiInfo.sh_video, "saturation", (int)fparam);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1260 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1261
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1262 case gtkSetEqualizer:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1263 {
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1264 af_control_ext_t tmp;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1265
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1266 if (eq) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1267 gtkEquChannels[eq->channel][eq->band] = eq->gain;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1268 tmp.ch = eq->channel;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1269 tmp.arg = gtkEquChannels[eq->channel];
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1270
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1271 if (guiInfo.afilter)
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1272 af_control_any_rev(guiInfo.afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1273 } else {
33693
006a2db8bd55 Use unsigned index variable for comparison with array size.
ib
parents: 33692
diff changeset
1274 unsigned int i;
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1275
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1276 memset(gtkEquChannels, 0, sizeof(gtkEquChannels));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1277
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1278 if (guiInfo.afilter) {
33689
8d0290220239 Replace numeric constants for gtkEquChannels array size.
ib
parents: 33688
diff changeset
1279 for (i = 0; i < FF_ARRAY_ELEMS(gtkEquChannels); i++) {
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1280 tmp.ch = i;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1281 tmp.arg = gtkEquChannels[i];
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1282 af_control_any_rev(guiInfo.afilter, AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET, &tmp);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1283 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1284 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1285 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1286
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1287 return NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1288 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1289 }
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1290
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1291 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1292 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1293
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1294 // This function adds/inserts one file into the gui playlist.
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1295 static int import_file_into_gui(char *temp, int insert)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1296 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1297 char *filename, *pathname;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1298 plItem *item;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1299
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1300 filename = strdup(mp_basename(temp));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1301 pathname = strdup(temp);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1302
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1303 if (strlen(pathname) - strlen(filename) > 0)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1304 pathname[strlen(pathname) - strlen(filename) - 1] = 0; // we have some path, so remove / at end
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1305 else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1306 pathname[strlen(pathname) - strlen(filename)] = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1307
33530
7ced3616af42 Revise some messages.
ib
parents: 33529
diff changeset
1308 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] playtree, add: %s/%s\n", pathname, filename);
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1309
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1310 item = calloc(1, sizeof(plItem));
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1311
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1312 if (!item)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1313 return 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1314
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1315 item->name = filename;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1316 item->path = pathname;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1317
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1318 if (insert)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1319 gtkSet(gtkInsertPlItem, 0, (void *)item); // inserts the item after current, and makes current=item
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1320 else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1321 gtkSet(gtkAddPlItem, 0, (void *)item);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1322
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1323 return 1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1324 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1325
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1326 // This function imports the initial playtree (based on cmd-line files)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1327 // into the gui playlist by either:
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1328 // - overwriting gui pl (enqueue=0)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1329 // - appending it to gui pl (enqueue=1)
33734
1fbe7adc4eaf Rename GUI playtree import functions.
ib
parents: 33733
diff changeset
1330 int guiInitializePlaylist(play_tree_t *my_playtree, m_config_t *config, int enqueue)
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1331 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1332 play_tree_iter_t *my_pt_iter = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1333 int result = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1334
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1335 if (!enqueue)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1336 gtkSet(gtkDelPl, 0, 0); // delete playlist before "appending"
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1337
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1338 if ((my_pt_iter = pt_iter_create(&my_playtree, config))) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1339 while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1340 // add it to end of list
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1341 if (import_file_into_gui(filename, 0))
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1342 result = 1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1343 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1344
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1345 uiCurr(); // update filename
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1346 uiGotoTheNext = 1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1347
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1348 if (!enqueue)
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1349 filename = guiInfo.Filename; // Backward compatibility; if file is specified on commandline,
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1350 // gmplayer does directly start in Play-Mode.
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1351 else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1352 filename = NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1353
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1354 return result;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1355 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1356
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1357 // This function imports and inserts an playtree, that is created "on the fly",
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1358 // for example by parsing some MOV-Reference-File; or by loading an playlist
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1359 // with "File Open".
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1360 // The file which contained the playlist is thereby replaced with it's contents.
33734
1fbe7adc4eaf Rename GUI playtree import functions.
ib
parents: 33733
diff changeset
1361 int guiAddPlaylist(play_tree_t *my_playtree, m_config_t *config)
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1362 {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1363 play_tree_iter_t *my_pt_iter = NULL;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1364 int result = 0;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1365 plItem *save;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1366
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1367 save = (plItem *)gtkSet(gtkGetCurrPlItem, 0, 0); // save current item
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1368
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1369 if ((my_pt_iter = pt_iter_create(&my_playtree, config))) {
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1370 while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1371 // insert it into the list and set plCurrent=new item
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1372 if (import_file_into_gui(filename, 1))
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1373 result = 1;
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1374
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1375 pt_iter_destroy(&my_pt_iter);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1376 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1377
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1378 if (save)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1379 gtkSet(gtkSetCurrPlItem, 0, (void *)save);
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1380 else
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1381 gtkSet(gtkSetCurrPlItem, 0, (void *)plList); // go to head, if plList was empty before
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1382
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1383 if (save && result)
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1384 gtkSet(gtkDelCurrPlItem, 0, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1385
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
1386 uiCurr(); // update filename
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1387 filename = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27393
diff changeset
1388
32984
eb831a979df7 Cosmetic: Format to MPlayer coding style.
ib
parents: 32978
diff changeset
1389 return result;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1390 }
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1391
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1392 // NOTE TO MYSELF: This function is nonsense.
33289
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1393 // MPlayer should pass messages to the GUI
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1394 // which must decide then which message has
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1395 // to be shown (MSGL_FATAL, for example).
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1396 // But with this function it is at least
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1397 // possible to show GUI's very critical or
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33268
diff changeset
1398 // abort messages.
33023
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1399 void gmp_msg(int mod, int lev, const char *format, ...)
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1400 {
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1401 char msg[512];
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1402 va_list va;
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1403
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1404 va_start(va, format);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1405 vsnprintf(msg, sizeof(msg), format, va);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1406 va_end(va);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1407
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1408 mp_msg(mod, lev, msg);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1409
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1410 if (mp_msg_test(mod, lev))
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1411 gtkMessageBox(GTK_MB_FATAL, msg);
ba432e34dc7e Add message showing function.
ib
parents: 33006
diff changeset
1412 }