Mercurial > hg > xmms-sid

comparison src/xs_config.c @ 904:5d26b869a48e dev-0_8_94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add resampling configuration.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 09 Nov 2012 09:48:12 +0200
parents eba5d47edc13
children f8aa81ac2528
comparison
equal deleted inserted replaced
903:cd9f482f063f 904:5d26b869a48e
107 107
108 { CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder" }, 108 { CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder" },
109 { CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel" }, 109 { CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel" },
110 { CTYPE_INT, &xs_cfg.sid2NFilterPresets, "sid2NFilterPresets" }, 110 { CTYPE_INT, &xs_cfg.sid2NFilterPresets, "sid2NFilterPresets" },
111 111
112 { CTYPE_INT, &xs_cfg.residSampling, "residSampling" },
113
112 { CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable" }, 114 { CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable" },
113 { CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown" }, 115 { CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown" },
114 { CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime" }, 116 { CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime" },
115 { CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable" }, 117 { CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable" },
116 { CTYPE_INT, &xs_cfg.playMinTime, "playMinTime" }, 118 { CTYPE_INT, &xs_cfg.playMinTime, "playMinTime" },
164 166
165 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid_fp", &xs_cfg.sid2Builder, XS_BLD_RESID_FP }, 167 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid_fp", &xs_cfg.sid2Builder, XS_BLD_RESID_FP },
166 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID }, 168 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID },
167 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID }, 169 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID },
168 170
169 { WTYPE_TEXT, CTYPE_STR, "cfg_rom_path", &xs_cfg.romPath, 0 }, 171 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_resid_interpolate", &xs_cfg.residSampling, XS_RESID_INTERPOLATE },
172 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_resid_resample_fir", &xs_cfg.residSampling, XS_RESID_RESAMPLE_FIR },
173
174 { WTYPE_TEXT, CTYPE_STR, "cfg_emu_rom_path", &xs_cfg.romPath, 0 },
170 175
171 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 }, 176 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 },
172 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1Filter.fs, 0 }, 177 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1Filter.fs, 0 },
173 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fm", &xs_cfg.sid1Filter.fm, 0 }, 178 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fm", &xs_cfg.sid1Filter.fm, 0 },
174 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1Filter.ft, 0 }, 179 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1Filter.ft, 0 },
182 { WTYPE_TEXT, CTYPE_STR, "cfg_sld_dbpath", &xs_cfg.songlenDBPath, 0 }, 187 { WTYPE_TEXT, CTYPE_STR, "cfg_sld_dbpath", &xs_cfg.songlenDBPath, 0 },
183 188
184 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0 }, 189 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0 },
185 { WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0 }, 190 { WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0 },
186 { WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0 }, 191 { WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0 },
192
187 193
188 #ifndef AUDACIOUS_PLUGIN 194 #ifndef AUDACIOUS_PLUGIN
189 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE }, 195 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE },
190 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK }, 196 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK },
191 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP }, 197 { WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP },
1149 } 1155 }
1150 1156
1151 xs_rom_selector = create_xs_rom_fs(); 1157 xs_rom_selector = create_xs_rom_fs();
1152 XS_MUTEX_LOCK(xs_cfg); 1158 XS_MUTEX_LOCK(xs_cfg);
1153 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector), 1159 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector),
1154 gtk_entry_get_text(GTK_ENTRY(LUW("cfg_rom_path")))); 1160 gtk_entry_get_text(GTK_ENTRY(LUW("cfg_emu_rom_path"))));
1155 XS_MUTEX_UNLOCK(xs_cfg); 1161 XS_MUTEX_UNLOCK(xs_cfg);
1156 gtk_widget_show(xs_rom_selector); 1162 gtk_widget_show(xs_rom_selector);
1157 } 1163 }
1158 1164
1159 1165
1170 result, path); 1176 result, path);
1171 } 1177 }
1172 else 1178 else
1173 path = result; 1179 path = result;
1174 1180
1175 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_rom_path")), path); 1181 gtk_entry_set_text(GTK_ENTRY(LUW("cfg_emu_rom_path")), path);
1176 1182
1177 /* Close file selector window */ 1183 /* Close file selector window */
1178 gtk_widget_destroy(xs_rom_selector); 1184 gtk_widget_destroy(xs_rom_selector);
1179 xs_rom_selector = NULL; 1185 xs_rom_selector = NULL;
1180 } 1186 }
1451 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid_fp"), FALSE); 1457 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid_fp"), FALSE);
1452 #endif 1458 #endif
1453 1459
1454 #ifdef HAVE_RESID_BUILDER 1460 #ifdef HAVE_RESID_BUILDER
1455 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isEither); 1461 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isEither);
1462 gtk_widget_set_sensitive(LUW("cfg_resid_frame"), isFPActive);
1456 #else 1463 #else
1457 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE); 1464 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE);
1465 gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
1458 #endif 1466 #endif
1459 1467
1460 #ifdef HAVE_HARDSID_BUILDER 1468 #ifdef HAVE_HARDSID_BUILDER
1461 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isEither); 1469 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isEither);
1462 #else 1470 #else
1463 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE); 1471 gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE);
1464 #endif 1472 #endif
1473
1465 } 1474 }
1466 1475
1467 1476
1468 void xs_cfg_mintime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data) 1477 void xs_cfg_mintime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
1469 { 1478 {
1624 1633
1625 #if !defined(HAVE_SIDPLAY2) && !defined(HAVE_SIDPLAYFP) 1634 #if !defined(HAVE_SIDPLAY2) && !defined(HAVE_SIDPLAYFP)
1626 gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE); 1635 gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE);
1627 #endif 1636 #endif
1628 1637
1629 gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
1630 1638
1631 #if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN) 1639 #if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
1632 gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE); 1640 gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE);
1633 #endif 1641 #endif
1634 1642