Mercurial > hg > xmms-sid
annotate src/xs_config.c @ 600:7fcaf6b59b20
Cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 24 Mar 2007 15:11:03 +0000 |
parents | 91ca76e6c23f |
children | 2729318c311b |
rev | line source |
---|---|
1 | 1 /* |
3 | 2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) |
1 | 3 |
4 Configuration dialog | |
5 | |
324 | 6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org> |
422 | 7 (C) Copyright 1999-2007 Tecnic Software productions (TNSP) |
1 | 8 |
9 This program is free software; you can redistribute it and/or modify | |
10 it under the terms of the GNU General Public License as published by | |
11 the Free Software Foundation; either version 2 of the License, or | |
12 (at your option) any later version. | |
13 | |
14 This program is distributed in the hope that it will be useful, | |
15 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 GNU General Public License for more details. | |
18 | |
412
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
19 You should have received a copy of the GNU General Public License along |
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
20 with this program; if not, write to the Free Software Foundation, Inc., |
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
1 | 22 */ |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
23 #include "xs_config.h" |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
24 |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
25 #ifdef AUDACIOUS_PLUGIN |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
26 #include <audacious/configdb.h> |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
27 #define XS_CONFIG_FILE ConfigDb |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
28 #define XS_CONFIG_OPEN bmp_cfg_db_open |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
29 #define XS_CONFIG_FREE bmp_cfg_db_close |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
30 #define XS_CONFIG_WRITE |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
31 |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
32 #define XS_CFG_SET_STRING bmp_cfg_db_set_string |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
33 #define XS_CFG_SET_FLOAT bmp_cfg_db_set_float |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
34 #define XS_CFG_SET_INT bmp_cfg_db_set_int |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
35 #define XS_CFG_SET_BOOL bmp_cfg_db_set_bool |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
36 #define XS_CFG_GET_STRING bmp_cfg_db_get_string |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
37 #define XS_CFG_GET_FLOAT bmp_cfg_db_get_float |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
38 #define XS_CFG_GET_INT bmp_cfg_db_get_int |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
39 #define XS_CFG_GET_BOOL bmp_cfg_db_get_bool |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
40 #else |
3 | 41 #include <xmms/configfile.h> |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
42 #define XS_CONFIG_FILE ConfigFile |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
43 #define XS_CONFIG_OPEN xmms_cfg_open_default_file |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
44 #define XS_CONFIG_FREE xmms_cfg_free |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
45 #define XS_CONFIG_WRITE xmms_cfg_write_default_file |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
46 |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
47 #define XS_CFG_SET_STRING xmms_cfg_write_string |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
48 #define XS_CFG_SET_FLOAT xmms_cfg_write_float |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
49 #define XS_CFG_SET_INT xmms_cfg_write_int |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
50 #define XS_CFG_SET_BOOL xmms_cfg_write_boolean |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
51 #define XS_CFG_GET_STRING xmms_cfg_read_string |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
52 #define XS_CFG_GET_FLOAT xmms_cfg_read_float |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
53 #define XS_CFG_GET_INT xmms_cfg_read_int |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
54 #define XS_CFG_GET_BOOL xmms_cfg_read_boolean |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
55 #endif |
3 | 56 #include <stdio.h> |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
57 #include <ctype.h> |
3 | 58 #include "xs_glade.h" |
59 #include "xs_interface.h" | |
63 | 60 #include "xs_support.h" |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
61 |
1 | 62 |
63 /* | |
3 | 64 * Global widgets |
1 | 65 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
66 static GtkWidget *xs_configwin = NULL, |
362 | 67 *xs_sldb_fileselector = NULL, |
68 *xs_stil_fileselector = NULL, | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
69 *xs_hvsc_selector = NULL, |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
70 *xs_filt_importselector = NULL, |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
71 *xs_filt_exportselector = NULL; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
72 |
296
4279cc6a3412
No need for variadic macros here.
Matti Hamalainen <ccr@tnsp.org>
parents:
292
diff
changeset
|
73 #define LUW(x) lookup_widget(xs_configwin, x) |
1 | 74 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
75 #define XS_DEF_WINDOW_DELETE(ME, MV) \ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
76 gboolean xs_ ## ME ## _delete(GtkWidget * w, GdkEvent * e, gpointer d) { \ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
77 (void) w; (void) e; (void) d; \ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
78 if (xs_ ## MV ) { gtk_widget_destroy(xs_ ## MV ); xs_ ## MV = NULL; } \ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
79 return FALSE; \ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
80 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
81 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
82 #define XS_DEF_WINDOW_CANCEL(ME, MV) \ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
83 void xs_ ## ME ## _cancel(GtkButton *b, gpointer d) { \ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
84 (void) b; (void) d; \ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
85 gtk_widget_destroy(xs_ ## MV ); \ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
86 xs_ ## MV = NULL; \ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
87 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
88 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
89 /* Samplerates |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
90 */ |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
91 static gchar *xs_samplerates_table[] = { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
92 "8000", "11025", "22050", |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
93 "44100", "48000", "64000", |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
94 "96000" |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
95 }; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
96 |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
97 static gint xs_nsamplerates_table = (sizeof(xs_samplerates_table) / sizeof(xs_samplerates_table[0])); |
1 | 98 |
99 /* | |
100 * Configuration specific stuff | |
101 */ | |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
102 XS_MUTEX(xs_cfg); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
103 struct t_xs_cfg xs_cfg; |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
104 |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
105 t_xs_cfg_item xs_cfgtable[] = { |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
106 { CTYPE_INT, &xs_cfg.audioBitsPerSample, "audioBitsPerSample" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
107 { CTYPE_INT, &xs_cfg.audioChannels, "audioChannels" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
108 { CTYPE_INT, &xs_cfg.audioFrequency, "audioFrequency" }, |
3 | 109 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
110 { CTYPE_BOOL, &xs_cfg.mos8580, "mos8580" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
111 { CTYPE_BOOL, &xs_cfg.forceModel, "forceModel" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
112 { CTYPE_BOOL, &xs_cfg.emulateFilters, "emulateFilters" }, |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
113 { CTYPE_FLOAT, &xs_cfg.sid1FilterFs, "filterFs" }, |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
114 { CTYPE_FLOAT, &xs_cfg.sid1FilterFm, "filterFm" }, |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
115 { CTYPE_FLOAT, &xs_cfg.sid1FilterFt, "filterFt" }, |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
116 { CTYPE_INT, &xs_cfg.memoryMode, "memoryMode" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
117 { CTYPE_INT, &xs_cfg.clockSpeed, "clockSpeed" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
118 { CTYPE_BOOL, &xs_cfg.forceSpeed, "forceSpeed" }, |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
119 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
120 { CTYPE_INT, &xs_cfg.playerEngine, "playerEngine" }, |
190 | 121 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
122 { CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
123 { CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel" }, |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
124 { CTYPE_INT, &xs_cfg.sid2NFilterPresets, "sid2NFilterPresets" }, |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
125 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
126 { CTYPE_BOOL, &xs_cfg.oversampleEnable, "oversampleEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
127 { CTYPE_INT, &xs_cfg.oversampleFactor, "oversampleFactor" }, |
3 | 128 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
129 { CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
130 { CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
131 { CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
132 { CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
133 { CTYPE_INT, &xs_cfg.playMinTime, "playMinTime" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
134 { CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
135 { CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath" }, |
3 | 136 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
137 { CTYPE_BOOL, &xs_cfg.stilDBEnable, "stilDBEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
138 { CTYPE_STR, &xs_cfg.stilDBPath, "stilDBPath" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
139 { CTYPE_STR, &xs_cfg.hvscPath, "hvscPath" }, |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
140 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
141 { CTYPE_INT, &xs_cfg.subsongControl, "subsongControl" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
142 { CTYPE_BOOL, &xs_cfg.detectMagic, "detectMagic" }, |
3 | 143 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
144 { CTYPE_BOOL, &xs_cfg.titleOverride, "titleOverride" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
145 { CTYPE_STR, &xs_cfg.titleFormat, "titleFormat" }, |
258
e255f23abf33
Automatic subtune changing options added to config.
Matti Hamalainen <ccr@tnsp.org>
parents:
245
diff
changeset
|
146 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
147 { CTYPE_BOOL, &xs_cfg.subAutoEnable, "subAutoEnable" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
148 { CTYPE_BOOL, &xs_cfg.subAutoMinOnly, "subAutoMinOnly" }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
149 { CTYPE_INT, &xs_cfg.subAutoMinTime, "subAutoMinTime" }, |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
150 }; |
3 | 151 |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
152 static const gint xs_cfgtable_max = (sizeof(xs_cfgtable) / sizeof(t_xs_cfg_item)); |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
153 |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
154 |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
155 t_xs_wid_item xs_widtable[] = { |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
156 { WTYPE_BGROUP, CTYPE_INT, "cfg_res_16bit", &xs_cfg.audioBitsPerSample, XS_RES_16BIT }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
157 { WTYPE_BGROUP, CTYPE_INT, "cfg_res_8bit", &xs_cfg.audioBitsPerSample, XS_RES_8BIT }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
158 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_mono", &xs_cfg.audioChannels, XS_CHN_MONO }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
159 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_stereo", &xs_cfg.audioChannels, XS_CHN_STEREO }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
160 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_autopan", &xs_cfg.audioChannels, XS_CHN_AUTOPAN }, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
161 { WTYPE_COMBO, CTYPE_INT, "cfg_samplerate", &xs_cfg.audioFrequency, XS_AUDIO_FREQ }, |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
162 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_oversample", &xs_cfg.oversampleEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
163 { WTYPE_SPIN, CTYPE_INT, "cfg_oversample_factor",&xs_cfg.oversampleFactor, 0 }, |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
164 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
165 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay1", &xs_cfg.playerEngine, XS_ENG_SIDPLAY1 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
166 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2", &xs_cfg.playerEngine, XS_ENG_SIDPLAY2 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
167 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_real", &xs_cfg.memoryMode, XS_MPU_REAL }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
168 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_banksw", &xs_cfg.memoryMode, XS_MPU_BANK_SWITCHING }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
169 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_transrom", &xs_cfg.memoryMode, XS_MPU_TRANSPARENT_ROM }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
170 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_playsid", &xs_cfg.memoryMode, XS_MPU_PLAYSID_ENVIRONMENT }, |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
171 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
172 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_mos8580", &xs_cfg.mos8580, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
173 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sid_force", &xs_cfg.forceModel, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
174 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_ntsc", &xs_cfg.clockSpeed, XS_CLOCK_NTSC }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
175 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_pal", &xs_cfg.clockSpeed, XS_CLOCK_PAL }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
176 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_clock_force", &xs_cfg.forceSpeed, 0 }, |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
177 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sp2_opt", &xs_cfg.sid2OptLevel, 0 }, |
87
94497283affa
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
78
diff
changeset
|
178 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
179 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID }, |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
180 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID }, |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
181 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
182 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 }, |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
183 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1FilterFs, 0 }, |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
184 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fm", &xs_cfg.sid1FilterFm, 0 }, |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
185 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1FilterFt, 0 }, |
64 | 186 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
187 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_enable", &xs_cfg.playMaxTimeEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
188 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_unknown", &xs_cfg.playMaxTimeUnknown, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
189 { WTYPE_SPIN, CTYPE_INT, "cfg_maxtime", &xs_cfg.playMaxTime, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
190 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_mintime_enable", &xs_cfg.playMinTimeEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
191 { WTYPE_SPIN, CTYPE_INT, "cfg_mintime", &xs_cfg.playMinTime, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
192 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_sld_enable", &xs_cfg.songlenDBEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
193 { WTYPE_TEXT, CTYPE_STR, "cfg_sld_dbpath", &xs_cfg.songlenDBPath, 0 }, |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
194 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
195 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
196 { WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
197 { WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
198 |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
199 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
200 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
201 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
202 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_patch", &xs_cfg.subsongControl, XS_SSC_PATCH }, |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
203 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
204 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_detectmagic", &xs_cfg.detectMagic, 0 }, |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
205 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
206 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_ftitle_override", &xs_cfg.titleOverride, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
207 { WTYPE_TEXT, CTYPE_STR, "cfg_ftitle_format", &xs_cfg.titleFormat, 0 }, |
72
e3b205a6bc7e
Lots re-arranging and new code for upcoming modularization.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
208 |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
209 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_enable", &xs_cfg.subAutoEnable, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
210 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_min_only", &xs_cfg.subAutoMinOnly, 0 }, |
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
211 { WTYPE_SPIN, CTYPE_INT, "cfg_subauto_mintime", &xs_cfg.subAutoMinTime, 0 }, |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
212 }; |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
213 |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
214 static const gint xs_widtable_max = (sizeof(xs_widtable) / sizeof(t_xs_wid_item)); |
1 | 215 |
216 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
217 /* Reset/initialize the configuration |
1 | 218 */ |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
219 void xs_init_configuration(void) |
1 | 220 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
221 /* Lock configuration mutex */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
222 XSDEBUG("initializing configuration ...\n"); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
223 XS_MUTEX_LOCK(xs_cfg); |
3 | 224 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
225 /* Initialize values with sensible defaults */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
226 xs_cfg.audioBitsPerSample = XS_RES_16BIT; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
227 xs_cfg.audioChannels = XS_CHN_MONO; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
228 xs_cfg.audioFrequency = XS_AUDIO_FREQ; |
3 | 229 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
230 xs_cfg.mos8580 = FALSE; |
361 | 231 xs_cfg.forceModel = FALSE; |
230 | 232 |
583
f63a50ec456c
SP1 filter widget names were incorrect, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
233 /* Filter values */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
234 xs_cfg.emulateFilters = TRUE; |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
235 xs_cfg.sid1FilterFs = XS_SIDPLAY1_FS; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
236 xs_cfg.sid1FilterFm = XS_SIDPLAY1_FM; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
237 xs_cfg.sid1FilterFt = XS_SIDPLAY1_FT; |
44
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
238 |
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
239 #ifdef HAVE_SIDPLAY2 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
240 xs_cfg.playerEngine = XS_ENG_SIDPLAY2; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
241 xs_cfg.memoryMode = XS_MPU_REAL; |
44
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
242 #else |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
243 #ifdef HAVE_SIDPLAY1 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
244 xs_cfg.playerEngine = XS_ENG_SIDPLAY1; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
245 xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING; |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
246 #else |
141 | 247 #error This should not happen! No emulator engines configured in! |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
248 #endif |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
249 #endif |
44
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
250 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
251 xs_cfg.clockSpeed = XS_CLOCK_PAL; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
252 xs_cfg.forceSpeed = FALSE; |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
253 |
402
f997b79a7251
More work on merging of improved STIL/SLDB handling code with completely
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
254 xs_cfg.sid2OptLevel = 0; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
255 #ifdef HAVE_RESID_BUILDER |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
256 xs_cfg.sid2Builder = XS_BLD_RESID; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
257 #else |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
258 #ifdef HAVE_HARDSID_BUILDER |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
259 xs_cfg.sid2Builder = XS_BLD_HARDSID; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
260 #else |
89
b3f5b731a3fe
Fixed a problem with only libsidplay1 installed
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
261 #ifdef HAVE_SIDPLAY2 |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
262 #error This should not happen! No supported SIDPlay2 builders configured in! |
89
b3f5b731a3fe
Fixed a problem with only libsidplay1 installed
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
263 #endif |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
264 #endif |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
265 #endif |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
266 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
267 xs_cfg.oversampleEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
268 xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE; |
1 | 269 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
270 xs_cfg.playMaxTimeEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
271 xs_cfg.playMaxTimeUnknown = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
272 xs_cfg.playMaxTime = 150; |
169 | 273 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
274 xs_cfg.playMinTimeEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
275 xs_cfg.playMinTime = 15; |
3 | 276 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
277 xs_cfg.songlenDBEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
278 xs_pstrcpy(&xs_cfg.songlenDBPath, "~/C64Music/Songlengths.txt"); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
279 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
280 xs_cfg.stilDBEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
281 xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt"); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
282 xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music"); |
3 | 283 |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
284 #ifdef HAVE_SONG_POSITION |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
285 xs_cfg.subsongControl = XS_SSC_PATCH; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
286 #else |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
287 xs_cfg.subsongControl = XS_SSC_POPUP; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
288 #endif |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
289 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
290 xs_cfg.detectMagic = FALSE; |
1 | 291 |
538 | 292 #if defined(HAVE_XMMSEXTRA) || defined(AUDACIOUS_PLUGIN) |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
293 xs_cfg.titleOverride = FALSE; |
45 | 294 #else |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
295 xs_cfg.titleOverride = TRUE; |
45 | 296 #endif |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
297 xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) [%n/%N][%m/%C]"); |
3 | 298 |
299 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
300 xs_cfg.subAutoEnable = FALSE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
301 xs_cfg.subAutoMinOnly = TRUE; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
302 xs_cfg.subAutoMinTime = 15; |
260 | 303 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
304 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
305 /* Unlock the configuration */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
306 XS_MUTEX_UNLOCK(xs_cfg); |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
307 } |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
308 |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
309 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
310 /* Filter configuration handling |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
311 */ |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
312 #define XS_FITEM (4 * 2) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
313 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
314 static gboolean xs_filter_load_into(XS_CONFIG_FILE *cfg, gint nFilter, t_xs_sid2_filter *pResult) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
315 { |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
316 gchar tmpKey[64], *tmpStr; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
317 gint i, j; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
318 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
319 /* Get fields from config */ |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
320 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
321 if (!XS_CFG_GET_INT(cfg, XS_CONFIG_IDENT, tmpKey, &(pResult->npoints))) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
322 return FALSE; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
323 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
324 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
325 if (!XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, &tmpStr)) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
326 return FALSE; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
327 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
328 pResult->name = strdup(tmpStr); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
329 if (pResult->name == NULL) { |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
330 g_free(pResult); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
331 return FALSE; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
332 } |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
333 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
334 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
335 if (!XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, &tmpStr)) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
336 return FALSE; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
337 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
338 for (i = 0, j = 0; i < pResult->npoints; i++, j += XS_FITEM) { |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
339 if (sscanf(&tmpStr[j], "%4x%4x", |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
340 &(pResult->points[i].x), |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
341 &(pResult->points[i].y)) != 2) |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
342 return FALSE; |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
343 } |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
344 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
345 return TRUE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
346 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
347 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
348 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
349 static t_xs_sid2_filter * xs_filter_load(XS_CONFIG_FILE *cfg, gint nFilter) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
350 { |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
351 t_xs_sid2_filter *pResult; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
352 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
353 /* Allocate filter struct */ |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
354 if ((pResult = g_malloc0(sizeof(t_xs_sid2_filter))) == NULL) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
355 return NULL; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
356 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
357 if (!xs_filter_load_into(cfg, nFilter, pResult)) { |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
358 g_free(pResult); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
359 return NULL; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
360 } else |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
361 return pResult; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
362 } |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
363 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
364 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
365 static gboolean xs_filter_save(XS_CONFIG_FILE *cfg, t_xs_sid2_filter *pFilter, gint nFilter) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
366 { |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
367 gchar *tmpValue, tmpKey[64]; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
368 gint i, j; |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
369 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
370 /* Allocate memory for value string */ |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
371 tmpValue = g_malloc(sizeof(gchar) * XS_FITEM * (pFilter->npoints + 1)); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
372 if (tmpValue == NULL) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
373 return FALSE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
374 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
375 /* Make value string */ |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
376 for (i = 0, j = 0; i < pFilter->npoints; i++, j += XS_FITEM) { |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
377 g_snprintf(&tmpValue[j], XS_FITEM+1, "%04x%04x", |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
378 pFilter->points[i].x, |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
379 pFilter->points[i].y); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
380 } |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
381 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
382 /* Write into the configuration */ |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
383 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
384 XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, pFilter->name); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
385 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
386 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
387 XS_CFG_SET_INT(cfg, XS_CONFIG_IDENT, tmpKey, pFilter->npoints); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
388 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
389 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
390 XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, tmpValue); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
391 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
392 g_free(tmpValue); |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
393 return TRUE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
394 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
395 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
396 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
397 /* Filter exporting and importing. These functions export/import |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
398 * filter settings to/from SIDPlay2 INI-type files. |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
399 */ |
600 | 400 static gboolean xs_fgetitem(gchar *inLine, size_t *linePos, gchar sep, gchar *tmpStr, size_t tmpMax) |
401 { | |
402 size_t i; | |
403 for (i = 0; i < tmpMax && inLine[*linePos] && | |
404 !isspace(inLine[*linePos]) && | |
405 inLine[*linePos] != sep; i++, (*linePos)++) | |
406 tmpStr[i] = inLine[*linePos]; | |
407 tmpStr[i] = 0; | |
408 xs_findnext(inLine, linePos); | |
409 return (inLine[*linePos] == sep); | |
410 } | |
411 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
412 static gboolean xs_filters_import(gchar *pcFilename, t_xs_sid2_filter **pFilters, gint *nFilters) |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
413 { |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
414 FILE *inFile; |
600 | 415 gchar inLine[XS_BUF_SIZE], tmpStr[XS_BUF_SIZE]; |
416 gchar *sectName = NULL; | |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
417 gboolean sectBegin; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
418 size_t lineNum, i; |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
419 t_xs_sid2_filter *f; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
420 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
421 fprintf(stderr, "xs_filters_import(%s)\n", pcFilename); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
422 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
423 if ((inFile = fopen(pcFilename, "ra")) == NULL) |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
424 return FALSE; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
425 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
426 fprintf(stderr, "importing...\n"); |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
427 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
428 sectBegin = FALSE; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
429 lineNum = 0; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
430 while (fgets(inLine, XS_BUF_SIZE, inFile) != NULL) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
431 size_t linePos = 0; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
432 lineNum++; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
433 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
434 xs_findnext(inLine, &linePos); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
435 if (isalpha(inLine[linePos]) && sectBegin) { |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
436 /* A new key/value pair */ |
600 | 437 if (!xs_fgetitem(inLine, &linePos, '=', tmpStr, XS_BUF_SIZE)) { |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
438 fprintf(stderr, "invalid line: %s [expect =']'", inLine); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
439 } else { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
440 linePos++; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
441 xs_findnext(inLine, &linePos); |
600 | 442 if (!strncmp(tmpStr, "points", 6)) { |
443 fprintf(stderr, "points=%s\n", &inLine[linePos]); | |
444 } else if (!strncmp(tmpStr, "point", 5)) { | |
445 } else if (!strncmp(tmpStr, "type", 4)) { | |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
446 } else { |
600 | 447 fprintf(stderr, "warning: ukn def: %s @ %s\n", |
448 tmpStr, sectName); | |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
449 } |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
450 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
451 } else if (inLine[linePos] == '[') { |
600 | 452 /* Check for existing section */ |
453 if (sectBegin) { | |
454 fprintf(stderr, "filter ends: %s\n", sectName); | |
455 g_free(sectName); | |
456 } | |
457 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
458 /* New filter(?) section starts */ |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
459 linePos++; |
600 | 460 for (i = 0; i < XS_BUF_SIZE && inLine[linePos] && inLine[linePos] != ']'; i++, linePos++) |
461 tmpStr[i] = inLine[linePos]; | |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
462 tmpStr[i] = 0; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
463 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
464 if (inLine[linePos] != ']') { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
465 fprintf(stderr, "invalid! expected ']': %s\n", inLine); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
466 } else { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
467 sectName = strdup(tmpStr); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
468 fprintf(stderr, "filter: %s\n", sectName); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
469 sectBegin = TRUE; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
470 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
471 } else if ((inLine[linePos] != ';') && (inLine[linePos] != 0)) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
472 /* Syntax error */ |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
473 fprintf(stderr, "syntax error: %s\n", inLine); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
474 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
475 } |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
476 |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
477 fclose(inFile); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
478 return TRUE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
479 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
480 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
481 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
482 static gboolean xs_filters_export(gchar *pcFilename, t_xs_sid2_filter **pFilters, gint nFilters) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
483 { |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
484 FILE *outFile; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
485 t_xs_sid2_filter *f; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
486 gint n; |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
487 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
488 /* Open/create the file */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
489 if ((outFile = fopen(pcFilename, "wa")) == NULL) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
490 return FALSE; |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
491 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
492 /* Header */ |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
493 fprintf(outFile, |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
494 "; SIDPlay2 compatible filter definition file\n" |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
495 "; Exported by " PACKAGE_STRING "\n\n"); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
496 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
497 /* Write each filter spec in "INI"-style format */ |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
498 for (n = 0; n < nFilters; n++) { |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
499 gint i; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
500 f = pFilters[n]; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
501 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
502 fprintf(outFile, |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
503 "[%s]\n" |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
504 "type=1\n" |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
505 "points=%d\n", |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
506 f->name, f->npoints); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
507 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
508 for (i = 0; i < f->npoints; i++) { |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
509 fprintf(outFile, |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
510 "point%d=%d,%d\n", |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
511 i + 1, |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
512 f->points[i].x, |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
513 f->points[i].y); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
514 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
515 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
516 fprintf(outFile, "\n"); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
517 f++; |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
518 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
519 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
520 fclose(outFile); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
521 return TRUE; |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
522 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
523 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
524 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
525 /* Get the configuration (from file or default) |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
526 */ |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
527 void xs_read_configuration(void) |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
528 { |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
529 XS_CONFIG_FILE *cfg; |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
530 gint i; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
531 gchar *tmpStr; |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
532 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
533 /* Try to open the XMMS configuration file */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
534 XS_MUTEX_LOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
535 XSDEBUG("loading from config-file ...\n"); |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
536 |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
537 cfg = XS_CONFIG_OPEN(); |
50
dae6d3c2268d
Minor fixes, updated to support default XMMS configfile
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
538 |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
539 if (cfg == NULL) { |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
540 XSDEBUG("Could not open configuration, trying to write defaults...\n"); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
541 xs_write_configuration(); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
542 return; |
3 | 543 } |
1 | 544 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
545 /* Read the new settings from XMMS configuration file */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
546 for (i = 0; i < xs_cfgtable_max; i++) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
547 switch (xs_cfgtable[i].itemType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
548 case CTYPE_INT: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
549 XS_CFG_GET_INT(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
550 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
551 (gint *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
552 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
553 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
554 case CTYPE_BOOL: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
555 XS_CFG_GET_BOOL(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
556 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
557 (gboolean *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
558 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
559 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
560 case CTYPE_FLOAT: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
561 XS_CFG_GET_FLOAT(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
562 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
563 (gfloat *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
564 break; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
565 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
566 case CTYPE_STR: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
567 if (XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
568 xs_cfgtable[i].itemName, (gchar **) &tmpStr)) { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
569 xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
570 g_free(tmpStr); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
571 } |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
572 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
573 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
574 } |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
575 |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
576 /* Filters and presets are a special case */ |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
577 xs_filter_load_into(cfg, 0, &xs_cfg.sid2Filter); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
578 xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(t_xs_sid2_filter *)); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
579 if (!xs_cfg.sid2FilterPresets) { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
580 xs_error(_("Allocation of sid2FilterPresets structure failed!\n")); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
581 } else { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
582 for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
583 xs_cfg.sid2FilterPresets[i] = |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
584 xs_filter_load(cfg, i); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
585 } |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
586 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
587 |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
588 XS_CONFIG_FREE(cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
589 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
590 XS_MUTEX_UNLOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
591 XSDEBUG("OK\n"); |
1 | 592 } |
593 | |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
594 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
595 /* Write the current configuration |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
596 */ |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
597 gint xs_write_configuration(void) |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
598 { |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
599 XS_CONFIG_FILE *cfg; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
600 gint i; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
601 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
602 XSDEBUG("writing configuration ...\n"); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
603 XS_MUTEX_LOCK(xs_cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
604 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
605 /* Try to open the XMMS configuration file */ |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
606 cfg = XS_CONFIG_OPEN(); |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
607 |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
608 #ifndef AUDACIOUS_PLUGIN |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
609 if (!cfg) cfg = xmms_cfg_new(); |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
610 if (!cfg) return -1; |
50
dae6d3c2268d
Minor fixes, updated to support default XMMS configfile
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
611 #endif |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
612 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
613 /* Write the new settings to XMMS configuration file */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
614 for (i = 0; i < xs_cfgtable_max; i++) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
615 switch (xs_cfgtable[i].itemType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
616 case CTYPE_INT: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
617 XS_CFG_SET_INT(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
618 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
619 *(gint *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
620 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
621 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
622 case CTYPE_BOOL: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
623 XS_CFG_SET_BOOL(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
624 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
625 *(gboolean *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
626 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
627 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
628 case CTYPE_FLOAT: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
629 XS_CFG_SET_FLOAT(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
630 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
631 *(gfloat *) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
632 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
633 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
634 case CTYPE_STR: |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
635 XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
636 xs_cfgtable[i].itemName, |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
637 *(gchar **) xs_cfgtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
638 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
639 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
640 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
641 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
642 |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
643 XS_CONFIG_WRITE(cfg); |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
644 XS_CONFIG_FREE(cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
645 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
646 XS_MUTEX_UNLOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
647 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
648 return 0; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
649 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
650 |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
651 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
652 /* Configuration panel was canceled |
1 | 653 */ |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
654 XS_DEF_WINDOW_CANCEL(cfg, configwin) |
1 | 655 |
656 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
657 /* Configuration was accepted, save the settings |
1 | 658 */ |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
659 void xs_cfg_ok(void) |
1 | 660 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
661 gint i; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
662 gfloat tmpValue; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
663 gint tmpInt; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
664 gchar *tmpStr; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
665 |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
666 /* Get lock on configuration */ |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
667 XS_MUTEX_LOCK(xs_cfg); |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
668 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
669 XSDEBUG("get data from widgets to config...\n"); |
3 | 670 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
671 for (i = 0; i < xs_widtable_max; i++) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
672 switch (xs_widtable[i].widType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
673 case WTYPE_BGROUP: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
674 /* Check if toggle-button is active */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
675 if (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
676 /* Yes, set the constant value */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
677 *((gint *) xs_widtable[i].itemData) = xs_widtable[i].itemSet; |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
678 } |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
679 break; |
63 | 680 |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
681 case WTYPE_COMBO: |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
682 /* Get text from text-widget */ |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
683 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName))); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
684 if (sscanf(tmpStr, "%d", &tmpInt) != 1) |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
685 tmpInt = xs_widtable[i].itemSet; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
686 |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
687 *((gint *) xs_widtable[i].itemData) = tmpInt; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
688 break; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
689 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
690 case WTYPE_SPIN: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
691 case WTYPE_SCALE: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
692 /* Get the value */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
693 switch (xs_widtable[i].widType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
694 case WTYPE_SPIN: |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
695 tmpValue = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW(xs_widtable[i].widName)))->value; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
696 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
697 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
698 case WTYPE_SCALE: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
699 tmpValue = gtk_range_get_adjustment(GTK_RANGE(LUW(xs_widtable[i].widName)))->value; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
700 break; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
701 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
702 default: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
703 tmpValue = -1; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
704 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
705 } |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
706 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
707 /* Set the value */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
708 switch (xs_widtable[i].itemType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
709 case CTYPE_INT: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
710 *((gint *) xs_widtable[i].itemData) = (gint) tmpValue; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
711 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
712 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
713 case CTYPE_FLOAT: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
714 *((gfloat *) xs_widtable[i].itemData) = tmpValue; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
715 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
716 } |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
717 break; |
1 | 718 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
719 case WTYPE_BUTTON: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
720 /* Check if toggle-button is active */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
721 *((gboolean *) xs_widtable[i].itemData) = |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
722 (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
723 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
724 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
725 case WTYPE_TEXT: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
726 /* Get text from text-widget */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
727 xs_pstrcpy((gchar **) xs_widtable[i].itemData, |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
728 gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName)))); |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
729 break; |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
730 } |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
731 } |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
732 |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
733 /* Get filter settings */ |
600 | 734 /* |
735 if (!xs_curve_get_points(XS_CURVE(LUW("")), &xs_cfg.sid2Filter.points, &xs_cfg.sid2Filter.npoints)) { | |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
736 xs_error(_("Warning: Could not get filter curve widget points!\n")); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
737 } |
600 | 738 */ |
1 | 739 |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
740 /* Release lock */ |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
741 XS_MUTEX_UNLOCK(xs_cfg); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
742 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
743 /* Close window */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
744 gtk_widget_destroy(xs_configwin); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
745 xs_configwin = NULL; |
147
a7abcda7a86c
SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents:
141
diff
changeset
|
746 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
747 /* Write settings */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
748 xs_write_configuration(); |
1 | 749 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
750 /* Re-initialize */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
751 xs_reinit(); |
1 | 752 } |
753 | |
754 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
755 /* HVSC songlength-database file selector response-functions |
3 | 756 */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
757 void xs_cfg_sldb_browse(GtkButton * button, gpointer user_data) |
1 | 758 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
759 (void) button; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
760 (void) user_data; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
761 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
762 if (xs_sldb_fileselector != NULL) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
763 gdk_window_raise(xs_sldb_fileselector->window); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
764 return; |
42 | 765 } |
766 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
767 xs_sldb_fileselector = create_xs_sldb_fs(); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
768 XS_MUTEX_LOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
769 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_sldb_fileselector), xs_cfg.songlenDBPath); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
770 XS_MUTEX_UNLOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
771 gtk_widget_show(xs_sldb_fileselector); |
3 | 772 } |
773 | |
774 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
775 void xs_sldb_fs_ok(GtkButton *button, gpointer user_data) |
3 | 776 { |
579 | 777 (void) button; |
778 (void) user_data; | |
779 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
780 /* Selection was accepted! */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
781 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_sld_dbpath")), |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
782 gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_sldb_fileselector))); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
783 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
784 /* Close file selector window */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
785 gtk_widget_destroy(xs_sldb_fileselector); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
786 xs_sldb_fileselector = NULL; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
787 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
788 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
789 XS_DEF_WINDOW_CANCEL(sldb_fs, sldb_fileselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
790 XS_DEF_WINDOW_DELETE(sldb_fs, sldb_fileselector) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
791 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
792 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
793 /* STIL-database file selector response-functions |
1 | 794 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
795 void xs_cfg_stil_browse(GtkButton * button, gpointer user_data) |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
796 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
797 (void) button; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
798 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
799 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
800 if (xs_stil_fileselector != NULL) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
801 gdk_window_raise(xs_stil_fileselector->window); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
802 return; |
42 | 803 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
804 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
805 xs_stil_fileselector = create_xs_stil_fs(); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
806 XS_MUTEX_LOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
807 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_stil_fileselector), xs_cfg.stilDBPath); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
808 XS_MUTEX_UNLOCK(xs_cfg); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
809 gtk_widget_show(xs_stil_fileselector); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
810 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
811 |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
812 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
813 void xs_stil_fs_ok(GtkButton *button, gpointer user_data) |
1 | 814 { |
579 | 815 (void) button; |
816 (void) user_data; | |
817 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
818 /* Selection was accepted! */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
819 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_stil_dbpath")), |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
820 gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_stil_fileselector))); |
1 | 821 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
822 /* Close file selector window */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
823 gtk_widget_destroy(xs_stil_fileselector); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
824 xs_stil_fileselector = NULL; |
1 | 825 } |
826 | |
827 | |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
828 XS_DEF_WINDOW_CANCEL(stil_fs, stil_fileselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
829 XS_DEF_WINDOW_DELETE(stil_fs, stil_fileselector) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
830 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
831 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
832 /* HVSC location selector response-functions |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
833 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
834 void xs_cfg_hvsc_browse(GtkButton * button, gpointer user_data) |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
835 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
836 (void) button; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
837 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
838 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
839 if (xs_hvsc_selector != NULL) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
840 gdk_window_raise(xs_hvsc_selector->window); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
841 return; |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
842 } |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
843 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
844 xs_hvsc_selector = create_xs_hvsc_fs(); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
845 XS_MUTEX_LOCK(xs_cfg); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
846 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_hvsc_selector), xs_cfg.hvscPath); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
847 XS_MUTEX_UNLOCK(xs_cfg); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
848 gtk_widget_show(xs_hvsc_selector); |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
849 } |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
850 |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
851 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
852 void xs_hvsc_fs_ok(GtkButton *button, gpointer user_data) |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
853 { |
579 | 854 (void) button; |
855 (void) user_data; | |
856 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
857 /* Selection was accepted! */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
858 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_hvsc_path")), |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
859 gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_hvsc_selector))); |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
860 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
861 /* Close file selector window */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
862 gtk_widget_destroy(xs_hvsc_selector); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
863 xs_hvsc_selector = NULL; |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
864 } |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
865 |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
866 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
867 XS_DEF_WINDOW_CANCEL(hvsc_fs, hvsc_selector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
868 XS_DEF_WINDOW_DELETE(hvsc_fs, hvsc_selector) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
869 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
870 |
578 | 871 /* Filter handling |
872 */ | |
873 void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data) | |
874 { | |
875 (void) button; | |
876 (void) user_data; | |
877 | |
583
f63a50ec456c
SP1 filter widget names were incorrect, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
878 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fs"))), XS_SIDPLAY1_FS); |
f63a50ec456c
SP1 filter widget names were incorrect, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
879 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fm"))), XS_SIDPLAY1_FM); |
f63a50ec456c
SP1 filter widget names were incorrect, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
880 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_ft"))), XS_SIDPLAY1_FT); |
578 | 881 } |
882 | |
883 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
884 void xs_cfg_sp2_filter_update(XSCurve *curve, t_xs_sid2_filter *f) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
885 { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
886 assert(curve); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
887 assert(f); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
888 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
889 xs_curve_reset(curve); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
890 xs_curve_set_range(curve, 0,0, XS_SIDPLAY2_NFPOINTS, XS_SIDPLAY2_FMAX); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
891 if (!xs_curve_set_points(curve, f->points, f->npoints)) { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
892 // FIXME |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
893 xs_error(_("Warning: Could not set filter curve widget points!\n")); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
894 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
895 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
896 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
897 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
898 void xs_cfg_sp2_presets_update(void) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
899 { |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
900 GList *tmpList = NULL; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
901 gint i; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
902 |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
903 for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
904 tmpList = g_list_append(tmpList, |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
905 (gpointer) xs_cfg.sid2FilterPresets[i]->name); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
906 } |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
907 |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
908 gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_sp2_filter_combo")), tmpList); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
909 g_list_free(tmpList); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
910 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
911 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
912 |
578 | 913 void xs_cfg_sp2_filter_load(GtkButton *button, gpointer user_data) |
914 { | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
915 gchar *tmpStr; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
916 gint i, j; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
917 |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
918 (void) button; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
919 (void) user_data; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
920 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
921 XS_MUTEX_LOCK(xs_cfg); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
922 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
923 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry"))); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
924 for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
925 if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
926 j = i; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
927 break; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
928 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
929 } |
583
f63a50ec456c
SP1 filter widget names were incorrect, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
930 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
931 if (j != -1) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
932 fprintf(stderr, "Updating from '%s'\n", tmpStr); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
933 xs_cfg_sp2_filter_update( |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
934 XS_CURVE(LUW("cfg_sp2_filter_curve")), |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
935 xs_cfg.sid2FilterPresets[i]); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
936 } else { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
937 /* error/warning: no such filter preset */ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
938 fprintf(stderr, "No such filter preset '%s'!\n", tmpStr); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
939 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
940 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
941 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 942 } |
943 | |
944 | |
945 void xs_cfg_sp2_filter_save(GtkButton *button, gpointer user_data) | |
946 { | |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
947 /* |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
948 1) check if textentry matches any current filter name |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
949 yes) ask if saving over ok? |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
950 no) ... |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
951 |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
952 2) save current filter to the name |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
953 */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
954 gchar *tmpStr; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
955 gint i, j; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
956 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
957 (void) button; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
958 (void) user_data; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
959 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
960 XS_MUTEX_LOCK(xs_cfg); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
961 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
962 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry"))); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
963 for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
964 if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
965 j = i; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
966 break; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
967 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
968 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
969 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
970 if (j != -1) { |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
971 fprintf(stderr, "Found, confirm overwrite?\n"); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
972 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
973 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
974 fprintf(stderr, "saving!\n"); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
975 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
976 xs_cfg_sp2_presets_update(); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
977 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
978 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 979 } |
980 | |
981 | |
982 void xs_cfg_sp2_filter_delete(GtkButton *button, gpointer user_data) | |
983 { | |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
984 (void) button; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
985 (void) user_data; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
986 /* |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
987 1) confirm |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
988 2) delete |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
989 */ |
578 | 990 } |
991 | |
992 | |
993 void xs_cfg_sp2_filter_import(GtkButton *button, gpointer user_data) | |
994 { | |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
995 (void) button; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
996 (void) user_data; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
997 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
998 if (xs_filt_importselector != NULL) { |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
999 gdk_window_raise(xs_filt_importselector->window); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1000 return; |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1001 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1002 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1003 xs_filt_importselector = create_xs_filter_import_fs(); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1004 gtk_widget_show(xs_filt_importselector); |
578 | 1005 } |
1006 | |
1007 | |
1008 void xs_filter_import_fs_ok(GtkButton *button, gpointer user_data) | |
1009 { | |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1010 gchar *tmpStr; |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
1011 (void) button; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
1012 (void) user_data; |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1013 |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1014 XS_MUTEX_LOCK(xs_cfg); |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1015 |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1016 /* Selection was accepted! */ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1017 tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_importselector)); |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1018 xs_filters_import(tmpStr, xs_cfg.sid2FilterPresets, &xs_cfg.sid2NFilterPresets); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1019 xs_cfg_sp2_presets_update(); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1020 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1021 /* Close file selector window */ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1022 gtk_widget_destroy(xs_filt_importselector); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1023 xs_filt_importselector = NULL; |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1024 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1025 } |
1026 | |
1027 | |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1028 XS_DEF_WINDOW_CANCEL(filter_import_fs, filt_importselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1029 XS_DEF_WINDOW_DELETE(filter_import_fs, filt_importselector) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1030 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1031 |
590 | 1032 void xs_cfg_sp2_filter_export(GtkButton *button, gpointer user_data) |
1033 { | |
1034 (void) button; | |
1035 (void) user_data; | |
1036 | |
1037 if (xs_filt_exportselector != NULL) { | |
1038 gdk_window_raise(xs_filt_exportselector->window); | |
1039 return; | |
1040 } | |
1041 | |
1042 xs_filt_exportselector = create_xs_filter_export_fs(); | |
1043 gtk_widget_show(xs_filt_exportselector); | |
1044 } | |
1045 | |
1046 | |
578 | 1047 void xs_filter_export_fs_ok(GtkButton *button, gpointer user_data) |
1048 { | |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1049 gchar *tmpStr; |
582
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
1050 (void) button; |
f58eb35438c6
Outline plans for rest of the filter config functionality in comments;
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
1051 (void) user_data; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1052 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1053 XS_MUTEX_LOCK(xs_cfg); |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1054 |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1055 /* Selection was accepted! */ |
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1056 tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_exportselector)); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1057 xs_filters_export(tmpStr, xs_cfg.sid2FilterPresets, xs_cfg.sid2NFilterPresets); |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1058 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1059 /* Close file selector window */ |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1060 gtk_widget_destroy(xs_filt_exportselector); |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1061 xs_filt_exportselector = NULL; |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1062 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1063 } |
1064 | |
1065 | |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1066 XS_DEF_WINDOW_CANCEL(filter_export_fs, filt_exportselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1067 XS_DEF_WINDOW_DELETE(filter_export_fs, filt_exportselector) |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1068 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1069 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1070 /* Selection toggle handlers |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1071 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1072 void xs_cfg_emu_filters_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1073 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1074 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1075 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1076 (void) user_data; |
172 | 1077 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1078 gtk_widget_set_sensitive(LUW("cfg_filters_notebook"), isActive); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1079 } |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1080 |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1081 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1082 void xs_cfg_ftitle_override_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1083 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1084 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1085 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1086 (void) user_data; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1087 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1088 gtk_widget_set_sensitive(LUW("cfg_ftitle_box"), isActive); |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1089 } |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1090 |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1091 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1092 void xs_cfg_emu_sidplay1_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1093 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1094 (void) togglebutton; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1095 (void) user_data; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1096 } |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1097 |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1098 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1099 void xs_cfg_emu_sidplay2_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1100 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1101 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1102 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1103 (void) user_data; |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1104 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1105 gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), isActive); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1106 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1107 gtk_widget_set_sensitive(LUW("cfg_sidplay2_frame"), isActive); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1108 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), isActive); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1109 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1110 gtk_widget_set_sensitive(LUW("cfg_chn_autopan"), !isActive); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1111 |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1112 #ifdef HAVE_RESID_BUILDER |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1113 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isActive); |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1114 #else |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1115 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE); |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1116 #endif |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1117 |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1118 #ifdef HAVE_HARDSID_BUILDER |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1119 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isActive); |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1120 #else |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1121 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1122 #endif |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1123 } |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1124 |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1125 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1126 void xs_cfg_oversample_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1127 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1128 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1129 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1130 (void) user_data; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1131 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1132 gtk_widget_set_sensitive(LUW("cfg_oversample_box"), isActive); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1133 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1134 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1135 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1136 void xs_cfg_mintime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1137 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1138 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1139 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1140 (void) user_data; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1141 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1142 gtk_widget_set_sensitive(LUW("cfg_mintime_box"), isActive); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1143 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1144 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1145 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1146 void xs_cfg_maxtime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1147 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1148 gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable"))->active; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1149 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1150 (void) togglebutton; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1151 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1152 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1153 gtk_widget_set_sensitive(LUW("cfg_maxtime_unknown"), isActive); |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1154 gtk_widget_set_sensitive(LUW("cfg_maxtime_box"), isActive); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1155 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1156 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1157 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1158 void xs_cfg_sldb_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1159 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1160 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1161 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1162 (void) user_data; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1163 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1164 gtk_widget_set_sensitive(LUW("cfg_sld_box"), isActive); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1165 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1166 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1167 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1168 void xs_cfg_stil_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
260 | 1169 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1170 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1171 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1172 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1173 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1174 gtk_widget_set_sensitive(LUW("cfg_stil_box1"), isActive); |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1175 gtk_widget_set_sensitive(LUW("cfg_stil_box2"), isActive); |
260 | 1176 } |
1177 | |
1178 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1179 void xs_cfg_subauto_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
260 | 1180 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1181 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1182 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1183 (void) user_data; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1184 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1185 gtk_widget_set_sensitive(LUW("cfg_subauto_min_only"), isActive); |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1186 gtk_widget_set_sensitive(LUW("cfg_subauto_box"), isActive); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1187 } |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1188 |
260 | 1189 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1190 void xs_cfg_subauto_min_only_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1191 { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1192 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active && |
362 | 1193 GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable"))->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1194 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1195 (void) user_data; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1196 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1197 gtk_widget_set_sensitive(LUW("cfg_subauto_box"), isActive); |
260 | 1198 } |
1199 | |
172 | 1200 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1201 void xs_cfg_mintime_changed(GtkEditable * editable, gpointer user_data) |
172 | 1202 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1203 gint tmpValue; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1204 GtkAdjustment *tmpAdj; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1205 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1206 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1207 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1208 tmpAdj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_maxtime"))); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1209 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1210 tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1211 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1212 if (tmpValue > tmpAdj->value) |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1213 gtk_adjustment_set_value(tmpAdj, tmpValue); |
172 | 1214 } |
1215 | |
1216 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1217 void xs_cfg_maxtime_changed(GtkEditable * editable, gpointer user_data) |
172 | 1218 { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1219 gint tmpValue; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1220 GtkAdjustment *tmpAdj; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1221 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1222 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1223 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1224 tmpAdj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_mintime"))); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1225 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1226 tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1227 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1228 if (tmpValue < tmpAdj->value) |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1229 gtk_adjustment_set_value(tmpAdj, tmpValue); |
172 | 1230 } |
1231 | |
1232 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1233 XS_DEF_WINDOW_DELETE(configwin, configwin) |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1234 |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1235 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1236 /* Execute the configuration panel |
1 | 1237 */ |
1238 void xs_configure(void) | |
1239 { | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1240 gint i; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1241 gfloat tmpValue; |
579 | 1242 gchar tmpStr[64]; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1243 GList *tmpList = NULL; |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1244 GtkWidget *tmpCurve; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1245 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1246 /* Check if the window already exists */ |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1247 if (xs_configwin) { |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1248 gdk_window_raise(xs_configwin->window); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1249 return; |
1 | 1250 } |
1251 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1252 /* Create the window */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1253 xs_configwin = create_xs_configwin(); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1254 |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1255 /* Get lock on configuration */ |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1256 XS_MUTEX_LOCK(xs_cfg); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1257 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1258 /* Add samplerates */ |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1259 for (i = 0; i < xs_nsamplerates_table; i++) { |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1260 tmpList = g_list_append (tmpList, |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1261 (gpointer) xs_samplerates_table[i]); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1262 } |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1263 gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_samplerate_combo")), tmpList); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1264 g_list_free(tmpList); |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
1265 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1266 /* Create the custom filter curve widget for libSIDPlay2 */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1267 xs_cfg_sp2_presets_update(); |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1268 tmpCurve = xs_curve_new(); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1269 xs_cfg_sp2_filter_update(XS_CURVE(tmpCurve), &xs_cfg.sid2Filter); |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1270 gtk_widget_set_name(tmpCurve, "cfg_sp2_filter_curve"); |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1271 gtk_widget_ref(tmpCurve); |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
1272 gtk_object_set_data_full(GTK_OBJECT(xs_configwin), |
577
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1273 "cfg_sp2_filter_curve", tmpCurve, (GtkDestroyNotify) gtk_widget_unref); |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1274 gtk_widget_show(tmpCurve); |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1275 gtk_container_add(GTK_CONTAINER(LUW("cfg_sp2_filter_frame")), tmpCurve); |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1276 |
349
b5e54614b35a
More unused argument warning removal, bit of code for filter editor.
Matti Hamalainen <ccr@tnsp.org>
parents:
346
diff
changeset
|
1277 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1278 /* Based on available optional parts, gray out options */ |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
1279 #ifndef HAVE_SIDPLAY1 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1280 gtk_widget_set_sensitive(LUW("cfg_emu_sidplay1"), FALSE); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1281 gtk_widget_set_sensitive(LUW("cfg_box_sidplay1"), FALSE); |
42 | 1282 #endif |
1283 | |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1284 #ifndef HAVE_SIDPLAY2 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1285 gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1286 gtk_widget_set_sensitive(LUW("cfg_box_sidplay2"), FALSE); |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
1287 #endif |
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
1288 |
542 | 1289 #if !defined(HAVE_XMMSEXTRA) && !defined(AUDACIOUS_PLUGIN) |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1290 gtk_widget_set_sensitive(LUW("cfg_ftitle_override"), FALSE); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1291 xs_cfg.titleOverride = TRUE; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1292 #endif |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1293 |
102
cf3bbfdb90ac
Disable song-pos patch option when song-pos support is not compiled in.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
1294 #ifndef HAVE_SONG_POSITION |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1295 gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE); |
102
cf3bbfdb90ac
Disable song-pos patch option when song-pos support is not compiled in.
Matti Hamalainen <ccr@tnsp.org>
parents:
89
diff
changeset
|
1296 #endif |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1297 |
542 | 1298 #ifdef AUDACIOUS_PLUGIN |
1299 gtk_widget_set_sensitive(LUW("cfg_detectmagic"), FALSE); | |
1300 #endif | |
1301 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1302 /* Update the widget sensitivities */ |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1303 gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE); |
511
e2c7ee8998da
reSID sampling options in GUI. Not yet used, because libSIDPlay2 API does
Matti Hamalainen <ccr@tnsp.org>
parents:
503
diff
changeset
|
1304 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1305 xs_cfg_emu_filters_toggled((GtkToggleButton *) LUW("cfg_emu_filters"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1306 xs_cfg_ftitle_override_toggled((GtkToggleButton *) LUW("cfg_ftitle_override"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1307 xs_cfg_emu_sidplay1_toggled((GtkToggleButton *) LUW("cfg_emu_sidplay1"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1308 xs_cfg_emu_sidplay2_toggled((GtkToggleButton *) LUW("cfg_emu_sidplay2"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1309 xs_cfg_oversample_toggled((GtkToggleButton *) LUW("cfg_oversample"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1310 xs_cfg_mintime_enable_toggled((GtkToggleButton *) LUW("cfg_mintime_enable"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1311 xs_cfg_maxtime_enable_toggled((GtkToggleButton *) LUW("cfg_maxtime_enable"), NULL); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1312 xs_cfg_sldb_enable_toggled((GtkToggleButton *) LUW("cfg_sld_enable"), NULL); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1313 xs_cfg_stil_enable_toggled((GtkToggleButton *) LUW("cfg_stil_enable"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1314 xs_cfg_subauto_enable_toggled((GtkToggleButton *) LUW("cfg_subauto_enable"), NULL); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1315 xs_cfg_subauto_min_only_toggled((GtkToggleButton *) LUW("cfg_subauto_min_only"), NULL); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1316 |
3 | 1317 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1318 /* Set current data to widgets */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1319 for (i = 0; i < xs_widtable_max; i++) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1320 switch (xs_widtable[i].widType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1321 case WTYPE_BGROUP: |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1322 assert(xs_widtable[i].itemType == CTYPE_INT); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1323 /* Check if current value matches the given one */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1324 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)), |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1325 (*((gint *) xs_widtable[i].itemData) == xs_widtable[i].itemSet)); |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1326 break; |
63 | 1327 |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1328 case WTYPE_COMBO: |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1329 assert(xs_widtable[i].itemType == CTYPE_INT); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1330 g_snprintf(tmpStr, sizeof(tmpStr), "%d", *(gint *) xs_widtable[i].itemData); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1331 gtk_entry_set_text(GTK_ENTRY(LUW(xs_widtable[i].widName)), tmpStr); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1332 break; |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1333 |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1334 case WTYPE_SPIN: |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1335 case WTYPE_SCALE: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1336 /* Get the value */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1337 switch (xs_widtable[i].itemType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1338 case CTYPE_INT: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1339 tmpValue = (gfloat) * ((gint *) xs_widtable[i].itemData); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1340 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1341 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1342 case CTYPE_FLOAT: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1343 tmpValue = *((gfloat *) xs_widtable[i].itemData); |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1344 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1345 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1346 default: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1347 tmpValue = -1; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1348 assert(0); |
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1349 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1350 } |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1351 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1352 /* Set the value */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1353 switch (xs_widtable[i].widType) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1354 case WTYPE_SPIN: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1355 gtk_adjustment_set_value(gtk_spin_button_get_adjustment |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1356 (GTK_SPIN_BUTTON(LUW(xs_widtable[i].widName))), tmpValue); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1357 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1358 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1359 case WTYPE_SCALE: |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1360 gtk_adjustment_set_value(gtk_range_get_adjustment |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1361 (GTK_RANGE(LUW(xs_widtable[i].widName))), tmpValue); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1362 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1363 } |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1364 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1365 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1366 case WTYPE_BUTTON: |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1367 assert(xs_widtable[i].itemType == CTYPE_BOOL); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1368 /* Set toggle-button */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1369 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)), |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1370 *((gboolean *) xs_widtable[i].itemData)); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1371 break; |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1372 |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1373 case WTYPE_TEXT: |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1374 assert(xs_widtable[i].itemType == CTYPE_STR); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1375 /* Set text to text-widget */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1376 if (*(gchar **) xs_widtable[i].itemData != NULL) { |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1377 gtk_entry_set_text(GTK_ENTRY(LUW(xs_widtable[i].widName)), |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1378 *(gchar **) xs_widtable[i].itemData); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1379 } |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1380 break; |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1381 } |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
1382 } |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
1383 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1384 /* Release the configuration */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1385 XS_MUTEX_UNLOCK(xs_cfg); |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
1386 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1387 /* Show the widget */ |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1388 gtk_widget_show(xs_configwin); |
1 | 1389 } |