annotate gui/cfg.c @ 33526:140525bcc32f

Fix GUI icon bug. The GUI icon did not display properly but showed up with various distortions. The reason was the icon mask which hadn't been put to the X server yet when used. The icon itself was okay, but is rendered now in a way that doesn't need a drawable which spares creating a GTK window and destroying it right after. The locally used GDK variables have been moved inside the function where they are needed. Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu. This closes Bugzilla #582.
author ib
date Tue, 14 Jun 2011 17:51:17 +0000 (2011-06-14)
parents e413b573e4ec
children 7ced3616af42
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
1 /*
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
2 * This file is part of MPlayer.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
3 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
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: 26422
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
7 * (at your option) any later version.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
8 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
12 * GNU General Public License for more details.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
13 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
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: 26422
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26422
diff changeset
17 */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
18
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
19 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
20 #include <stdio.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
23 #include "cfg.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
24 #include "interface.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
25
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
26 #include "config.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
27 #include "help_mp.h"
30653
3d23e24c5c60 Declare externally used variables from vd.c as extern in vd.h.
diego
parents: 30633
diff changeset
28 #include "libmpcodecs/vd.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29 #include "libvo/video_out.h"
31385
f2aebe1309b2 Declare stop_xscreensaver extern in x11_common.h instead of all over the code.
diego
parents: 30901
diff changeset
30 #include "libvo/x11_common.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
31 #include "mixer.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
32 #include "mp_msg.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
33 #include "mpcommon.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
34 #include "mplayer.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
35 #include "parser-cfg.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
36 #include "path.h"
32981
6e22bcc85ac5 Cosmetic: Add required include files.
ib
parents: 32467
diff changeset
37 #include "sub/font_load.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
38 #include "sub/sub.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
39
33265
62c0471bcf8c Free config.
ib
parents: 33264
diff changeset
40 m_config_t *gui_conf;
62c0471bcf8c Free config.
ib
parents: 33264
diff changeset
41
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
42 int gtkCacheOn;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
43 int gtkCacheSize = 2048;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
44
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
45 int gtkVfPP;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
46
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
47 #ifdef CONFIG_DXR3
33249
8fc02babf810 Limit config option vf_lavc to dxr3.
ib
parents: 33242
diff changeset
48 int gtkVfLAVC;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
49 char *gtkDXR3Device;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
50 #endif
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
51
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
52 int gtkAutoSyncOn;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
53 int gtkAutoSync;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
55 int gtkAONorm;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
56 int gtkAOSurround;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
57 int gtkAOExtraStereo;
33221
9920df91c2b7 Make initial value explicitly type float.
ib
parents: 33220
diff changeset
58 float gtkAOExtraStereoMul = 1.0f;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
59
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
60 #ifdef CONFIG_ALSA
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
61 char *gtkAOALSAMixer;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
62 char *gtkAOALSAMixerChannel;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
63 char *gtkAOALSADevice;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64 #endif
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
65
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
66 #ifdef CONFIG_OSS_AUDIO
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
67 char *gtkAOOSSMixer;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
68 char *gtkAOOSSMixerChannel;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
69 char *gtkAOOSSDevice;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70 #endif
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
71
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
72 #ifdef CONFIG_ESD
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
73 char *gtkAOESDDevice;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
74 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
75
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
76 #ifdef CONFIG_SDL
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
77 char *gtkAOSDLDriver;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
78 #endif
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
79
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
80 int gtkEnableAudioEqualizer;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
81
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
82 int gtkSubDumpMPSub;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
83 int gtkSubDumpSrt;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
85 #ifdef CONFIG_ASS
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
86 gtkASS_t gtkASS;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
87 #endif
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
88
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
89 int gtkEnablePlayBar = 1;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
90 int gtkLoadFullscreen;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
91 int gtkShowVideoWindow = 1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
92
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
93 int gui_save_pos = 1;
33218
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33180
diff changeset
94 int gui_main_pos_x = -3;
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33180
diff changeset
95 int gui_main_pos_y = -3;
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33180
diff changeset
96 int gui_sub_pos_x = -3;
f0c2a62e3e89 Position windows initially at coordinates given in skin file.
ib
parents: 33180
diff changeset
97 int gui_sub_pos_y = -3;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
98
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
99 static const m_option_t gui_opts[] = {
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
100 { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
101 { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
102
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
103 { "vf_pp", &gtkVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
104
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
105 #ifdef CONFIG_DXR3
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
106 { "vf_lavc", &gtkVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
107 { "vo_dxr3_device", &gtkDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
108 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
109
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
110 { "autosync", &gtkAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
111 { "autosync_size", &gtkAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
112
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
113 { "ao_volnorm", &gtkAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
114 { "ao_surround", &gtkAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
115 { "ao_extra_stereo", &gtkAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
116 { "ao_extra_stereo_coefficient", &gtkAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
117
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
118 #ifdef CONFIG_ALSA
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
119 { "ao_alsa_mixer", &gtkAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
120 { "ao_alsa_mixer_channel", &gtkAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
121 { "ao_alsa_device", &gtkAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
122 #endif
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
123
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
124 #ifdef CONFIG_OSS_AUDIO
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
125 { "ao_oss_mixer", &gtkAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
126 { "ao_oss_mixer_channel", &gtkAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
127 { "ao_oss_device", &gtkAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
128 #endif
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
129
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
130 #ifdef CONFIG_ESD
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
131 { "ao_esd_device", &gtkAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
132 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
133
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
134 #ifdef CONFIG_SDL
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
135 { "ao_sdl_subdriver", &gtkAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
136 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
137
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
138 { "enable_audio_equ", &gtkEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
140 { "equ_channel_1", &gtkEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
141 { "equ_channel_2", &gtkEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
142 { "equ_channel_3", &gtkEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
143 { "equ_channel_4", &gtkEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
144 { "equ_channel_5", &gtkEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
145 { "equ_channel_6", &gtkEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
146
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
147 #define audio_equ_row(i, j) \
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
148 { "equ_band_" # i # j, &gtkEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL }
33289
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
149 audio_equ_row(0, 0), audio_equ_row(0, 1), audio_equ_row(0, 2), audio_equ_row(0, 3), audio_equ_row(0, 4), audio_equ_row(0, 5), audio_equ_row(0, 6), audio_equ_row(0, 7), audio_equ_row(0, 8), audio_equ_row(0, 9),
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
150 audio_equ_row(1, 0), audio_equ_row(1, 1), audio_equ_row(1, 2), audio_equ_row(1, 3), audio_equ_row(1, 4), audio_equ_row(1, 5), audio_equ_row(1, 6), audio_equ_row(1, 7), audio_equ_row(1, 8), audio_equ_row(1, 9),
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
151 audio_equ_row(2, 0), audio_equ_row(2, 1), audio_equ_row(2, 2), audio_equ_row(2, 3), audio_equ_row(2, 4), audio_equ_row(2, 5), audio_equ_row(2, 6), audio_equ_row(2, 7), audio_equ_row(2, 8), audio_equ_row(2, 9),
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
152 audio_equ_row(3, 0), audio_equ_row(3, 1), audio_equ_row(3, 2), audio_equ_row(3, 3), audio_equ_row(3, 4), audio_equ_row(3, 5), audio_equ_row(3, 6), audio_equ_row(3, 7), audio_equ_row(3, 8), audio_equ_row(3, 9),
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
153 audio_equ_row(4, 0), audio_equ_row(4, 1), audio_equ_row(4, 2), audio_equ_row(4, 3), audio_equ_row(4, 4), audio_equ_row(4, 5), audio_equ_row(4, 6), audio_equ_row(4, 7), audio_equ_row(4, 8), audio_equ_row(4, 9),
be7d8c249dfd Cosmetic: uncrustify related indent adjustments
ib
parents: 33265
diff changeset
154 audio_equ_row(5, 0), audio_equ_row(5, 1), audio_equ_row(5, 2), audio_equ_row(5, 3), audio_equ_row(5, 4), audio_equ_row(5, 5), audio_equ_row(5, 6), audio_equ_row(5, 7), audio_equ_row(5, 8), audio_equ_row(5, 9),
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
155 #undef audio_equ_row
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
156
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
157 { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
158 { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
159 { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
160
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
161 { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
162 { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
163 { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
164 { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
165 { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
166
33477
49d9967970c0 Add option '-idle' to the GUI configuration file.
ib
parents: 33476
diff changeset
167 { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
49d9967970c0 Add option '-idle' to the GUI configuration file.
ib
parents: 33476
diff changeset
168
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
169 // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options?
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
170
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
171 { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
172
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
173 { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
174
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
175 { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
176 { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
177
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
178 { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
179
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
180 { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
181 { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
182
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
183 { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
184 { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
185 { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
186 { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
187
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
188 { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
189 { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
190 { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
191 { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
192
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
193 { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
194 { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
195
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
196 { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
197
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
198 { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
199 #ifdef CONFIG_ICONV
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
200 { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
201 #endif
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
202 { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
203 { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
204 { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
205
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
206 { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
207 { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
208
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
209 #ifdef CONFIG_FREETYPE
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
210 { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
211 { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
212 { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
213 { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
214 { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
215 { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
216 #endif
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
217
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
218 #ifdef CONFIG_ASS
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
219 { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
220 { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
221 { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
222 { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
223 #endif
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
224
33478
a86e08ff3198 Cosmetic: Adjust indent.
ib
parents: 33477
diff changeset
225 { NULL, NULL, 0, 0, 0, 0, NULL }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
226 };
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
227
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
228 static char *gfgets(char *str, int size, FILE *f)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
229 {
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
230 char *s, c;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
231
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
232 s = fgets(str, size, f);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
233
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
234 if (s) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
235 c = s[strlen(s) - 1];
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
236
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
237 if (c == '\n' || c == '\r')
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
238 s[strlen(s) - 1] = 0;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
239
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
240 c = s[strlen(s) - 1];
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
241
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
242 if (c == '\n' || c == '\r')
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
243 s[strlen(s) - 1] = 0;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
244 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
245
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
246 return s;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
247 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
248
33470
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
249 int cfg_gui_include(m_option_t *conf, char *filename)
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
250 {
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
251 (void)conf;
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
252
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
253 return m_config_parse_config_file(gui_conf, filename);
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
254 }
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
255
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
256 int cfg_read(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
257 {
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
258 char *cfg;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
259 FILE *f;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
260
33476
d068eac6cbf9 Make option '-noidle' working for the GUI.
ib
parents: 33470
diff changeset
261 player_idle_mode = 1; // GUI is in idle mode by default
d068eac6cbf9 Make option '-noidle' working for the GUI.
ib
parents: 33470
diff changeset
262
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
263 // configuration
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
264
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
265 cfg = get_path("gui.conf");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
266
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
267 mp_msg(MSGT_GPLAYER, MSGL_V, "[cfg] reading config file: %s\n", cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
268
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
269 gui_conf = m_config_new();
33480
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
270
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
271 if (!gui_conf) {
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
272 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
273 guiExit(EXIT_ERROR);
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
274 }
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
275
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
276 m_config_register_options(gui_conf, gui_opts);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
277
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
278 if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, cfg) < 0)) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
279 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_ConfigFileError);
33264
284fc94290b9 Replace all GUI exits by guiExit().
ib
parents: 33249
diff changeset
280 // guiExit(1);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
281 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
282
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
283 free(cfg);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
284
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
285 // playlist
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
286
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
287 cfg = get_path("gui.pl");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
288 f = fopen(cfg, "rt");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
289
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
290 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
291 while (!feof(f)) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
292 char tmp[512];
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
293 plItem *item;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
295 if (gfgets(tmp, 512, f) == NULL)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
296 continue;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
297
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
298 item = calloc(1, sizeof(plItem));
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
299 item->path = strdup(tmp);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
300 gfgets(tmp, 512, f);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
301 item->name = strdup(tmp);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
302 gtkSet(gtkAddPlItem, 0, (void *)item);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
303 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
304
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
305 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
306 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
307
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
308 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
309
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
310 // URL list
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
311
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
312 cfg = get_path("gui.url");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
313 f = fopen(cfg, "rt");
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
314
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
315 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
316 while (!feof(f)) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
317 char tmp[512];
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
318 URLItem *item;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
319
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
320 if (gfgets(tmp, 512, f) == NULL)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
321 continue;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
322
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
323 item = calloc(1, sizeof(URLItem));
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
324 item->url = strdup(tmp);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
325 gtkSet(gtkAddURLItem, 0, (void *)item);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
326 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
327
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
328 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
329 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
330
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
331 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
332
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
333 // directory history
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
334
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
335 cfg = get_path("gui.history");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
336 f = fopen(cfg, "rt+");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
337
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
338 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
339 int i = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
340
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
341 while (!feof(f)) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
342 char tmp[512];
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
343
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
344 if (gfgets(tmp, 512, f) == NULL)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
345 continue;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
346
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
347 fsHistory[i++] = gstrdup(tmp);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
348 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
349
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
350 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
351 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
352
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
353 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
354
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
355 return 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
356 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
357
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
358 int cfg_write(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
359 {
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
360 char *cfg;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
361 FILE *f;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
362 int i;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
363
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
364 // configuration
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
365
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
366 cfg = get_path("gui.conf");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
367 f = fopen(cfg, "wt+");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
368
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
369 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
370 for (i = 0; gui_opts[i].name; i++) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
371 char *v = m_option_print(&gui_opts[i], gui_opts[i].p);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
372
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
373 if (v == (char *)-1) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
374 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, gui_opts[i].name);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
375 v = NULL;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
376 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
377
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
378 if (v) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
379 fprintf(f, "%s = \"%s\"\n", gui_opts[i].name, v);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
380 free(v);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
381 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
382 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
383
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
384 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
385 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
386
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
387 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
388
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
389 // playlist
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
390
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
391 cfg = get_path("gui.pl");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
392 f = fopen(cfg, "wt+");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
393
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
394 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
395 plCurrent = plList;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
396
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
397 while (plCurrent) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
398 if (plCurrent->path && plCurrent->name) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
399 fprintf(f, "%s\n", plCurrent->path);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
400 fprintf(f, "%s\n", plCurrent->name);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
401 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
402
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
403 plCurrent = plCurrent->next;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
404 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
405
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
406 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
407 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
408
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
409 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
410
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
411 // URL list
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
412
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
413 cfg = get_path("gui.url");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
414 f = fopen(cfg, "wt+");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
415
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
416 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
417 while (URLList) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
418 if (URLList->url)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
419 fprintf(f, "%s\n", URLList->url);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
420
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
421 URLList = URLList->next;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
422 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
423
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
424 fclose(f);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
425 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
426
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
427 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
428
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
429 // directory history
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
430
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
431 cfg = get_path("gui.history");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
432 f = fopen(cfg, "wt+");
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
433
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
434 if (f) {
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
435 int i = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
436
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
437 // while (fsHistory[i] != NULL)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
438 for (i = 0; i < 5; i++)
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
439 if (fsHistory[i])
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
440 fprintf(f, "%s\n", fsHistory[i]);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
441
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
442 fclose(f);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
443 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
444
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
445 free(cfg);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
446
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
447 return 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
448 }