annotate gui/app/cfg.c @ 36429:28ea255e40ce

Add support for TV/DVB to the GUI. Support is limited to a single (resp. the first) card. At the same time, add the new GUI option 'gui_tv_digital', the new GUI message 'evPlayTV' and the new GUI font symbol 'b'. Additionally, update the documentation.
author ib
date Fri, 29 Nov 2013 12:41:32 +0000
parents c667e34fb941
children cc8102c4ca83
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
34562
fe172cd7b8e8 Add some missing #includes to cfg.c.
ib
parents: 34561
diff changeset
19 #include <stdio.h>
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
20 #include <stdlib.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"
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 34708
diff changeset
24 #include "gui.h"
35525
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35521
diff changeset
25 #include "gui/interface.h"
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35521
diff changeset
26 #include "gui/util/list.h"
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35521
diff changeset
27 #include "gui/util/string.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
28
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29 #include "config.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
30 #include "help_mp.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
31 #include "mixer.h"
33768
cee9987bc81d Remove guiExit().
ib
parents: 33751
diff changeset
32 #include "mp_core.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
33 #include "mp_msg.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
34 #include "mpcommon.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
35 #include "mplayer.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
36 #include "parser-cfg.h"
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
37 #include "path.h"
36032
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35870
diff changeset
38 #include "libavutil/common.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35870
diff changeset
39 #include "libmpcodecs/vd.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35870
diff changeset
40 #include "libmpdemux/demuxer.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35870
diff changeset
41 #include "libvo/video_out.h"
c667e34fb941 Cosmetic: Rearrange #includes.
ib
parents: 35870
diff changeset
42 #include "libvo/x11_common.h"
34562
fe172cd7b8e8 Add some missing #includes to cfg.c.
ib
parents: 34561
diff changeset
43 #include "stream/stream.h"
fe172cd7b8e8 Add some missing #includes to cfg.c.
ib
parents: 34561
diff changeset
44 #include "sub/ass_mp.h"
32981
6e22bcc85ac5 Cosmetic: Add required include files.
ib
parents: 32467
diff changeset
45 #include "sub/font_load.h"
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
46 #include "sub/sub.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
48 guiTV_t guiTV[2] = {
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
49 { STREAMTYPE_TV, "tv" },
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
50 { STREAMTYPE_DVB, "dvb" }
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
51 };
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
52
33265
62c0471bcf8c Free config.
ib
parents: 33264
diff changeset
53 m_config_t *gui_conf;
62c0471bcf8c Free config.
ib
parents: 33264
diff changeset
54
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
55 int gtkCacheOn;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
56 int gtkCacheSize = 2048;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
57
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
58 int gtkVfPP;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59
33249
8fc02babf810 Limit config option vf_lavc to dxr3.
ib
parents: 33242
diff changeset
60 int gtkVfLAVC;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
61 char *gtkDXR3Device;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
62
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
63 int gtkAutoSyncOn;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
64 int gtkAutoSync;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
66 int gtkAONorm;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
67 int gtkAOSurround;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
68 int gtkAOExtraStereo;
33221
9920df91c2b7 Make initial value explicitly type float.
ib
parents: 33220
diff changeset
69 float gtkAOExtraStereoMul = 1.0f;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
70
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
71 char *gtkAOALSAMixer;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
72 char *gtkAOALSAMixerChannel;
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
73 char *gtkAOALSADevice;
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
74
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
75 char *gtkAOOSSMixer;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
76 char *gtkAOOSSMixerChannel;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
77 char *gtkAOOSSDevice;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
78
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
79 char *gtkAOESDDevice;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
81 char *gtkAOSDLDriver;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
83 int gtkEnableAudioEqualizer;
33747
e5959dcf8fe6 Remove config related variables from interface.[ch].
ib
parents: 33742
diff changeset
84 float gtkEquChannels[6][10];
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
85
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
86 int gtkSubDumpMPSub;
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
87 int gtkSubDumpSrt;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
88
33180
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
89 gtkASS_t gtkASS;
422e5d306d44 Group and sort configuration variable definitions.
ib
parents: 33179
diff changeset
90
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 34708
diff changeset
91 int gtkEnablePlayBar = True;
33220
f17e21799261 Remove needless explicit initialization.
ib
parents: 33218
diff changeset
92 int gtkLoadFullscreen;
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 34708
diff changeset
93 int gtkShowVideoWindow = True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
94
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 34708
diff changeset
95 int gui_save_pos = True;
34698
456784c6c904 Cosmetic: Adjust indent.
ib
parents: 34697
diff changeset
96 int gui_main_pos_x = -3;
456784c6c904 Cosmetic: Adjust indent.
ib
parents: 34697
diff changeset
97 int gui_main_pos_y = -3;
34697
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
98 int gui_video_pos_x = -3;
ac6b38cd0d45 Rename sub window video window.
ib
parents: 34684
diff changeset
99 int gui_video_pos_y = -3;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
100
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
101 int gui_tv_digital = True;
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
102
33747
e5959dcf8fe6 Remove config related variables from interface.[ch].
ib
parents: 33742
diff changeset
103 int guiWinID = -1;
e5959dcf8fe6 Remove config related variables from interface.[ch].
ib
parents: 33742
diff changeset
104
e5959dcf8fe6 Remove config related variables from interface.[ch].
ib
parents: 33742
diff changeset
105 char *skinName;
e5959dcf8fe6 Remove config related variables from interface.[ch].
ib
parents: 33742
diff changeset
106
33751
c28c967e40e9 Replace numeric constant fsPersistant_MaxPos for fsHistory array size.
ib
parents: 33750
diff changeset
107 char *fsHistory[5];
33750
8b5898908212 Remove variable holding history of selected files from interface.[ch].
ib
parents: 33748
diff changeset
108
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
109 static const char gui_configuration[] = "gui.conf";
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
110 static const char gui_history[] = "gui.history";
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
111 static const char gui_playlist[] = "gui.pl";
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
112 static const char gui_urllist[] = "gui.url";
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
113
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
114 static const m_option_t gui_opts[] = {
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
115 { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
34707
0a4b7681a408 Update GUI code after r34792.
ib
parents: 34698
diff changeset
116 { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 0x7fffffff, NULL },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
117
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
118 { "vf_pp", &gtkVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
119
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
120 #ifdef CONFIG_DXR3
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
121 { "vf_lavc", &gtkVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
122 { "vo_dxr3_device", &gtkDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
123 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
124
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
125 { "autosync", &gtkAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
126 { "autosync_size", &gtkAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
127
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
128 { "ao_volnorm", &gtkAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
129 { "ao_surround", &gtkAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
130 { "ao_extra_stereo", &gtkAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
131 { "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
132
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
133 #ifdef CONFIG_ALSA
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
134 { "ao_alsa_mixer", &gtkAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
135 { "ao_alsa_mixer_channel", &gtkAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
136 { "ao_alsa_device", &gtkAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
137 #endif
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
138
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
139 #ifdef CONFIG_OSS_AUDIO
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
140 { "ao_oss_mixer", &gtkAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
141 { "ao_oss_mixer_channel", &gtkAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
142 { "ao_oss_device", &gtkAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
143 #endif
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
144
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
145 #ifdef CONFIG_ESD
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
146 { "ao_esd_device", &gtkAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
147 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
148
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
149 #ifdef CONFIG_SDL
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
150 { "ao_sdl_subdriver", &gtkAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
151 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
152
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
153 { "enable_audio_equ", &gtkEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL },
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
154
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
155 { "equ_channel_1", &gtkEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
156 { "equ_channel_2", &gtkEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
157 { "equ_channel_3", &gtkEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
158 { "equ_channel_4", &gtkEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
159 { "equ_channel_5", &gtkEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
160 { "equ_channel_6", &gtkEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
161
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
162 #define audio_equ_row(i, j) \
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
163 { "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
164 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
165 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
166 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
167 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
168 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
169 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
170 #undef audio_equ_row
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
171
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
172 { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
173 { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
174 { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
175
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
176 { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
177 { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
178 { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
179 { "gui_video_out_pos_x", &gui_video_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
180 { "gui_video_out_pos_y", &gui_video_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
181
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
182 { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
33477
49d9967970c0 Add option '-idle' to the GUI configuration file.
ib
parents: 33476
diff changeset
183
36429
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
184 #ifdef CONFIG_TV
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
185 { "gui_tv_digital", &gui_tv_digital, CONF_TYPE_FLAG, 0, 0, 1, NULL },
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
186 #endif
28ea255e40ce Add support for TV/DVB to the GUI.
ib
parents: 36032
diff changeset
187
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
188 // 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
189
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
190 { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
191
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
192 { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
193
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
194 { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
195 { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
196
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
197 { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
198
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
199 { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
200 { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
201
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
202 { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
203 { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
204 { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
205 { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
206
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
207 { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
208 { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
209 { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
210 { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
211
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
212 { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
213 { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
214
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
215 { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
216
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
217 { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
218 #ifdef CONFIG_ICONV
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
219 { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
220 #endif
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
221 { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
222 { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
223 { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
224
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
225 { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
226 { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
227
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
228 #ifdef CONFIG_FREETYPE
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
229 { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
230 { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
231 { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
232 { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
233 { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
234 { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
235 #endif
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
236
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
237 #ifdef CONFIG_ASS
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
238 { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
239 { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
240 { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
241 { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL },
33223
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
242 #endif
6197c605769e Rearrange GUI options.
ib
parents: 33221
diff changeset
243
34708
c4c333e49d29 Cosmetic: Adjust indent.
ib
parents: 34707
diff changeset
244 { NULL, NULL, 0, 0, 0, 0, NULL }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
245 };
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
246
35521
baf53d200292 Avoid using local variables named filename.
ib
parents: 35493
diff changeset
247 int cfg_gui_include(m_option_t *conf, const char *file)
33470
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
248 {
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
249 (void)conf;
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
250
35521
baf53d200292 Avoid using local variables named filename.
ib
parents: 35493
diff changeset
251 return m_config_parse_config_file(gui_conf, file, 0);
33470
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
252 }
90e5f5c28304 Add option '-gui-include'.
ib
parents: 33370
diff changeset
253
34561
f744357e94bd Make cfg_read() and cfg_write() void functions.
ib
parents: 34560
diff changeset
254 void cfg_read(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
255 {
34580
065029b847e5 Move buffer at top of function and rename it.
ib
parents: 34579
diff changeset
256 char *fname, line[512];
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
257 FILE *file;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
258
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 34708
diff changeset
259 player_idle_mode = True; // GUI is in idle mode by default
33476
d068eac6cbf9 Make option '-noidle' working for the GUI.
ib
parents: 33470
diff changeset
260
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
261 /* configuration */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
262
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
263 fname = get_path(gui_configuration);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
264
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
265 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[cfg] file: %s\n", fname);
33179
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 gui_conf = m_config_new();
33480
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
268
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
269 if (!gui_conf) {
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
270 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33751
diff changeset
271 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33480
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
272 }
e413b573e4ec Check error when creating the GUI config object.
ib
parents: 33478
diff changeset
273
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
274 m_config_register_options(gui_conf, gui_opts);
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
275
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
276 if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, fname, 1) < 0)) {
34577
22887c794c02 In case of a GUI config error, exit MPlayer with error.
ib
parents: 34576
diff changeset
277 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
22887c794c02 In case of a GUI config error, exit MPlayer with error.
ib
parents: 34576
diff changeset
278 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
279 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
280
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
281 free(fname);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
283 /* playlist */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
284
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
285 fname = get_path(gui_playlist);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
286 file = fopen(fname, "rt");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
287
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
288 if (file) {
34581
dba158d9b986 Simplify end-of-file detection.
ib
parents: 34580
diff changeset
289 while (fgetstr(line, sizeof(line), file)) {
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
290 plItem *item;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
291
34588
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
292 if (!*line)
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
293 continue;
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
294
34583
8e4cafa03bd4 Cosmetic: Adjust indent.
ib
parents: 34582
diff changeset
295 item = calloc(1, sizeof(plItem));
34582
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
296
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
297 if (!item) {
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
298 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
299 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
300 }
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
301
34580
065029b847e5 Move buffer at top of function and rename it.
ib
parents: 34579
diff changeset
302 item->path = strdup(line);
34584
500ea19f03eb Check for playlist errors (path, but no file).
ib
parents: 34583
diff changeset
303
34588
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
304 if (fgetstr(line, sizeof(line), file) && *line) {
34585
60bf43f94f17 Cosmetic: Adjust indent.
ib
parents: 34584
diff changeset
305 item->name = strdup(line);
34681
42fa91951bd2 Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND.
ib
parents: 34668
diff changeset
306 listMgr(PLAYLIST_ITEM_APPEND, item);
34584
500ea19f03eb Check for playlist errors (path, but no file).
ib
parents: 34583
diff changeset
307 } else {
500ea19f03eb Check for playlist errors (path, but no file).
ib
parents: 34583
diff changeset
308 free(item->path);
500ea19f03eb Check for playlist errors (path, but no file).
ib
parents: 34583
diff changeset
309 free(item);
500ea19f03eb Check for playlist errors (path, but no file).
ib
parents: 34583
diff changeset
310 }
33179
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
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
313 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
314 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
315
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
316 free(fname);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
317
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
318 /* URL list */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
319
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
320 fname = get_path(gui_urllist);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
321 file = fopen(fname, "rt");
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
322
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
323 if (file) {
34581
dba158d9b986 Simplify end-of-file detection.
ib
parents: 34580
diff changeset
324 while (fgetstr(line, sizeof(line), file)) {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33530
diff changeset
325 urlItem *item;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
326
34588
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
327 if (!*line)
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
328 continue;
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
329
34583
8e4cafa03bd4 Cosmetic: Adjust indent.
ib
parents: 34582
diff changeset
330 item = calloc(1, sizeof(urlItem));
34582
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
331
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
332 if (!item) {
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
333 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
334 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
335 }
d0617776d506 Check for allocation error.
ib
parents: 34581
diff changeset
336
34580
065029b847e5 Move buffer at top of function and rename it.
ib
parents: 34579
diff changeset
337 item->url = strdup(line);
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34621
diff changeset
338 listMgr(URLLIST_ITEM_ADD, item);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
339 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
340
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
341 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
342 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
343
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
344 free(fname);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
345
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
346 /* directory history */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
347
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
348 fname = get_path(gui_history);
34579
5097d56b31b1 Fix history file read-only fopen mode.
ib
parents: 34578
diff changeset
349 file = fopen(fname, "rt");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
350
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
351 if (file) {
34586
ebcc8c7e7fda Prevent out-of-bounds array access of fsHistory.
ib
parents: 34585
diff changeset
352 unsigned int i = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
353
34581
dba158d9b986 Simplify end-of-file detection.
ib
parents: 34580
diff changeset
354 while (fgetstr(line, sizeof(line), file))
34588
94a4e81f214a Prevent reading empty lines.
ib
parents: 34587
diff changeset
355 if (*line && (i < FF_ARRAY_ELEMS(fsHistory)))
34589
6327e5a74a5e Don't unnecessarily use gstrdup().
ib
parents: 34588
diff changeset
356 fsHistory[i++] = strdup(line);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
357
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
358 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
359 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
360
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
361 free(fname);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
362 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
363
34561
f744357e94bd Make cfg_read() and cfg_write() void functions.
ib
parents: 34560
diff changeset
364 void cfg_write(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
365 {
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
366 char *fname;
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
367 FILE *file;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
368
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
369 /* configuration */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
370
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
371 fname = get_path(gui_configuration);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
372 file = fopen(fname, "wt+");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
373
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
374 if (file) {
34621
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
375 const m_option_t *opts = gui_opts;
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
376
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
377 while (opts->name) {
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
378 char *val = m_option_print(opts, opts->p);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
379
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
380 if (val == (char *)-1) {
34621
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
381 gmp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, opts->name);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
382 val = NULL;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
383 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
384
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
385 if (val) {
34595
97bf974e7623 Simplify character array definition.
ib
parents: 34594
diff changeset
386 char delim[] = "\"";
34593
83f7a2f8af3b Adjust content of GUI configuration file to MPlayer configuration files.
ib
parents: 34592
diff changeset
387
83f7a2f8af3b Adjust content of GUI configuration file to MPlayer configuration files.
ib
parents: 34592
diff changeset
388 if (!strchr(val, ' '))
83f7a2f8af3b Adjust content of GUI configuration file to MPlayer configuration files.
ib
parents: 34592
diff changeset
389 *delim = 0;
83f7a2f8af3b Adjust content of GUI configuration file to MPlayer configuration files.
ib
parents: 34592
diff changeset
390
34621
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
391 fprintf(file, "%s=%s%s%s\n", opts->name, delim, val, delim);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
392 free(val);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
393 }
34621
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
394
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
395 opts++;
33179
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
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
398 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
399 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
400
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
401 free(fname);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
402
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
403 /* playlist */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
404
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
405 fname = get_path(gui_playlist);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
406 file = fopen(fname, "wt+");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
407
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
408 if (file) {
34667
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34663
diff changeset
409 plItem *item = listMgr(PLAYLIST_GET, 0);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
410
34594
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
411 while (item) {
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
412 if (item->path && item->name) {
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
413 fprintf(file, "%s\n", item->path);
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
414 fprintf(file, "%s\n", item->name);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
415 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
416
34594
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
417 item = item->next;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
418 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
419
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
420 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
421 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
422
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
423 free(fname);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
424
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
425 /* URL list */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
426
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
427 fname = get_path(gui_urllist);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
428 file = fopen(fname, "wt+");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
429
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
430 if (file) {
34668
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
431 urlItem *item = listMgr(URLLIST_GET, 0);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
432
34594
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
433 while (item) {
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
434 if (item->url)
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
435 fprintf(file, "%s\n", item->url);
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
436
c20ac9b80ea5 Don't destroy list pointers while saving list items.
ib
parents: 34593
diff changeset
437 item = item->next;
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
438 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
439
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
440 fclose(file);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
441 }
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
442
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
443 free(fname);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
444
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34681
diff changeset
445 /* directory history */
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
446
34596
04feb00f91be Prefer static const char arrays for string constants to #defines.
ib
parents: 34595
diff changeset
447 fname = get_path(gui_history);
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
448 file = fopen(fname, "wt+");
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
449
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
450 if (file) {
34621
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
451 unsigned int i;
97148652b0c6 Replace for loop with index by while loop with pointer.
ib
parents: 34610
diff changeset
452
35870
26ad65a4e47d Free memory allocated for fsHistory[] elements when GUI ends.
ib
parents: 35525
diff changeset
453 for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++) {
26ad65a4e47d Free memory allocated for fsHistory[] elements when GUI ends.
ib
parents: 35525
diff changeset
454 if (fsHistory[i]) {
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
455 fprintf(file, "%s\n", fsHistory[i]);
35870
26ad65a4e47d Free memory allocated for fsHistory[] elements when GUI ends.
ib
parents: 35525
diff changeset
456 free(fsHistory[i]);
26ad65a4e47d Free memory allocated for fsHistory[] elements when GUI ends.
ib
parents: 35525
diff changeset
457 }
26ad65a4e47d Free memory allocated for fsHistory[] elements when GUI ends.
ib
parents: 35525
diff changeset
458 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
459
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
460 fclose(file);
33179
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
461 }
218edd8fc782 Cosmetic: Format to MPlayer coding style.
ib
parents: 32981
diff changeset
462
34578
948bec0f8df3 Cosmetic: Change some variable names.
ib
parents: 34577
diff changeset
463 free(fname);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
464 }