annotate gui/cfg.c @ 27712:daff903e23e2

Move socklen_t typedef from config.h to stream/network.h.
author diego
date Sun, 12 Oct 2008 12:12:41 +0000
parents 4876c89bafdd
children 9e739bdb049c
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
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23 #include "config.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24 #include "mp_msg.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
25 #include "help_mp.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
26 #include "mixer.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
27 #include "mplayer.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
28 #include "m_config.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29 #include "m_option.h"
24242
76f5d8892c04 Clean up the way get_path is handled: Compile get_path.c to an object to link
diego
parents: 24153
diff changeset
30 #include "get_path.h"
24149
35fcce39b121 Remove redundant extern variable declarations, include proper headers instead.
diego
parents: 23795
diff changeset
31 #include "libvo/sub.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
32 #include "libvo/video_out.h"
24149
35fcce39b121 Remove redundant extern variable declarations, include proper headers instead.
diego
parents: 23795
diff changeset
33 #include "stream/stream.h"
35fcce39b121 Remove redundant extern variable declarations, include proper headers instead.
diego
parents: 23795
diff changeset
34 #include "libmpdemux/demuxer.h"
24153
0bbfebce0583 Remove redundant extern declarations, #include the right headers instead.
diego
parents: 24149
diff changeset
35 #include "libass/ass.h"
0bbfebce0583 Remove redundant extern declarations, #include the right headers instead.
diego
parents: 24149
diff changeset
36 #include "libass/ass_mp.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
37
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
38 #include "cfg.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
39 #include "app.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
40 #include "interface.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
41 #include "mplayer/play.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
42
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
43 // --- params
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
44
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
45 int gtkEnableAudioEqualizer = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
46
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47 int gtkVfPP = 0;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
48 #ifdef CONFIG_LIBAVCODEC
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
49 int gtkVfLAVC = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
50 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
51
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52 int gtkAONorm = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
53 int gtkAOSurround = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54 int gtkAOExtraStereo = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
55 float gtkAOExtraStereoMul = 1.0;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
56 #ifdef CONFIG_OSS_AUDIO
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
57 char * gtkAOOSSMixer;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
58 char * gtkAOOSSMixerChannel;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59 char * gtkAOOSSDevice;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
60 #endif
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
61 #ifdef CONFIG_ALSA
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62 char * gtkAOALSAMixer;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
63 char * gtkAOALSAMixerChannel;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64 char * gtkAOALSADevice;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
66 #ifdef CONFIG_SDL
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
67 char * gtkAOSDLDriver;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
68 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
69 #ifdef CONFIG_ESD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70 char * gtkAOESDDevice;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
71 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
72
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
73 int gtkCacheOn = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
74 int gtkCacheSize = 2048;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
75
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76 int gtkAutoSyncOn = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
77 int gtkAutoSync = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
78
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
79 #ifdef CONFIG_DXR3
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80 char * gtkDXR3Device;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
81 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
83 int gtkSubDumpMPSub = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84 int gtkSubDumpSrt = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
85
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
86 int gtkLoadFullscreen = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
87 int gtkShowVideoWindow = 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
88 int gtkEnablePlayBar = 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
89
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
90 int gui_save_pos = 1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
91 int gui_main_pos_x = -2;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
92 int gui_main_pos_y = -2;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
93 int gui_sub_pos_x = -1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
94 int gui_sub_pos_y = -1;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
95
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
96 #ifdef CONFIG_ASS
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
97 gtkASS_t gtkASS;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
98 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
99 // ---
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
100
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
101 extern int stop_xscreensaver;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
102 extern int m_config_parse_config_file(m_config_t* config, char *conffile);
26422
f74bff77f088 noconfig fix, disable_gui_conf was not defined when compiling mencoder.
albeu
parents: 26416
diff changeset
103 extern int disable_gui_conf;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
104
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
105 static m_config_t * gui_conf;
25710
11faea7ffe9b Make big gui_opts array const
reimar
parents: 24242
diff changeset
106 static const m_option_t gui_opts[] =
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
107 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
108 { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
109
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
110 { "vo_driver",&video_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
111 { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
112 { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
113 { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
114 #ifdef CONFIG_DXR3
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
115 { "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
116 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
117
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
118 { "v_framedrop",&frame_dropping,CONF_TYPE_INT,CONF_RANGE,0,2,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
119 { "v_flip",&flip,CONF_TYPE_INT,CONF_RANGE,-1,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
120 { "v_ni",&force_ni,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
121 { "v_idx",&index_mode,CONF_TYPE_INT,CONF_RANGE,-1,2,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
122 { "v_vfm",&video_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
123 { "a_afm",&audio_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
124
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
125 { "vf_pp",&gtkVfPP,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
126 { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
127 #ifdef CONFIG_LIBAVCODEC
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
128 { "vf_lavc",&gtkVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
129 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
130
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
131 { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
132 { "ao_volnorm",&gtkAONorm,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
133 { "softvol",&soft_vol,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
134 { "ao_surround",&gtkAOSurround,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
135 { "ao_extra_stereo",&gtkAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
136 { "ao_extra_stereo_coefficient",&gtkAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
137 #ifdef CONFIG_OSS_AUDIO
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
138 { "ao_oss_mixer",&gtkAOOSSMixer,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139 { "ao_oss_mixer_channel",&gtkAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
140 { "ao_oss_device",&gtkAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
141 #endif
27390
9d95dc936e66 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
diego
parents: 27387
diff changeset
142 #ifdef CONFIG_ALSA
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
143 { "ao_alsa_mixer",&gtkAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
144 { "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
145 { "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
146 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
147 #ifdef CONFIG_SDL
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
148 { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
149 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
150 #ifdef CONFIG_ESD
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
151 { "ao_esd_device",&gtkAOESDDevice,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
152 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
153
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
154 { "dvd_device",&dvd_device,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
155 { "cdrom_device",&cdrom_device,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
156
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
157 { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
158 { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
159 { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26458
diff changeset
160 #ifdef CONFIG_ASS
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
161 { "ass_enabled",&ass_enabled,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
162 { "ass_use_margins",&ass_use_margins,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
163 { "ass_top_margin",&ass_top_margin,CONF_TYPE_INT,CONF_RANGE,0,512,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
164 { "ass_bottom_margin",&ass_bottom_margin,CONF_TYPE_INT,CONF_RANGE,0,512,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
165 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
166 { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
167 { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL },
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
168 #ifdef CONFIG_ICONV
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
169 { "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
170 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
171 { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
172 { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27390
diff changeset
173 #ifdef CONFIG_FREETYPE
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
174 { "font_encoding",&subtitle_font_encoding,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
175 { "font_text_scale",&text_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
176 { "font_osd_scale",&osd_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
177 { "font_blur",&subtitle_font_radius,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
178 { "font_outline",&subtitle_font_thickness,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
179 { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
180 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
181
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
182 { "cache",&gtkCacheOn,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
183 { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
184
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
185 { "playbar",&gtkEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
186 { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
187 { "show_videowin", &gtkShowVideoWindow,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
188 { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
189
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
190 { "autosync",&gtkAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
191 { "autosync_size",&gtkAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
192
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
193 { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
194
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
195 { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG,0,0,1,NULL},
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
196 { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT,0,0,0,NULL},
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
197 { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT,0,0,0,NULL},
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
198 { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT,0,0,0,NULL},
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
199 { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT,0,0,0,NULL},
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
200
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
201 { "equ_channel_1",&gtkEquChannel1,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
202 { "equ_channel_2",&gtkEquChannel2,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
203 { "equ_channel_3",&gtkEquChannel3,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
204 { "equ_channel_4",&gtkEquChannel4,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
205 { "equ_channel_5",&gtkEquChannel5,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
206 { "equ_channel_6",&gtkEquChannel6,CONF_TYPE_STRING,0,0,0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
207
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
208 #if 1
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
209 #define audio_equ_row( i,j ) { "equ_band_"#i#j,&gtkEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL },
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
210 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
211 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
212 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
213 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
214 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
215 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 )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
216 #undef audio_equ_row
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
217 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
218
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
219 { NULL, NULL, 0, 0, 0, 0, NULL }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
220 };
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
221
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
222 char * gfgets( char * str, int size, FILE * f )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
223 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
224 char * s = fgets( str,size,f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
225 char c;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
226 if ( s )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
227 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
228 c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
229 c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
230 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
231 return s;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
232 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
233
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
234 int cfg_read( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
235 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
236 char * cfg = get_path( "gui.conf" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
237 FILE * f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
238
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
239 // -- read configuration
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
240 mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
241 gui_conf=m_config_new();
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
242 m_config_register_options( gui_conf,gui_opts );
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 25711
diff changeset
243 if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
244 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
245 mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigFileError );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
246 // exit( 1 );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
247 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
248 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
249
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
250 // -- read pl
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
251 cfg=get_path( "gui.pl" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
252 if ( (f=fopen( cfg,"rt" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
253 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
254 while ( !feof( f ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
255 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
256 char tmp[512]; plItem * item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
257 if ( gfgets( tmp,512,f ) == NULL ) continue;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
258 item=calloc( 1,sizeof( plItem ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
259 item->path=strdup( tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
260 gfgets( tmp,512,f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
261 item->name=strdup( tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
262 gtkSet( gtkAddPlItem,0,(void*)item );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
263 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
264 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
265 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
266 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
267
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
268 //-- read previously visited urls
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
269 cfg=get_path( "gui.url" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
270 if ( (f=fopen( cfg,"rt" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
271 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
272 while ( !feof( f ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
273 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
274 char tmp[512]; URLItem * item;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
275 if ( gfgets( tmp,512,f ) == NULL ) continue;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
276 item=calloc( 1,sizeof( URLItem ) );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
277 item->url=strdup( tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
278 gtkSet( gtkAddURLItem,0,(void*)item );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
279 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
280 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
281 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
283
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
284 // -- reade file loader history
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
285 cfg=get_path( "gui.history" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
286 if ( (f=fopen( cfg,"rt+" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
287 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
288 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
289 while ( !feof( f ) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
290 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
291 char tmp[512];
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
292 if ( gfgets( tmp,512,f ) == NULL ) continue;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
293 fsHistory[i++]=gstrdup( tmp );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
295 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
296 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
297 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
298
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
299 return 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
300 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
301
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
302 int cfg_write( void )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
303 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
304 char * cfg = get_path( "gui.conf" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
305 FILE * f;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
306 int i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
307
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
308 // -- save configuration
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
309 if ( (f=fopen( cfg,"wt+" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
310 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
311 for ( i=0;gui_opts[i].name;i++ )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
312 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
313 char* v = m_option_print(&gui_opts[i],gui_opts[i].p);
25711
25b40c769b06 Fix 100l: error check for m_option_print was unreachable
reimar
parents: 25710
diff changeset
314 if(v == (char *)-1) {
25b40c769b06 Fix 100l: error check for m_option_print was unreachable
reimar
parents: 25710
diff changeset
315 mp_msg(MSGT_GPLAYER,MSGL_WARN,MSGTR_UnableToSaveOption, gui_opts[i].name);
25b40c769b06 Fix 100l: error check for m_option_print was unreachable
reimar
parents: 25710
diff changeset
316 v = NULL;
25b40c769b06 Fix 100l: error check for m_option_print was unreachable
reimar
parents: 25710
diff changeset
317 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
318 if(v) {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
319 fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v);
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
320 free(v);
25711
25b40c769b06 Fix 100l: error check for m_option_print was unreachable
reimar
parents: 25710
diff changeset
321 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
322 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
323 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
324 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
325 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
326
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
327 // -- save playlist
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
328 cfg=get_path( "gui.pl" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
329 if ( (f=fopen( cfg,"wt+" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
330 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
331 plCurrent=plList;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
332 while ( plCurrent )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
333 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
334 if ( plCurrent->path && plCurrent->name )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
335 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
336 fprintf( f,"%s\n",plCurrent->path );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
337 fprintf( f,"%s\n",plCurrent->name );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
338 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
339 plCurrent=plCurrent->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
340 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
341 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
342 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
343 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
344
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
345 // -- save URL's
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
346 cfg=get_path( "gui.url" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
347 if ( (f=fopen( cfg,"wt+" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
348 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
349 while ( URLList )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
350 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
351 if ( URLList->url ) fprintf( f,"%s\n",URLList->url );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
352 URLList=URLList->next;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
353 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
354 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
355 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
356 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
357
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
358 // -- save file loader history
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
359 cfg=get_path( "gui.history" );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
360 if ( (f=fopen( cfg,"wt+" )) )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
361 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
362 int i = 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
363 // while ( fsHistory[i] != NULL )
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
364 for ( i=0;i < 5; i++)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
365 if( fsHistory[i] ) fprintf( f,"%s\n",fsHistory[i] );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
366 fclose( f );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
367 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
368 free( cfg );
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
369
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
370 return 0;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
371 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
372