annotate gui/interface.c @ 35100:bc7b006732c0

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