Mercurial > mplayer.hg
annotate Gui/cfg.c @ 14595:0ddc0ba54747
free MSTRZ args also if parser fails
author | rik |
---|---|
date | Tue, 25 Jan 2005 22:25:39 +0000 |
parents | 4a6b79a1ad52 |
children | e2b2ab284a9a |
rev | line source |
---|---|
6770 | 1 |
2 #include <stdlib.h> | |
3 #include <stdio.h> | |
4 #include <string.h> | |
5 | |
6 #include "../config.h" | |
7 #include "../mp_msg.h" | |
14156 | 8 #include "../help_mp.h" |
6770 | 9 #include "../mplayer.h" |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
9625
diff
changeset
|
10 #include "../m_config.h" |
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
9625
diff
changeset
|
11 #include "../m_option.h" |
6770 | 12 |
13 #include "../../libvo/video_out.h" | |
14 | |
15 #include "cfg.h" | |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
16 #include "app.h" |
6770 | 17 #include "interface.h" |
18 #include "mplayer/play.h" | |
19 | |
20 // --- params | |
21 | |
22 int gtkEnableAudioEqualizer = 0; | |
23 | |
7009 | 24 int gtkVopPP = 0; |
8043 | 25 #ifdef USE_LIBAVCODEC |
26 int gtkVopLAVC = 0; | |
27 #endif | |
28 #ifdef USE_LIBFAME | |
29 int gtkVopFAME = 0; | |
30 #endif | |
7009 | 31 |
6770 | 32 int gtkAONorm = 0; |
33 int gtkAOSurround = 0; | |
34 int gtkAOExtraStereo = 0; | |
35 float gtkAOExtraStereoMul = 1.0; | |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8311
diff
changeset
|
36 #ifdef USE_OSS_AUDIO |
6770 | 37 char * gtkAOOSSMixer; |
12918 | 38 char * gtkAOOSSMixerChannel; |
6770 | 39 char * gtkAOOSSDevice; |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8311
diff
changeset
|
40 #endif |
12918 | 41 #if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) |
42 char * gtkAOALSAMixer; | |
43 char * gtkAOALSAMixerChannel; | |
44 char * gtkAOALSADevice; | |
45 #endif | |
8714
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
46 #ifdef HAVE_SDL |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
47 char * gtkAOSDLDriver; |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
48 #endif |
6770 | 49 |
8284 | 50 int gtkCacheOn = 0; |
51 int gtkCacheSize = 2048; | |
52 | |
8311 | 53 int gtkAutoSyncOn = 0; |
54 int gtkAutoSync = 0; | |
55 | |
7706 | 56 #ifdef HAVE_DXR3 |
57 char * gtkDXR3Device; | |
58 #endif | |
59 | |
6770 | 60 int gtkSubDumpMPSub = 0; |
61 int gtkSubDumpSrt = 0; | |
62 | |
7538 | 63 int gtkLoadFullscreen = 0; |
9202 | 64 int gtkShowVideoWindow = 1; |
8974 | 65 int gtkEnablePlayBar = 1; |
7538 | 66 |
9625 | 67 int gui_save_pos = 1; |
68 int gui_main_pos_x = -2; | |
69 int gui_main_pos_y = -2; | |
70 int gui_sub_pos_x = -1; | |
71 int gui_sub_pos_y = -1; | |
6770 | 72 // --- |
73 | |
74 extern char * get_path( char * filename ); | |
75 extern int flip; | |
76 extern int frame_dropping; | |
8308 | 77 extern int stop_xscreensaver; |
11412 | 78 extern int m_config_parse_config_file(m_config_t* config, char *conffile); |
6770 | 79 |
80 static m_config_t * gui_conf; | |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
9625
diff
changeset
|
81 static m_option_t gui_opts[] = |
6770 | 82 { |
83 { "enable_audio_equ",>kEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL }, | |
84 | |
7582 | 85 { "vo_driver",&video_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, |
6770 | 86 { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL }, |
87 { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL }, | |
7019 | 88 { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL }, |
7706 | 89 #ifdef HAVE_DXR3 |
90 { "vo_dxr3_device",>kDXR3Device,CONF_TYPE_STRING,0,0,0,NULL }, | |
91 #endif | |
6770 | 92 |
7019 | 93 { "v_framedrop",&frame_dropping,CONF_TYPE_INT,CONF_RANGE,0,2,NULL }, |
7139 | 94 { "v_flip",&flip,CONF_TYPE_INT,CONF_RANGE,-1,1,NULL }, |
7019 | 95 { "v_ni",&force_ni,CONF_TYPE_FLAG,0,0,1,NULL }, |
96 { "v_idx",&index_mode,CONF_TYPE_INT,CONF_RANGE,-1,2,NULL }, | |
7526 | 97 { "v_vfm",&video_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, |
98 { "a_afm",&audio_fm_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, | |
7009 | 99 |
100 { "vf_pp",>kVopPP,CONF_TYPE_FLAG,0,0,1,NULL }, | |
7019 | 101 { "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL }, |
8043 | 102 #ifdef USE_LIBAVCODEC |
7009 | 103 { "vf_lavc",>kVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL }, |
8043 | 104 #endif |
105 #ifdef USE_LIBFAME | |
7009 | 106 { "vf_fame",>kVopFAME,CONF_TYPE_FLAG,0,0,1,NULL }, |
8043 | 107 #endif |
6770 | 108 |
7582 | 109 { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, |
6770 | 110 { "ao_volnorm",>kAONorm,CONF_TYPE_FLAG,0,0,1,NULL }, |
111 { "ao_surround",>kAOSurround,CONF_TYPE_FLAG,0,0,1,NULL }, | |
112 { "ao_extra_stereo",>kAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL }, | |
113 { "ao_extra_stereo_coefficient",>kAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL }, | |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8311
diff
changeset
|
114 #ifdef USE_OSS_AUDIO |
6770 | 115 { "ao_oss_mixer",>kAOOSSMixer,CONF_TYPE_STRING,0,0,0,NULL }, |
12918 | 116 { "ao_oss_mixer_channel",>kAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, |
6770 | 117 { "ao_oss_device",>kAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL }, |
8600
54eac4cf587c
Lots of functions and variables specific to OSS audio are used without
arpi
parents:
8311
diff
changeset
|
118 #endif |
12918 | 119 #if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) |
120 { "ao_alsa_mixer",>kAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL }, | |
121 { "ao_alsa_mixer_channel",>kAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, | |
122 { "ao_alsa_device",>kAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL }, | |
123 #endif | |
8714
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
124 #ifdef HAVE_SDL |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
125 { "ao_sdl_subdriver",>kAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL }, |
a88f827ec563
SDL Audio configure window from Filip Kalinski <filon@pld.org.pl>
pontscho
parents:
8600
diff
changeset
|
126 #endif |
8933
bfe1b826cff1
add DVD and CDRom device entry's, and fix two 10l bug
pontscho
parents:
8920
diff
changeset
|
127 |
bfe1b826cff1
add DVD and CDRom device entry's, and fix two 10l bug
pontscho
parents:
8920
diff
changeset
|
128 { "dvd_device",&dvd_device,CONF_TYPE_STRING,0,0,0,NULL }, |
bfe1b826cff1
add DVD and CDRom device entry's, and fix two 10l bug
pontscho
parents:
8920
diff
changeset
|
129 { "cdrom_device",&cdrom_device,CONF_TYPE_STRING,0,0,0,NULL }, |
6770 | 130 |
8886 | 131 { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL }, |
7019 | 132 { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL }, |
133 { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL }, | |
134 { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL }, | |
8717 | 135 { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL }, |
9612 | 136 #ifdef USE_ICONV |
9056 | 137 { "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL }, |
9612 | 138 #endif |
7019 | 139 { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL }, |
140 { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL }, | |
7146
c3f4a1c124ed
This patch fixes a compile error when HAVE_FREETYPE is not defined.
arpi
parents:
7139
diff
changeset
|
141 #ifdef HAVE_FREETYPE |
7139 | 142 { "font_encoding",&subtitle_font_encoding,CONF_TYPE_STRING,0,0,0,NULL }, |
143 { "font_text_scale",&text_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL }, | |
144 { "font_osd_scale",&osd_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL }, | |
7526 | 145 { "font_blur",&subtitle_font_radius,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL }, |
7139 | 146 { "font_outline",&subtitle_font_thickness,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL }, |
147 { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL }, | |
7146
c3f4a1c124ed
This patch fixes a compile error when HAVE_FREETYPE is not defined.
arpi
parents:
7139
diff
changeset
|
148 #endif |
7526 | 149 |
8311 | 150 { "cache",>kCacheOn,CONF_TYPE_FLAG,0,0,1,NULL }, |
8284 | 151 { "cache_size",>kCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, |
8973 | 152 |
153 { "playbar",>kEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL }, | |
7538 | 154 { "load_fullscreen",>kLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL }, |
9202 | 155 { "show_videowin", >kShowVideoWindow,CONF_TYPE_FLAG,0,0,1,NULL }, |
8308 | 156 { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL }, |
8311 | 157 |
158 { "autosync",>kAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL }, | |
159 { "autosync_size",>kAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL }, | |
6797
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
160 |
06d29dbdf20d
upsz, sorry, i forgott this :) (skin name saving:)
pontscho
parents:
6794
diff
changeset
|
161 { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL }, |
6770 | 162 |
9625 | 163 { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG,0,0,1,NULL}, |
164 { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT,0,0,0,NULL}, | |
165 { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT,0,0,0,NULL}, | |
166 { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT,0,0,0,NULL}, | |
167 { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT,0,0,0,NULL}, | |
168 | |
6770 | 169 { "equ_channel_1",>kEquChannel1,CONF_TYPE_STRING,0,0,0,NULL }, |
170 { "equ_channel_2",>kEquChannel2,CONF_TYPE_STRING,0,0,0,NULL }, | |
171 { "equ_channel_3",>kEquChannel3,CONF_TYPE_STRING,0,0,0,NULL }, | |
172 { "equ_channel_4",>kEquChannel4,CONF_TYPE_STRING,0,0,0,NULL }, | |
173 { "equ_channel_5",>kEquChannel5,CONF_TYPE_STRING,0,0,0,NULL }, | |
174 { "equ_channel_6",>kEquChannel6,CONF_TYPE_STRING,0,0,0,NULL }, | |
175 | |
176 #if 1 | |
6840 | 177 #define audio_equ_row( i,j ) { "equ_band_"#i#j,>kEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL }, |
6770 | 178 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 ) |
179 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 ) | |
180 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 ) | |
181 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 ) | |
182 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 ) | |
183 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 ) | |
184 #undef audio_equ_row | |
185 #endif | |
186 | |
187 { NULL, NULL, 0, 0, 0, 0, NULL } | |
188 }; | |
189 | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
190 char * gfgets( char * str, int size, FILE * f ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
191 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
192 char * s = fgets( str,size,f ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
193 char c; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
194 if ( s ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
195 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
196 c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
197 c=s[ strlen( s ) - 1 ]; if ( c == '\n' || c == '\r' ) s[ strlen( s ) - 1 ]=0; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
198 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
199 return s; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
200 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
201 |
6770 | 202 int cfg_read( void ) |
203 { | |
204 char * cfg = get_path( "gui.conf" ); | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
205 FILE * f; |
6770 | 206 |
207 // -- read configuration | |
14156 | 208 mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg ); |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
9625
diff
changeset
|
209 gui_conf=m_config_new(); |
6770 | 210 m_config_register_options( gui_conf,gui_opts ); |
211 if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) | |
212 { | |
14156 | 213 mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigfileError ); |
7538 | 214 // exit( 1 ); |
6770 | 215 } |
216 free( cfg ); | |
217 | |
218 // -- read pl | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
219 cfg=get_path( "gui.pl" ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
220 if ( (f=fopen( cfg,"rt" )) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
221 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
222 while ( !feof( f ) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
223 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
224 char tmp[512]; plItem * item; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
225 if ( gfgets( tmp,512,f ) == NULL ) continue; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
226 item=calloc( 1,sizeof( plItem ) ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
227 item->path=strdup( tmp ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
228 gfgets( tmp,512,f ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
229 item->name=strdup( tmp ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
230 gtkSet( gtkAddPlItem,0,(void*)item ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
231 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
232 fclose( f ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
233 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
234 free( cfg ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
235 |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
236 //-- read previously visited urls |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
237 cfg=get_path( "gui.url" ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
238 if ( (f=fopen( cfg,"rt" )) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
239 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
240 while ( !feof( f ) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
241 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
242 char tmp[512]; URLItem * item; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
243 if ( gfgets( tmp,512,f ) == NULL ) continue; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
244 item=calloc( 1,sizeof( URLItem ) ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
245 item->url=strdup( tmp ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
246 gtkSet( gtkAddURLItem,0,(void*)item ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
247 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
248 fclose( f ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
249 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
250 free( cfg ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
251 |
9055 | 252 // -- reade file loader history |
253 cfg=get_path( "gui.history" ); | |
254 if ( (f=fopen( cfg,"rt+" )) ) | |
255 { | |
256 int i = 0; | |
257 while ( !feof( f ) ) | |
258 { | |
259 char tmp[512]; | |
260 if ( gfgets( tmp,512,f ) == NULL ) continue; | |
261 fsHistory[i++]=gstrdup( tmp ); | |
262 } | |
263 fclose( f ); | |
264 } | |
265 free( cfg ); | |
266 | |
6770 | 267 return 0; |
268 } | |
269 | |
270 int cfg_write( void ) | |
271 { | |
272 char * cfg = get_path( "gui.conf" ); | |
273 FILE * f; | |
274 int i; | |
275 | |
276 // -- save configuration | |
277 if ( (f=fopen( cfg,"wt+" )) ) | |
278 { | |
279 for ( i=0;gui_opts[i].name;i++ ) | |
280 { | |
8168 | 281 char* v = m_option_print(&gui_opts[i],gui_opts[i].p); |
282 if(v) { | |
283 fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v); | |
284 free(v); | |
285 } else if((int)v == -1) | |
14156 | 286 mp_msg(MSGT_GPLAYER,MSGL_WARN,MSGTR_UnableToSaveOption, gui_opts[i].name); |
6770 | 287 } |
288 fclose( f ); | |
289 } | |
290 free( cfg ); | |
291 | |
292 // -- save playlist | |
293 cfg=get_path( "gui.pl" ); | |
294 if ( (f=fopen( cfg,"wt+" )) ) | |
295 { | |
296 plCurrent=plList; | |
297 while ( plCurrent ) | |
298 { | |
299 if ( plCurrent->path && plCurrent->name ) | |
300 { | |
301 fprintf( f,"%s\n",plCurrent->path ); | |
302 fprintf( f,"%s\n",plCurrent->name ); | |
303 } | |
304 plCurrent=plCurrent->next; | |
305 } | |
306 fclose( f ); | |
307 } | |
308 free( cfg ); | |
309 | |
7092
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
310 // -- save URL's |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
311 cfg=get_path( "gui.url" ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
312 if ( (f=fopen( cfg,"wt+" )) ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
313 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
314 while ( URLList ) |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
315 { |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
316 if ( URLList->url ) fprintf( f,"%s\n",URLList->url ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
317 URLList=URLList->next; |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
318 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
319 fclose( f ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
320 } |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
321 free( cfg ); |
8e9607c5897e
- warning fixes from Dominik Mierzejewski <dominik@rangers.eu.org>
pontscho
parents:
7019
diff
changeset
|
322 |
9055 | 323 // -- save file loader history |
324 cfg=get_path( "gui.history" ); | |
325 if ( (f=fopen( cfg,"wt+" )) ) | |
326 { | |
327 int i = 0; | |
328 // while ( fsHistory[i] != NULL ) | |
329 for ( i=0;i < 5; i++) | |
330 if( fsHistory[i] ) fprintf( f,"%s\n",fsHistory[i] ); | |
331 fclose( f ); | |
332 } | |
333 free( cfg ); | |
334 | |
6770 | 335 return 0; |
336 } | |
337 |