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