Mercurial > hg > xmms-sid
annotate src/xs_config.c @ 839:29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 08 Nov 2012 21:44:27 +0200 |
parents | 9cd807b431c8 |
children | a293b88eb3fb |
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> |
723 | 7 (C) Copyright 1999-2009 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 |
652 | 26 #include <audacious/plugin.h> |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
27 #define XS_CONFIG_FILE mcs_handle_t |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
28 #define XS_CONFIG_OPEN aud_cfg_db_open |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
29 #define XS_CONFIG_FREE aud_cfg_db_close |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
30 |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
31 #define XS_CFG_SET_STRING(q,z) aud_cfg_db_set_string(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
32 #define XS_CFG_SET_FLOAT(q,z) aud_cfg_db_set_float(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
33 #define XS_CFG_SET_INT(q,z) aud_cfg_db_set_int(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
34 #define XS_CFG_SET_BOOL(q,z) aud_cfg_db_set_bool(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
35 #define XS_CFG_GET_STRING(q,z) aud_cfg_db_get_string(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
36 #define XS_CFG_GET_FLOAT(q,z) aud_cfg_db_get_float(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
37 #define XS_CFG_GET_INT(q,z) aud_cfg_db_get_int(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
38 #define XS_CFG_GET_BOOL(q,z) aud_cfg_db_get_bool(cfg, XS_CONFIG_IDENT, q, z) |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
39 #else |
3 | 40 #include <xmms/configfile.h> |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
41 #define XS_CONFIG_FILE ConfigFile |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
42 #define XS_CONFIG_OPEN xmms_cfg_open_default_file |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
43 #define XS_CONFIG_FREE xmms_cfg_free |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
44 |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
45 #define XS_CFG_SET_STRING(q,z) xmms_cfg_write_string(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
46 #define XS_CFG_SET_FLOAT(q,z) xmms_cfg_write_float(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
47 #define XS_CFG_SET_INT(q,z) xmms_cfg_write_int(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
48 #define XS_CFG_SET_BOOL(q,z) xmms_cfg_write_boolean(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
49 #define XS_CFG_GET_STRING(q,z) xmms_cfg_read_string(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
50 #define XS_CFG_GET_FLOAT(q,z) xmms_cfg_read_float(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
51 #define XS_CFG_GET_INT(q,z) xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z) |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
52 #define XS_CFG_GET_BOOL(q,z) xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z) |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
53 #endif |
3 | 54 #include <stdio.h> |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
55 #include <ctype.h> |
3 | 56 #include "xs_glade.h" |
57 #include "xs_interface.h" | |
63 | 58 #include "xs_support.h" |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
59 |
1 | 60 |
61 /* | |
3 | 62 * Global widgets |
1 | 63 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
64 static GtkWidget *xs_configwin = NULL, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
65 *xs_sldb_fileselector = NULL, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
66 *xs_stil_fileselector = NULL, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
67 *xs_hvsc_selector = NULL, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
68 *xs_filt_importselector = NULL, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
69 *xs_filt_exportselector = NULL; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
70 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
71 #define LUW(x) lookup_widget(xs_configwin, x) |
1 | 72 |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
73 /* Samplerates |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
74 */ |
785 | 75 static const gchar *xs_samplerates_table[] = |
76 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
77 "8000", "11025", "22050", |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
78 "44100", "48000", "64000", |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
79 "96000" |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
80 }; |
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
81 |
785 | 82 static const gint xs_nsamplerates_table = sizeof(xs_samplerates_table) / sizeof(xs_samplerates_table[0]); |
1 | 83 |
84 /* | |
85 * Configuration specific stuff | |
86 */ | |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
87 XS_MUTEX(xs_cfg); |
702 | 88 struct xs_cfg_t xs_cfg; |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
89 |
702 | 90 static xs_cfg_item_t xs_cfgtable[] = { |
684 | 91 { CTYPE_INT, &xs_cfg.audioBitsPerSample, "audioBitsPerSample" }, |
92 { CTYPE_INT, &xs_cfg.audioChannels, "audioChannels" }, | |
93 { CTYPE_INT, &xs_cfg.audioFrequency, "audioFrequency" }, | |
3 | 94 |
684 | 95 { CTYPE_BOOL, &xs_cfg.mos8580, "mos8580" }, |
96 { CTYPE_BOOL, &xs_cfg.forceModel, "forceModel" }, | |
97 { CTYPE_BOOL, &xs_cfg.emulateFilters, "emulateFilters" }, | |
713
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
98 { CTYPE_FLOAT, &xs_cfg.sid1Filter.fs, "filterFs" }, |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
99 { CTYPE_FLOAT, &xs_cfg.sid1Filter.fm, "filterFm" }, |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
100 { CTYPE_FLOAT, &xs_cfg.sid1Filter.ft, "filterFt" }, |
684 | 101 { CTYPE_INT, &xs_cfg.memoryMode, "memoryMode" }, |
102 { CTYPE_INT, &xs_cfg.clockSpeed, "clockSpeed" }, | |
103 { 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
|
104 |
684 | 105 { CTYPE_INT, &xs_cfg.playerEngine, "playerEngine" }, |
190 | 106 |
684 | 107 { CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder" }, |
108 { CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel" }, | |
109 { 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
|
110 |
684 | 111 { CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable" }, |
112 { CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown" }, | |
113 { CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime" }, | |
114 { CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable" }, | |
115 { CTYPE_INT, &xs_cfg.playMinTime, "playMinTime" }, | |
116 { CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable" }, | |
117 { CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath" }, | |
3 | 118 |
684 | 119 { CTYPE_BOOL, &xs_cfg.stilDBEnable, "stilDBEnable" }, |
120 { CTYPE_STR, &xs_cfg.stilDBPath, "stilDBPath" }, | |
121 { CTYPE_STR, &xs_cfg.hvscPath, "hvscPath" }, | |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
122 |
624
0bf32fa002bf
Merge in some Aud-SID #ifs etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
123 #ifndef AUDACIOUS_PLUGIN |
684 | 124 { CTYPE_INT, &xs_cfg.subsongControl, "subsongControl" }, |
125 { CTYPE_BOOL, &xs_cfg.detectMagic, "detectMagic" }, | |
652 | 126 #endif |
3 | 127 |
684 | 128 { CTYPE_BOOL, &xs_cfg.titleOverride, "titleOverride" }, |
129 { CTYPE_STR, &xs_cfg.titleFormat, "titleFormat" }, | |
258
e255f23abf33
Automatic subtune changing options added to config.
Matti Hamalainen <ccr@tnsp.org>
parents:
245
diff
changeset
|
130 |
684 | 131 { CTYPE_BOOL, &xs_cfg.subAutoEnable, "subAutoEnable" }, |
132 { CTYPE_BOOL, &xs_cfg.subAutoMinOnly, "subAutoMinOnly" }, | |
133 { CTYPE_INT, &xs_cfg.subAutoMinTime, "subAutoMinTime" }, | |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
134 }; |
3 | 135 |
785 | 136 static const gint xs_ncfgtable = sizeof(xs_cfgtable) / sizeof(xs_cfgtable[0]); |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
137 |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
138 |
785 | 139 static xs_wid_item_t xs_cfgitems[] = { |
684 | 140 { WTYPE_BGROUP, CTYPE_INT, "cfg_res_16bit", &xs_cfg.audioBitsPerSample, XS_RES_16BIT }, |
141 { WTYPE_BGROUP, CTYPE_INT, "cfg_res_8bit", &xs_cfg.audioBitsPerSample, XS_RES_8BIT }, | |
142 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_mono", &xs_cfg.audioChannels, XS_CHN_MONO }, | |
143 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_stereo", &xs_cfg.audioChannels, XS_CHN_STEREO }, | |
144 { WTYPE_BGROUP, CTYPE_INT, "cfg_chn_autopan", &xs_cfg.audioChannels, XS_CHN_AUTOPAN }, | |
145 { WTYPE_COMBO, CTYPE_INT, "cfg_samplerate", &xs_cfg.audioFrequency, XS_AUDIO_FREQ }, | |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
146 |
684 | 147 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay1", &xs_cfg.playerEngine, XS_ENG_SIDPLAY1 }, |
148 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2", &xs_cfg.playerEngine, XS_ENG_SIDPLAY2 }, | |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
149 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplayfp", &xs_cfg.playerEngine, XS_ENG_SIDPLAYFP }, |
684 | 150 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_real", &xs_cfg.memoryMode, XS_MPU_REAL }, |
151 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_banksw", &xs_cfg.memoryMode, XS_MPU_BANK_SWITCHING }, | |
152 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_transrom", &xs_cfg.memoryMode, XS_MPU_TRANSPARENT_ROM }, | |
153 { 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
|
154 |
684 | 155 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_mos8580", &xs_cfg.mos8580, 0 }, |
156 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sid_force", &xs_cfg.forceModel, 0 }, | |
157 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_ntsc", &xs_cfg.clockSpeed, XS_CLOCK_NTSC }, | |
158 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_pal", &xs_cfg.clockSpeed, XS_CLOCK_PAL }, | |
159 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_clock_force", &xs_cfg.forceSpeed, 0 }, | |
160 { 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
|
161 |
773
45108b3d88db
Add resid-fp and resid backend to sidplay2fp support.
Matti Hamalainen <ccr@tnsp.org>
parents:
761
diff
changeset
|
162 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid_fp", &xs_cfg.sid2Builder, XS_BLD_RESID_FP }, |
684 | 163 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID }, |
164 { 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
|
165 |
684 | 166 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 }, |
713
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
167 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1Filter.fs, 0 }, |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
168 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fm", &xs_cfg.sid1Filter.fm, 0 }, |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
169 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1Filter.ft, 0 }, |
64 | 170 |
684 | 171 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_enable", &xs_cfg.playMaxTimeEnable, 0 }, |
172 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_unknown", &xs_cfg.playMaxTimeUnknown, 0 }, | |
173 { WTYPE_SPIN, CTYPE_INT, "cfg_maxtime", &xs_cfg.playMaxTime, 0 }, | |
174 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_mintime_enable", &xs_cfg.playMinTimeEnable, 0 }, | |
175 { WTYPE_SPIN, CTYPE_INT, "cfg_mintime", &xs_cfg.playMinTime, 0 }, | |
176 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_sld_enable", &xs_cfg.songlenDBEnable, 0 }, | |
177 { 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
|
178 |
684 | 179 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0 }, |
180 { WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0 }, | |
181 { WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0 }, | |
360
3bea6584259f
Indentation fixes and SID model forcing
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
182 |
624
0bf32fa002bf
Merge in some Aud-SID #ifs etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
183 #ifndef AUDACIOUS_PLUGIN |
684 | 184 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE }, |
185 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK }, | |
186 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP }, | |
187 { 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
|
188 |
684 | 189 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_detectmagic", &xs_cfg.detectMagic, 0 }, |
652 | 190 #endif |
57
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
191 |
684 | 192 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_ftitle_override", &xs_cfg.titleOverride, 0 }, |
193 { 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
|
194 |
684 | 195 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_enable", &xs_cfg.subAutoEnable, 0 }, |
196 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_min_only", &xs_cfg.subAutoMinOnly, 0 }, | |
197 { 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
|
198 }; |
85811bcd049e
Improved, re-written configuration code and lots of minor fixes
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
199 |
785 | 200 static const gint xs_nwidtable = sizeof(xs_cfgitems) / sizeof(xs_cfgitems[0]); |
1 | 201 |
202 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
203 /* Reset/initialize the configuration |
1 | 204 */ |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
205 void xs_init_configuration(void) |
1 | 206 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
207 /* Lock configuration mutex */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
208 XSDEBUG("initializing configuration ...\n"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
209 XS_MUTEX_LOCK(xs_cfg); |
3 | 210 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
211 memset(&xs_cfg, 0, sizeof(xs_cfg)); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
212 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
213 /* Initialize values with sensible defaults */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
214 xs_cfg.audioBitsPerSample = XS_RES_16BIT; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
215 xs_cfg.audioChannels = XS_CHN_MONO; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
216 xs_cfg.audioFrequency = XS_AUDIO_FREQ; |
3 | 217 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
218 xs_cfg.mos8580 = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
219 xs_cfg.forceModel = FALSE; |
230 | 220 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
221 /* Filter values */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
222 xs_cfg.emulateFilters = TRUE; |
713
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
223 xs_cfg.sid1Filter.fs = XS_SIDPLAY1_FS; |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
224 xs_cfg.sid1Filter.fm = XS_SIDPLAY1_FM; |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
225 xs_cfg.sid1Filter.ft = XS_SIDPLAY1_FT; |
44
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
226 |
761 | 227 #if defined(HAVE_SIDPLAY2) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
228 xs_cfg.playerEngine = XS_ENG_SIDPLAY2; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
229 xs_cfg.memoryMode = XS_MPU_REAL; |
761 | 230 #elif defined(HAVE_SIDPLAY1) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
231 xs_cfg.playerEngine = XS_ENG_SIDPLAY1; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
232 xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING; |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
233 #else |
141 | 234 #error This should not happen! No emulator engines configured in! |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
235 #endif |
44
90cd38b28a72
Various fixes and transmogrifying for dual emulation engine environment
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
236 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
237 xs_cfg.clockSpeed = XS_CLOCK_PAL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
238 xs_cfg.forceSpeed = FALSE; |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
239 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
240 xs_cfg.sid2OptLevel = 0; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
241 xs_cfg.sid2NFilterPresets = 0; |
621
11e24183ff23
Properly initialize xs_cfg struct; Check for 0 in sid2NFilterPresets.
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
242 |
831
9cd807b431c8
If we have reSID FP builder, we should not bail out. A theoretical
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
243 #if defined(HAVE_RESID_BUILDER) || defined(HAVE_RESID_FP_BUILDER) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
244 xs_cfg.sid2Builder = XS_BLD_RESID; |
761 | 245 #elif defined(HAVE_HARDSID_BUILDER) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
246 xs_cfg.sid2Builder = XS_BLD_HARDSID; |
761 | 247 #elif defined(HAVE_SIDPLAY2) |
248 # error This should not happen! No supported SIDPlay2 builders configured in! | |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
249 #endif |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
250 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
251 xs_cfg.playMaxTimeEnable = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
252 xs_cfg.playMaxTimeUnknown = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
253 xs_cfg.playMaxTime = 150; |
169 | 254 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
255 xs_cfg.playMinTimeEnable = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
256 xs_cfg.playMinTime = 15; |
3 | 257 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
258 xs_cfg.songlenDBEnable = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
259 xs_pstrcpy(&xs_cfg.songlenDBPath, "~/C64Music/Songlengths.txt"); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
260 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
261 xs_cfg.stilDBEnable = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
262 xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
263 xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music"); |
3 | 264 |
652 | 265 #if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
266 xs_cfg.subsongControl = XS_SSC_PATCH; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
267 #else |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
268 xs_cfg.subsongControl = XS_SSC_POPUP; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
269 #endif |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
270 xs_cfg.detectMagic = FALSE; |
1 | 271 |
745
9dc5378cc806
Remove XMMS_EXTRA stuff, as we require XMMS 1.2.10+ now.
Matti Hamalainen <ccr@tnsp.org>
parents:
723
diff
changeset
|
272 xs_cfg.titleOverride = FALSE; |
3 | 273 |
652 | 274 #ifdef AUDACIOUS_PLUGIN |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
275 xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subsong-id}/${subsong-num}> [${sid-model}/${sid-speed}]"); |
652 | 276 #else |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
277 xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) <%n/%N> [%m/%C]"); |
652 | 278 #endif |
3 | 279 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
280 xs_cfg.subAutoEnable = FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
281 xs_cfg.subAutoMinOnly = TRUE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
282 xs_cfg.subAutoMinTime = 15; |
260 | 283 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
284 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
285 /* Unlock the configuration */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
286 XS_MUTEX_UNLOCK(xs_cfg); |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
287 } |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
288 |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
289 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
290 /* Filter configuration handling |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
291 */ |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
292 static void xs_filters_error(const gchar *fmt, ...) |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
293 { |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
294 va_list ap; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
295 gchar *msg; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
296 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
297 va_start(ap, fmt); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
298 msg = g_strdup_vprintf(fmt, ap); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
299 va_end(ap); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
300 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
301 xmms_show_message(_(PACKAGE_NAME " Error"), msg, _("OK"), TRUE, NULL, NULL); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
302 g_free(msg); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
303 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
304 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
305 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
306 static void xs_filter_free(xs_sid_filter_t *filter) |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
307 { |
785 | 308 if (filter) |
309 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
310 g_free(filter->name); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
311 filter->name = NULL; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
312 g_free(filter); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
313 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
314 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
315 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
316 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
317 #define XS_FITEM (4 * 2) |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
318 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
319 static gboolean xs_filter_load_into(XS_CONFIG_FILE *cfg, gint nFilter, xs_sid_filter_t *filter) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
320 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
321 gchar tmpKey[64], *tmpStr; |
785 | 322 gint i, j; |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
323 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
324 /* Get fields from config */ |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
325 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dType", nFilter); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
326 if (!XS_CFG_GET_INT(tmpKey, &(filter->type))) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
327 return FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
328 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
329 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
330 if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
331 return FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
332 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
333 filter->name = g_strdup(tmpStr); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
334 if (filter->name == NULL) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
335 return FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
336 |
785 | 337 switch (filter->type) |
338 { | |
339 case 1: | |
340 | |
341 /* Types 1 has points */ | |
342 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); | |
343 if (!XS_CFG_GET_INT(tmpKey, &(filter->npoints))) | |
344 return FALSE; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
345 |
785 | 346 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); |
347 if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
348 return FALSE; |
785 | 349 |
350 for (i = 0, j = 0; i < filter->npoints; i++, j += XS_FITEM) | |
351 { | |
352 if (sscanf(&tmpStr[j], "%4x%4x", | |
353 &(filter->points[i].x), | |
354 &(filter->points[i].y)) != 2) | |
355 return FALSE; | |
356 } | |
357 break; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
358 |
785 | 359 case 3: |
360 /* Type 3 has tunables */ | |
361 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData", nFilter); | |
362 if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) | |
363 return FALSE; | |
364 | |
365 if (sscanf(tmpStr, "%f,%f,%f,%f", &filter->rate, &filter->point, | |
366 &filter->voice_nonlinearity, &filter->cf_treshold) != 4) | |
367 return FALSE; | |
368 | |
369 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData3", nFilter); | |
370 if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) | |
371 return FALSE; | |
372 | |
373 if (sscanf(tmpStr, "%f,%f,%f,%f", &filter->baseresistance, | |
374 &filter->offset, &filter->steepness, | |
375 &filter->minimumfetresistance) != 4) | |
376 return FALSE; | |
377 break; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
378 |
785 | 379 case 4: |
380 /* Type 4 has fewer tunables */ | |
381 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData4", nFilter); | |
382 if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) | |
383 return FALSE; | |
384 | |
385 if (sscanf(tmpStr, "%f,%f", &filter->k, &filter->b) != 2) | |
386 return FALSE; | |
387 break; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
388 |
785 | 389 default: |
390 xs_error("Unknown filter type %d for '%s' (#%d).\n", filter->type, filter->name, nFilter); | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
391 return FALSE; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
392 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
393 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
394 return TRUE; |
548
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 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
397 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
398 static xs_sid_filter_t * xs_filter_load(XS_CONFIG_FILE *cfg, gint nFilter) |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
399 { |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
400 xs_sid_filter_t *filter; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
401 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
402 /* Allocate filter struct */ |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
403 if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
404 return NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
405 |
785 | 406 if (!xs_filter_load_into(cfg, nFilter, filter)) |
407 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
408 xs_error("Error loading filter %d from configuration.\n", nFilter); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
409 xs_filter_free(filter); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
410 return NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
411 } else |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
412 return filter; |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
413 } |
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
414 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
415 |
652 | 416 #if 0 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
417 static gboolean xs_filter_save(XS_CONFIG_FILE *cfg, xs_sid_filter_t *pFilter, gint nFilter) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
418 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
419 gchar *tmpValue, tmpKey[64]; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
420 gint i, j; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
421 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
422 /* Allocate memory for value string */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
423 tmpValue = g_malloc(sizeof(gchar) * XS_FITEM * (pFilter->npoints + 1)); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
424 if (tmpValue == NULL) |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
425 return FALSE; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
426 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
427 /* Make value string */ |
785 | 428 for (i = 0, j = 0; i < pFilter->npoints; i++, j += XS_FITEM) |
429 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
430 g_snprintf(&tmpValue[j], XS_FITEM+1, "%04x%04x", |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
431 pFilter->points[i].x, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
432 pFilter->points[i].y); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
433 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
434 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
435 /* Write into the configuration */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
436 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
437 XS_CFG_SET_STRING(tmpKey, pFilter->name); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
438 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
439 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
440 XS_CFG_SET_INT(tmpKey, pFilter->npoints); |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
441 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
442 g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
443 XS_CFG_SET_STRING(tmpKey, tmpValue); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
444 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
445 g_free(tmpValue); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
446 return TRUE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
447 } |
652 | 448 #endif |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
449 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
450 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
451 /* 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
|
452 * 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
|
453 */ |
600 | 454 static gboolean xs_fgetitem(gchar *inLine, size_t *linePos, gchar sep, gchar *tmpStr, size_t tmpMax) |
455 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
456 size_t i; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
457 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
458 for (i = 0; i < tmpMax && inLine[*linePos] && |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
459 inLine[*linePos] != sep; i++, (*linePos)++) |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
460 tmpStr[i] = inLine[*linePos]; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
461 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
462 tmpStr[i] = 0; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
463 while (--i > 0 && isspace(tmpStr[i])) tmpStr[i] = 0; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
464 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
465 xs_findnext(inLine, linePos); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
466 return (inLine[*linePos] == sep); |
600 | 467 } |
468 | |
711 | 469 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
470 static gboolean xs_chkf(xs_sid_filter_t *filter, const gchar *str, const gchar *name, gint type) |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
471 { |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
472 if (g_strncasecmp(str, name, strlen(name))) |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
473 return FALSE; |
785 | 474 |
475 if (filter->type != type) | |
476 { | |
477 if (filter->type == -1) | |
478 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
479 filter->type = type; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
480 return TRUE; |
785 | 481 } |
482 else | |
483 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
484 xs_error("Unexpected key '%s' for filter type %d.\n"); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
485 return FALSE; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
486 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
487 } else |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
488 return TRUE; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
489 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
490 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
491 static gboolean xs_filters_import(const gchar *filename, xs_sid_filter_t **pFilters, gint *nFilters) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
492 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
493 FILE *inFile; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
494 gchar inLine[XS_BUF_SIZE], tmpStr[XS_BUF_SIZE]; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
495 gchar *sectName = NULL; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
496 gboolean inSection, isError = FALSE; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
497 size_t lineNum, i; |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
498 xs_sid_filter_t *filter = NULL; |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
499 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
500 fprintf(stderr, "xs_filters_import(%s)\n", filename); |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
501 |
785 | 502 if ((inFile = fopen(filename, "ra")) == NULL) |
503 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
504 xs_filters_error(""); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
505 return FALSE; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
506 } |
593
91ca76e6c23f
More work towards filter configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
507 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
508 fprintf(stderr, "importing...\n"); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
509 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
510 inSection = FALSE; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
511 lineNum = 0; |
785 | 512 while (fgets(inLine, XS_BUF_SIZE, inFile) != NULL && !isError) |
513 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
514 size_t linePos = 0; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
515 lineNum++; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
516 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
517 xs_findnext(inLine, &linePos); |
785 | 518 if (isalpha(inLine[linePos])) |
519 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
520 /* A new key/value pair */ |
785 | 521 if (!xs_fgetitem(inLine, &linePos, '=', tmpStr, XS_BUF_SIZE)) |
522 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
523 xs_error("Invalid line '%s' :: expected =", inLine); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
524 isError = TRUE; |
785 | 525 } |
526 else | |
527 if (inSection) | |
528 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
529 linePos++; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
530 xs_findnext(inLine, &linePos); |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
531 |
785 | 532 if (xs_chkf(filter, tmpStr, "points", 1)) |
533 { | |
534 } | |
535 else | |
536 if (xs_chkf(filter, tmpStr, "point", 1)) | |
537 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
538 |
785 | 539 } |
540 else | |
541 if (!g_strncasecmp(tmpStr, "type", 4)) | |
542 { | |
543 if (filter->type != -1) | |
544 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
545 xs_error("Filter type %d already set for '%s'\n", |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
546 filter->type, sectName); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
547 } |
785 | 548 } |
549 else | |
550 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
551 xs_error("Unsupported definition '%s' @ '%s'\n", |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
552 tmpStr, sectName); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
553 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
554 } |
785 | 555 } |
556 else | |
557 if (inLine[linePos] == '[') | |
558 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
559 /* Check for existing section */ |
785 | 560 if (inSection) |
561 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
562 /* Submit definition */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
563 fprintf(stderr, "filter ends: %s\n", sectName); |
785 | 564 if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL) |
565 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
566 fprintf(stderr, "could not allocate ..\n"); |
785 | 567 } |
568 else | |
569 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
570 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
571 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
572 g_free(sectName); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
573 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
574 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
575 /* New filter(?) section starts */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
576 linePos++; |
711 | 577 for (i = 0; i < XS_BUF_SIZE-1 && inLine[linePos] && inLine[linePos] != ']'; i++, linePos++) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
578 tmpStr[i] = inLine[linePos]; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
579 tmpStr[i] = 0; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
580 |
785 | 581 if (inLine[linePos] != ']') |
582 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
583 fprintf(stderr, "invalid! expected ']': %s\n", inLine); |
785 | 584 } |
585 else | |
586 { | |
587 if (!g_strncasecmp(tmpStr, "filter", 6)) | |
588 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
589 sectName = strdup(tmpStr + 6); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
590 fprintf(stderr, "filter: %s\n", sectName); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
591 inSection = TRUE; |
785 | 592 } |
593 else | |
594 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
595 fprintf(stderr, "ignoring section: %s\n", tmpStr); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
596 inSection = FALSE; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
597 } |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
598 } |
785 | 599 } |
600 else if (inLine[linePos] != '#' && inLine[linePos] != ';' && inLine[linePos] != 0) | |
601 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
602 /* Syntax error */ |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
603 xs_error("Syntax error: '%s'\n", inLine); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
604 isError = TRUE; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
605 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
606 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
607 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
608 fclose(inFile); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
609 return TRUE; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
610 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
611 |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
612 |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
613 static gboolean xs_filter_export(FILE *outFile, xs_sid_filter_t *filter) |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
614 { |
785 | 615 gint i; |
616 | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
617 fprintf(outFile, |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
618 "[Filter%s]\n" |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
619 "type=%d\n", |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
620 filter->name, filter->type); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
621 |
785 | 622 switch (filter->type) |
623 { | |
624 case 1: | |
625 fprintf(outFile, "points=%d\n", filter->npoints); | |
626 | |
627 for (i = 0; i < filter->npoints; i++) | |
628 { | |
629 fprintf(outFile, | |
630 "point%d=%d,%d\n", | |
631 i + 1, | |
632 filter->points[i].x, | |
633 filter->points[i].y); | |
634 } | |
635 break; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
636 |
785 | 637 case 3: |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
638 fprintf(outFile, |
785 | 639 "DistortionRate = %f\n" |
640 "DistortionPoint = %f\n" | |
641 "VoiceNonlinearity = %f\n" | |
642 "DistortionCFThreshold = %f\n", | |
643 filter->rate, filter->point, | |
644 filter->voice_nonlinearity, | |
645 filter->cf_treshold); | |
646 | |
647 fprintf(outFile, | |
648 "Type3BaseResistance = %f\n" | |
649 "Type3Offset = %f\n" | |
650 "Type3Steepness = %f\n" | |
651 "Type3MinimumFETResistance = %f\n", | |
652 filter->baseresistance, filter->offset, | |
653 filter->steepness, filter->minimumfetresistance); | |
654 break; | |
655 | |
656 case 4: | |
657 fprintf(outFile, | |
658 "Type4K=%f\n" | |
659 "Type4B=%f\n", | |
660 filter->k, filter->b); | |
661 break; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
662 |
785 | 663 default: |
664 xs_error("Filter '%s' has type %d, which is unsupported by export.\n", | |
665 filter->name, filter->type); | |
666 return FALSE; | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
667 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
668 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
669 fprintf(outFile, "\n"); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
670 return TRUE; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
671 } |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
672 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
673 |
785 | 674 static gboolean xs_filters_export(const gchar *filename, xs_sid_filter_t **filters, gint nfilters) |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
675 { |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
676 gboolean result = TRUE; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
677 FILE *outFile; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
678 gint n; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
679 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
680 /* Open/create the file */ |
785 | 681 if ((outFile = fopen(filename, "wa")) == NULL) |
682 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
683 xs_filters_error("Could not open '%s' for writing! Not exporting.", filename); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
684 return FALSE; |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
685 } |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
686 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
687 /* Header */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
688 fprintf(outFile, |
713
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
689 "; SIDPlay2 compatible filter definition file\n" |
06db79680afe
Added new variables for distortion tunables and made few changes to SID1
Matti Hamalainen <ccr@tnsp.org>
parents:
712
diff
changeset
|
690 "; Exported by " PACKAGE_STRING "\n\n"); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
691 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
692 /* Write each filter spec in "INI"-style format */ |
785 | 693 for (n = 0; n < nfilters; n++) |
694 { | |
695 if (!xs_filter_export(outFile, filters[n])) | |
696 { | |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
697 result = FALSE; |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
698 break; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
699 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
700 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
701 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
702 fclose(outFile); |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
703 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
704 if (!result) |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
705 xs_filters_error("Some filters could not be exported!"); |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
706 |
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
707 return result; |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
708 } |
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
709 |
721
2b6a29eefffb
More work on implementing working filter saving, loading, importing and
Matti Hamalainen <ccr@tnsp.org>
parents:
720
diff
changeset
|
710 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
711 /* 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
|
712 */ |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
713 void xs_read_configuration(void) |
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
714 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
715 XS_CONFIG_FILE *cfg; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
716 gint i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
717 gchar *tmpStr; |
271
eebb38debe35
Separate xs_init_configuration() from xs_read_configuration()
Matti Hamalainen <ccr@tnsp.org>
parents:
260
diff
changeset
|
718 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
719 /* Try to open the XMMS configuration file */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
720 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
721 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
|
722 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
723 cfg = XS_CONFIG_OPEN(); |
50
dae6d3c2268d
Minor fixes, updated to support default XMMS configfile
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
724 |
785 | 725 if (cfg == NULL) |
726 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
727 XSDEBUG("Could not open configuration, trying to write defaults...\n"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
728 xs_write_configuration(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
729 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
730 } |
1 | 731 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
732 /* Read the new settings from XMMS configuration file */ |
785 | 733 for (i = 0; i < xs_ncfgtable; i++) |
734 switch (xs_cfgtable[i].itemType) | |
735 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
736 case CTYPE_INT: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
737 XS_CFG_GET_INT(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
738 (gint *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
739 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
740 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
741 case CTYPE_BOOL: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
742 XS_CFG_GET_BOOL(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
743 (gboolean *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
744 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
745 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
746 case CTYPE_FLOAT: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
747 XS_CFG_GET_FLOAT(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
748 (gfloat *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
749 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
750 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
751 case CTYPE_STR: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
752 if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName, |
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
753 (gchar **) &tmpStr)) { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
754 xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
755 g_free(tmpStr); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
756 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
757 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
758 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
759 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
760 /* Filters and presets are a special case */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
761 xs_filter_load_into(cfg, 0, &xs_cfg.sid2Filter); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
762 |
785 | 763 if (xs_cfg.sid2NFilterPresets > 0) |
764 { | |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
765 xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(xs_sid_filter_t *)); |
785 | 766 if (!xs_cfg.sid2FilterPresets) |
767 { | |
666 | 768 xs_error("Allocation of sid2FilterPresets structure failed!\n"); |
785 | 769 } |
770 else | |
771 { | |
772 for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
773 xs_cfg.sid2FilterPresets[i] = xs_filter_load(cfg, i); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
774 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
775 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
776 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
777 XS_CONFIG_FREE(cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
778 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
779 XS_MUTEX_UNLOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
780 XSDEBUG("OK\n"); |
1 | 781 } |
782 | |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
783 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
784 /* Write the current configuration |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
785 */ |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
786 gint xs_write_configuration(void) |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
787 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
788 XS_CONFIG_FILE *cfg; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
789 gint i; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
790 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
791 XSDEBUG("writing configuration ...\n"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
792 XS_MUTEX_LOCK(xs_cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
793 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
794 /* Try to open the XMMS configuration file */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
795 cfg = XS_CONFIG_OPEN(); |
533
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
796 |
9ca430524698
Audacious-related cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
797 #ifndef AUDACIOUS_PLUGIN |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
798 if (!cfg) cfg = xmms_cfg_new(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
799 if (!cfg) return -1; |
50
dae6d3c2268d
Minor fixes, updated to support default XMMS configfile
Matti Hamalainen <ccr@tnsp.org>
parents:
45
diff
changeset
|
800 #endif |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
801 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
802 /* Write the new settings to XMMS configuration file */ |
785 | 803 for (i = 0; i < xs_ncfgtable; i++) |
804 switch (xs_cfgtable[i].itemType) | |
805 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
806 case CTYPE_INT: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
807 XS_CFG_SET_INT(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
808 *(gint *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
809 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
810 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
811 case CTYPE_BOOL: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
812 XS_CFG_SET_BOOL(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
813 *(gboolean *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
814 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
815 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
816 case CTYPE_FLOAT: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
817 XS_CFG_SET_FLOAT(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
818 *(gfloat *) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
819 break; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
820 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
821 case CTYPE_STR: |
720
0feeaf698a54
Clean up the XS_CFG_* macros a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
713
diff
changeset
|
822 XS_CFG_SET_STRING(xs_cfgtable[i].itemName, |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
823 *(gchar **) xs_cfgtable[i].itemData); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
824 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
825 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
826 |
552
9494fee305fa
Config item changes; Unfinished filter preset handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
827 |
652 | 828 #ifndef AUDACIOUS_PLUGIN |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
829 xmms_cfg_write_default_file(cfg); |
652 | 830 #endif |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
831 XS_CONFIG_FREE(cfg); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
832 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
833 XS_MUTEX_UNLOCK(xs_cfg); |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
834 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
835 return 0; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
836 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
837 |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
838 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
839 /* Configuration panel was canceled |
1 | 840 */ |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
841 XS_DEF_WINDOW_CLOSE(cfg_cancel, configwin) |
1 | 842 |
843 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
844 /* Configuration was accepted, save the settings |
1 | 845 */ |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
846 void xs_cfg_ok(void) |
1 | 847 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
848 gint i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
849 gfloat tmpValue; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
850 gint tmpInt; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
851 const gchar *tmpStr; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
852 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
853 /* Get lock on configuration */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
854 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
|
855 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
856 XSDEBUG("get data from widgets to config...\n"); |
3 | 857 |
785 | 858 for (i = 0; i < xs_nwidtable; i++) |
859 switch (xs_cfgitems[i].widType) | |
860 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
861 case WTYPE_BGROUP: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
862 /* Check if toggle-button is active */ |
785 | 863 if (GTK_TOGGLE_BUTTON(LUW(xs_cfgitems[i].widName))->active) |
864 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
865 /* Yes, set the constant value */ |
785 | 866 *((gint *) xs_cfgitems[i].itemData) = xs_cfgitems[i].itemSet; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
867 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
868 break; |
63 | 869 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
870 case WTYPE_COMBO: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
871 /* Get text from text-widget */ |
785 | 872 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW(xs_cfgitems[i].widName))); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
873 if (sscanf(tmpStr, "%d", &tmpInt) != 1) |
785 | 874 tmpInt = xs_cfgitems[i].itemSet; |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
875 |
785 | 876 *((gint *) xs_cfgitems[i].itemData) = tmpInt; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
877 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
878 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
879 case WTYPE_SPIN: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
880 case WTYPE_SCALE: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
881 /* Get the value */ |
785 | 882 switch (xs_cfgitems[i].widType) |
883 { | |
884 case WTYPE_SPIN: | |
885 tmpValue = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW(xs_cfgitems[i].widName)))->value; | |
886 break; | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
887 |
785 | 888 case WTYPE_SCALE: |
889 tmpValue = gtk_range_get_adjustment(GTK_RANGE(LUW(xs_cfgitems[i].widName)))->value; | |
890 break; | |
891 | |
892 default: | |
893 tmpValue = -1; | |
894 break; | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
895 } |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
896 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
897 /* Set the value */ |
785 | 898 switch (xs_cfgitems[i].itemType) |
899 { | |
900 case CTYPE_INT: | |
901 *((gint *) xs_cfgitems[i].itemData) = (gint) tmpValue; | |
902 break; | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
903 |
785 | 904 case CTYPE_FLOAT: |
905 *((gfloat *) xs_cfgitems[i].itemData) = tmpValue; | |
906 break; | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
907 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
908 break; |
1 | 909 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
910 case WTYPE_BUTTON: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
911 /* Check if toggle-button is active */ |
785 | 912 *((gboolean *) xs_cfgitems[i].itemData) = |
913 (GTK_TOGGLE_BUTTON(LUW(xs_cfgitems[i].widName))->active); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
914 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
915 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
916 case WTYPE_TEXT: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
917 /* Get text from text-widget */ |
785 | 918 xs_pstrcpy((gchar **) xs_cfgitems[i].itemData, |
919 gtk_entry_get_text(GTK_ENTRY(LUW(xs_cfgitems[i].widName)))); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
920 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
921 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
922 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
923 /* Get filter settings */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
924 /* |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
925 if (!xs_curve_get_points(XS_CURVE(LUW("")), &xs_cfg.sid2Filter.points, &xs_cfg.sid2Filter.npoints)) { |
666 | 926 xs_error("Warning: Could not get filter curve widget points!\n"); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
927 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
928 */ |
1 | 929 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
930 /* Release lock */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
931 XS_MUTEX_UNLOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
932 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
933 /* Close window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
934 gtk_widget_destroy(xs_configwin); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
935 xs_configwin = NULL; |
147
a7abcda7a86c
SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents:
141
diff
changeset
|
936 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
937 /* Write settings */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
938 xs_write_configuration(); |
1 | 939 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
940 /* Re-initialize */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
941 xs_reinit(); |
1 | 942 } |
943 | |
944 | |
652 | 945 /* Confirmation window |
946 */ | |
947 gboolean xs_confirmwin_delete(GtkWidget *widget, GdkEvent *event, gpointer user_data) | |
948 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
949 (void) widget; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
950 (void) event; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
951 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
952 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
953 return FALSE; |
652 | 954 } |
955 | |
956 | |
957 | |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
958 /* HVSC songlength-database file selector response-functions |
3 | 959 */ |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
960 void xs_cfg_sldb_browse(GtkButton * button, gpointer user_data) |
1 | 961 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
962 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
963 (void) user_data; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
964 |
785 | 965 if (xs_sldb_fileselector != NULL) |
966 { | |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
967 XS_WINDOW_PRESENT(xs_sldb_fileselector); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
968 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
969 } |
42 | 970 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
971 xs_sldb_fileselector = create_xs_sldb_fs(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
972 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
973 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_sldb_fileselector), xs_cfg.songlenDBPath); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
974 XS_MUTEX_UNLOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
975 gtk_widget_show(xs_sldb_fileselector); |
3 | 976 } |
977 | |
978 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
979 void xs_sldb_fs_ok(GtkButton *button, gpointer user_data) |
3 | 980 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
981 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
982 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
983 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
984 /* Selection was accepted! */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
985 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_sld_dbpath")), |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
986 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
|
987 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
988 /* Close file selector window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
989 gtk_widget_destroy(xs_sldb_fileselector); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
990 xs_sldb_fileselector = NULL; |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
991 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
992 |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
993 XS_DEF_WINDOW_CLOSE(sldb_fs_cancel, sldb_fileselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
994 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
|
995 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
996 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
997 /* STIL-database file selector response-functions |
1 | 998 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
999 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
|
1000 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1001 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1002 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1003 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1004 if (xs_stil_fileselector != NULL) { |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
1005 XS_WINDOW_PRESENT(xs_stil_fileselector); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1006 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1007 } |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
1008 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1009 xs_stil_fileselector = create_xs_stil_fs(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1010 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1011 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_stil_fileselector), xs_cfg.stilDBPath); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1012 XS_MUTEX_UNLOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1013 gtk_widget_show(xs_stil_fileselector); |
40
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
1014 } |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
1015 |
1788f4ce6a44
Numerous changes towards 0.8
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
1016 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1017 void xs_stil_fs_ok(GtkButton *button, gpointer user_data) |
1 | 1018 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1019 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1020 (void) user_data; |
579 | 1021 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1022 /* Selection was accepted! */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1023 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_stil_dbpath")), |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1024 gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_stil_fileselector))); |
1 | 1025 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1026 /* Close file selector window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1027 gtk_widget_destroy(xs_stil_fileselector); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1028 xs_stil_fileselector = NULL; |
1 | 1029 } |
1030 | |
1031 | |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
1032 XS_DEF_WINDOW_CLOSE(stil_fs_cancel, stil_fileselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1033 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
|
1034 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1035 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1036 /* 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
|
1037 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1038 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
|
1039 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1040 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1041 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1042 |
785 | 1043 if (xs_hvsc_selector != NULL) |
1044 { | |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
1045 XS_WINDOW_PRESENT(xs_hvsc_selector); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1046 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1047 } |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1048 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1049 xs_hvsc_selector = create_xs_hvsc_fs(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1050 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1051 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_hvsc_selector), xs_cfg.hvscPath); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1052 XS_MUTEX_UNLOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1053 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
|
1054 } |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1055 |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1056 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1057 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
|
1058 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1059 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1060 (void) user_data; |
579 | 1061 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1062 /* Selection was accepted! */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1063 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_hvsc_path")), |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1064 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
|
1065 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1066 /* Close file selector window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1067 gtk_widget_destroy(xs_hvsc_selector); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1068 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
|
1069 } |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1070 |
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1071 |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
1072 XS_DEF_WINDOW_CLOSE(hvsc_fs_cancel, hvsc_selector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1073 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
|
1074 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1075 |
578 | 1076 /* Filter handling |
1077 */ | |
1078 void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data) | |
1079 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1080 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1081 (void) user_data; |
578 | 1082 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1083 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fs"))), XS_SIDPLAY1_FS); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1084 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fm"))), XS_SIDPLAY1_FM); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1085 gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_ft"))), XS_SIDPLAY1_FT); |
578 | 1086 } |
1087 | |
1088 | |
722
5923dfff1fac
Unify xs_sid*_filter_t into one.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
1089 void xs_cfg_sp2_filter_update(XSCurve *curve, xs_sid_filter_t *f) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1090 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1091 assert(curve); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1092 assert(f); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1093 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1094 xs_curve_reset(curve); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1095 xs_curve_set_range(curve, 0,0, XS_SIDPLAY2_NFPOINTS, XS_SIDPLAY2_FMAX); |
785 | 1096 if (!xs_curve_set_points(curve, f->points, f->npoints)) |
1097 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1098 // FIXME |
666 | 1099 xs_error("Warning: Could not set filter curve widget points!\n"); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1100 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1101 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1102 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1103 |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1104 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
|
1105 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1106 GList *tmpList = NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1107 gint i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1108 |
785 | 1109 for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) |
1110 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1111 tmpList = g_list_append(tmpList, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1112 (gpointer) xs_cfg.sid2FilterPresets[i]->name); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1113 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1114 |
750 | 1115 if (tmpList != NULL) |
1116 gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_sp2_filter_combo")), tmpList); | |
1117 | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1118 g_list_free(tmpList); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1119 } |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1120 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1121 |
578 | 1122 void xs_cfg_sp2_filter_load(GtkButton *button, gpointer user_data) |
1123 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1124 const gchar *tmpStr; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1125 gint i, j; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1126 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1127 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1128 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1129 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1130 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1131 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1132 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry"))); |
785 | 1133 for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) |
1134 { | |
1135 if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) | |
1136 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1137 j = i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1138 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1139 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1140 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1141 |
785 | 1142 if (j != -1) |
1143 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1144 fprintf(stderr, "Updating from '%s'\n", tmpStr); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1145 xs_cfg_sp2_filter_update( |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1146 XS_CURVE(LUW("cfg_sp2_filter_curve")), |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1147 xs_cfg.sid2FilterPresets[i]); |
785 | 1148 } |
1149 else | |
1150 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1151 /* error/warning: no such filter preset */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1152 fprintf(stderr, "No such filter preset '%s'!\n", tmpStr); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1153 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1154 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1155 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1156 } |
1157 | |
1158 | |
1159 void xs_cfg_sp2_filter_save(GtkButton *button, gpointer user_data) | |
1160 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1161 /* |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1162 1) check if textentry matches any current filter name |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1163 yes) ask if saving over ok? |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1164 no) ... |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1165 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1166 2) save current filter to the name |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1167 */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1168 const gchar *tmpStr; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1169 gint i, j; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1170 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1171 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1172 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1173 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1174 XS_MUTEX_LOCK(xs_cfg); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1175 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1176 tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry"))); |
785 | 1177 for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) |
1178 { | |
1179 if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) | |
1180 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1181 j = i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1182 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1183 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1184 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1185 |
785 | 1186 if (j != -1) |
1187 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1188 fprintf(stderr, "Found, confirm overwrite?\n"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1189 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1190 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1191 fprintf(stderr, "saving!\n"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1192 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1193 xs_cfg_sp2_presets_update(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1194 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1195 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1196 } |
1197 | |
1198 | |
1199 void xs_cfg_sp2_filter_delete(GtkButton *button, gpointer user_data) | |
1200 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1201 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1202 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1203 /* |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1204 1) confirm |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1205 2) delete |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1206 */ |
578 | 1207 } |
1208 | |
1209 | |
1210 void xs_cfg_sp2_filter_import(GtkButton *button, gpointer user_data) | |
1211 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1212 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1213 (void) user_data; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1214 |
785 | 1215 if (xs_filt_importselector != NULL) |
1216 { | |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
1217 XS_WINDOW_PRESENT(xs_filt_importselector); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1218 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1219 } |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1220 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1221 xs_filt_importselector = create_xs_filter_import_fs(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1222 gtk_widget_show(xs_filt_importselector); |
578 | 1223 } |
1224 | |
1225 | |
1226 void xs_filter_import_fs_ok(GtkButton *button, gpointer user_data) | |
1227 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1228 const gchar *tmpStr; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1229 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1230 (void) user_data; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1231 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1232 XS_MUTEX_LOCK(xs_cfg); |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1233 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1234 /* Selection was accepted! */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1235 tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_importselector)); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1236 xs_filters_import(tmpStr, xs_cfg.sid2FilterPresets, &xs_cfg.sid2NFilterPresets); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1237 xs_cfg_sp2_presets_update(); |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1238 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1239 /* Close file selector window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1240 gtk_widget_destroy(xs_filt_importselector); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1241 xs_filt_importselector = NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1242 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1243 } |
1244 | |
1245 | |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
1246 XS_DEF_WINDOW_CLOSE(filter_import_fs_cancel, filt_importselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1247 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
|
1248 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1249 |
590 | 1250 void xs_cfg_sp2_filter_export(GtkButton *button, gpointer user_data) |
1251 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1252 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1253 (void) user_data; |
590 | 1254 |
785 | 1255 if (xs_filt_exportselector != NULL) |
1256 { | |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
1257 XS_WINDOW_PRESENT(xs_filt_exportselector); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1258 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1259 } |
590 | 1260 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1261 xs_filt_exportselector = create_xs_filter_export_fs(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1262 gtk_widget_show(xs_filt_exportselector); |
590 | 1263 } |
1264 | |
1265 | |
578 | 1266 void xs_filter_export_fs_ok(GtkButton *button, gpointer user_data) |
1267 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1268 const gchar *tmpStr; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1269 (void) button; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1270 (void) user_data; |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1271 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1272 XS_MUTEX_LOCK(xs_cfg); |
592
7ae251af5f83
Some macro magic for simplifying the repetitive code.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
1273 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1274 /* Selection was accepted! */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1275 tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_exportselector)); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1276 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
|
1277 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1278 /* Close file selector window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1279 gtk_widget_destroy(xs_filt_exportselector); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1280 xs_filt_exportselector = NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1281 XS_MUTEX_UNLOCK(xs_cfg); |
578 | 1282 } |
1283 | |
1284 | |
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
1285 XS_DEF_WINDOW_CLOSE(filter_export_fs_cancel, filt_exportselector) |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1286 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
|
1287 |
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1288 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1289 /* Selection toggle handlers |
127
ddb513bd2610
Improved audio format support, now supported formats are "queried" from
Matti Hamalainen <ccr@tnsp.org>
parents:
116
diff
changeset
|
1290 */ |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1291 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
|
1292 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1293 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1294 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1295 (void) user_data; |
172 | 1296 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1297 gtk_widget_set_sensitive(LUW("cfg_filters_notebook"), isActive); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1298 } |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1299 |
652 | 1300 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1301 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
|
1302 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1303 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1304 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1305 (void) user_data; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1306 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1307 gtk_widget_set_sensitive(LUW("cfg_ftitle_box"), isActive); |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1308 } |
652 | 1309 |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1310 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1311 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
|
1312 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1313 (void) togglebutton; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1314 (void) user_data; |
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1315 } |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1316 |
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
77
diff
changeset
|
1317 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1318 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
|
1319 { |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1320 gboolean isSP2Active = GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2"))->active, |
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1321 isFPActive = GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplayfp"))->active, |
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1322 isEither = isSP2Active || isFPActive; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1323 |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1324 (void) togglebutton; |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1325 (void) user_data; |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1326 |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1327 gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), isSP2Active); |
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1328 gtk_widget_set_sensitive(LUW("cfg_sidplay2_frame"), isEither); |
712
f82e0adf19f0
Disable optimization button when distortion patched libSIDPlay2 is in use,
Matti Hamalainen <ccr@tnsp.org>
parents:
711
diff
changeset
|
1329 |
f82e0adf19f0
Disable optimization button when distortion patched libSIDPlay2 is in use,
Matti Hamalainen <ccr@tnsp.org>
parents:
711
diff
changeset
|
1330 /* Optimization mode removed from distortion patch */ |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1331 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), isSP2Active); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1332 |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1333 gtk_widget_set_sensitive(LUW("cfg_chn_autopan"), !isSP2Active); |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1334 |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1335 #if defined(HAVE_SIDPLAYFP) && defined(HAVE_RESID_FP_BUILDER) |
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1336 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid_fp"), isFPActive); |
793
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1337 #else |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1338 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid_fp"), FALSE); |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1339 #endif |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1340 |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1341 #ifdef HAVE_RESID_BUILDER |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1342 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isEither); |
793
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1343 #else |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1344 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE); |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1345 #endif |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1346 |
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1347 #ifdef HAVE_HARDSID_BUILDER |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1348 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isEither); |
793
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1349 #else |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1350 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE); |
793
0617f844ebdb
Meh, revert some previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
1351 #endif |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1352 } |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1353 |
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1354 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1355 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
|
1356 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1357 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1358 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1359 (void) user_data; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1360 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1361 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
|
1362 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1363 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1364 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1365 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
|
1366 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1367 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
|
1368 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1369 (void) togglebutton; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1370 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1371 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1372 gtk_widget_set_sensitive(LUW("cfg_maxtime_unknown"), isActive); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1373 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
|
1374 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1375 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1376 |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1377 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
|
1378 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1379 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
|
1380 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1381 (void) user_data; |
177
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1382 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1383 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
|
1384 } |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1385 |
6e350784aa57
Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
1386 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1387 void xs_cfg_stil_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
260 | 1388 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1389 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1390 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1391 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1392 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1393 gtk_widget_set_sensitive(LUW("cfg_stil_box1"), isActive); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1394 gtk_widget_set_sensitive(LUW("cfg_stil_box2"), isActive); |
260 | 1395 } |
1396 | |
1397 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1398 void xs_cfg_subauto_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) |
260 | 1399 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1400 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1401 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1402 (void) user_data; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1403 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1404 gtk_widget_set_sensitive(LUW("cfg_subauto_min_only"), isActive); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1405 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
|
1406 } |
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1407 |
260 | 1408 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1409 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
|
1410 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1411 gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active && |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1412 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
|
1413 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1414 (void) user_data; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1415 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1416 gtk_widget_set_sensitive(LUW("cfg_subauto_box"), isActive); |
260 | 1417 } |
1418 | |
172 | 1419 |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1420 void xs_cfg_mintime_changed(GtkEditable * editable, gpointer user_data) |
172 | 1421 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1422 gint tmpValue; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1423 GtkAdjustment *tmpAdj; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1424 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1425 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1426 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1427 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
|
1428 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1429 tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1430 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1431 if (tmpValue > tmpAdj->value) |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1432 gtk_adjustment_set_value(tmpAdj, tmpValue); |
172 | 1433 } |
1434 | |
1435 | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1436 void xs_cfg_maxtime_changed(GtkEditable * editable, gpointer user_data) |
172 | 1437 { |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1438 gint tmpValue; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1439 GtkAdjustment *tmpAdj; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1440 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1441 (void) user_data; |
341
e065deeb086f
Removed 'unused argument' warnings, some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
324
diff
changeset
|
1442 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1443 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
|
1444 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1445 tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1446 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1447 if (tmpValue < tmpAdj->value) |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1448 gtk_adjustment_set_value(tmpAdj, tmpValue); |
172 | 1449 } |
1450 | |
1451 | |
589
a437571d0fc5
Work on GUI and filter config code.
Matti Hamalainen <ccr@tnsp.org>
parents:
583
diff
changeset
|
1452 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
|
1453 |
fdddab8f0c1b
Scrubbing through the filter configuration code; Configuration dialog
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1454 |
548
ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
1455 /* Execute the configuration panel |
1 | 1456 */ |
1457 void xs_configure(void) | |
1458 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1459 gint i; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1460 gfloat tmpValue; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1461 gchar tmpStr[64]; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1462 GList *tmpList = NULL; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1463 GtkWidget *tmpCurve; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1464 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1465 /* Check if the window already exists */ |
785 | 1466 if (xs_configwin) |
1467 { | |
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
1468 XS_WINDOW_PRESENT(xs_configwin); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1469 return; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1470 } |
1 | 1471 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1472 /* Create the window */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1473 xs_configwin = create_xs_configwin(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1474 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1475 /* Get lock on configuration */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1476 XS_MUTEX_LOCK(xs_cfg); |
487
6357b7fe5b0d
Added new WTYPE_COMBO, the audio frequency selection now uses a combobox.
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
1477 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1478 /* Add samplerates */ |
785 | 1479 for (i = 0; i < xs_nsamplerates_table; i++) |
1480 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1481 tmpList = g_list_append (tmpList, |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1482 (gpointer) xs_samplerates_table[i]); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1483 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1484 gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_samplerate_combo")), tmpList); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1485 g_list_free(tmpList); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1486 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1487 /* Create the custom filter curve widget for libSIDPlay2 */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1488 xs_cfg_sp2_presets_update(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1489 tmpCurve = xs_curve_new(); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1490 xs_cfg_sp2_filter_update(XS_CURVE(tmpCurve), &xs_cfg.sid2Filter); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1491 gtk_widget_set_name(tmpCurve, "cfg_sp2_filter_curve"); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1492 gtk_widget_ref(tmpCurve); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1493 gtk_object_set_data_full(GTK_OBJECT(xs_configwin), |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1494 "cfg_sp2_filter_curve", tmpCurve, (GtkDestroyNotify) gtk_widget_unref); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1495 gtk_widget_show(tmpCurve); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1496 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
|
1497 |
349
b5e54614b35a
More unused argument warning removal, bit of code for filter editor.
Matti Hamalainen <ccr@tnsp.org>
parents:
346
diff
changeset
|
1498 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1499 /* 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
|
1500 #ifndef HAVE_SIDPLAY1 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1501 gtk_widget_set_sensitive(LUW("cfg_emu_sidplay1"), FALSE); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1502 gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay1"), FALSE); |
42 | 1503 #endif |
1504 | |
839
29f3c3f29c0d
Finalize libSIDPlay2 vs FP configuration stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
831
diff
changeset
|
1505 #if !defined(HAVE_SIDPLAY2) && !defined(HAVE_SIDPLAYFP) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1506 gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1507 gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE); |
75
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
1508 #endif |
653c9b0d1320
SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
1509 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1510 gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE); |
624
0bf32fa002bf
Merge in some Aud-SID #ifs etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1511 |
652 | 1512 #if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN) |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1513 gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE); |
652 | 1514 #endif |
647
3833592748eb
Fixed configuration dialog, thanks to Joker for pointing out the flaws.
Matti Hamalainen <ccr@tnsp.org>
parents:
643
diff
changeset
|
1515 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1516 xs_cfg_ftitle_override_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_ftitle_override")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1517 xs_cfg_emu_filters_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_filters")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1518 xs_cfg_emu_sidplay1_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay1")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1519 xs_cfg_emu_sidplay2_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1520 xs_cfg_mintime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_mintime_enable")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1521 xs_cfg_maxtime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1522 xs_cfg_sldb_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_sld_enable")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1523 xs_cfg_stil_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_stil_enable")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1524 xs_cfg_subauto_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable")), NULL); |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1525 xs_cfg_subauto_min_only_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_min_only")), NULL); |
77
3fca0b13a80a
Configuration panel tweaking
Matti Hamalainen <ccr@tnsp.org>
parents:
75
diff
changeset
|
1526 |
3 | 1527 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1528 /* Set current data to widgets */ |
785 | 1529 for (i = 0; i < xs_nwidtable; i++) |
1530 { | |
1531 switch (xs_cfgitems[i].widType) | |
1532 { | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1533 case WTYPE_BGROUP: |
785 | 1534 assert(xs_cfgitems[i].itemType == CTYPE_INT); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1535 /* Check if current value matches the given one */ |
785 | 1536 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_cfgitems[i].widName)), |
1537 (*((gint *) xs_cfgitems[i].itemData) == xs_cfgitems[i].itemSet)); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1538 break; |
63 | 1539 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1540 case WTYPE_COMBO: |
785 | 1541 assert(xs_cfgitems[i].itemType == CTYPE_INT); |
1542 g_snprintf(tmpStr, sizeof(tmpStr), "%d", *(gint *) xs_cfgitems[i].itemData); | |
1543 gtk_entry_set_text(GTK_ENTRY(LUW(xs_cfgitems[i].widName)), tmpStr); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1544 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1545 |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1546 case WTYPE_SPIN: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1547 case WTYPE_SCALE: |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1548 /* Get the value */ |
785 | 1549 switch (xs_cfgitems[i].itemType) |
1550 { | |
1551 case CTYPE_INT: | |
1552 tmpValue = (gfloat) * ((gint *) xs_cfgitems[i].itemData); | |
1553 break; | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1554 |
785 | 1555 case CTYPE_FLOAT: |
1556 tmpValue = *((gfloat *) xs_cfgitems[i].itemData); | |
1557 break; | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1558 |
785 | 1559 default: |
1560 tmpValue = -1; | |
1561 assert(0); | |
1562 break; | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1563 } |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1564 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1565 /* Set the value */ |
785 | 1566 switch (xs_cfgitems[i].widType) |
1567 { | |
1568 case WTYPE_SPIN: | |
1569 gtk_adjustment_set_value(gtk_spin_button_get_adjustment | |
1570 (GTK_SPIN_BUTTON(LUW(xs_cfgitems[i].widName))), tmpValue); | |
1571 break; | |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1572 |
785 | 1573 case WTYPE_SCALE: |
1574 gtk_adjustment_set_value(gtk_range_get_adjustment | |
1575 (GTK_RANGE(LUW(xs_cfgitems[i].widName))), tmpValue); | |
1576 break; | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1577 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1578 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1579 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1580 case WTYPE_BUTTON: |
785 | 1581 assert(xs_cfgitems[i].itemType == CTYPE_BOOL); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1582 /* Set toggle-button */ |
785 | 1583 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_cfgitems[i].widName)), |
1584 *((gboolean *) xs_cfgitems[i].itemData)); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1585 break; |
359
b1a858b8cb1a
Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
1586 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1587 case WTYPE_TEXT: |
785 | 1588 assert(xs_cfgitems[i].itemType == CTYPE_STR); |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1589 /* Set text to text-widget */ |
785 | 1590 if (*(gchar **) xs_cfgitems[i].itemData != NULL) |
1591 { | |
1592 gtk_entry_set_text(GTK_ENTRY(LUW(xs_cfgitems[i].widName)), | |
1593 *(gchar **) xs_cfgitems[i].itemData); | |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1594 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1595 break; |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1596 } |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1597 } |
228
a9a5924eb10c
Have and use a mutex for xs_cfg configuration structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
224
diff
changeset
|
1598 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1599 /* Release the configuration */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1600 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
|
1601 |
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1602 /* Show the widget */ |
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
1603 gtk_widget_show(xs_configwin); |
1 | 1604 } |