Mercurial > hg > xmms-sid

comparison src/xs_config.c @ 874:350f755549dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on the ROM images configuration stuff.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 09 Nov 2012 05:08:49 +0200
parents d183ac29b879
children 5d4677af3c8e
comparison
equal deleted inserted replaced
873:50111e99456a 874:350f755549dd
164 164
165 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid_fp", &xs_cfg.sid2Builder, XS_BLD_RESID_FP }, 165 { 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 }, 166 { 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 }, 167 { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID },
168 168
169 { WTYPE_TEXT, CTYPE_STR, "cfg_rom_path", &xs_cfg.hvscPath, 0 }, 169 { WTYPE_TEXT, CTYPE_STR, "cfg_rom_path", &xs_cfg.romPath, 0 },
170 170
171 { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 }, 171 { 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 }, 172 { 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 }, 173 { 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 }, 174 { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1Filter.ft, 0 },
264 xs_pstrcpy(&xs_cfg.songlenDBPath, "~/C64Music/Songlengths.txt"); 264 xs_pstrcpy(&xs_cfg.songlenDBPath, "~/C64Music/Songlengths.txt");
265 265
266 xs_cfg.stilDBEnable = FALSE; 266 xs_cfg.stilDBEnable = FALSE;
267 xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt"); 267 xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt");
268 xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music"); 268 xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music");
269
270 xs_pstrcpy(&xs_cfg.romPath, "/usr/lib/vice/C64");
269 271
270 #if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN) 272 #if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
271 xs_cfg.subsongControl = XS_SSC_PATCH; 273 xs_cfg.subsongControl = XS_SSC_PATCH;
272 #else 274 #else
273 xs_cfg.subsongControl = XS_SSC_POPUP; 275 xs_cfg.subsongControl = XS_SSC_POPUP;
753 (gfloat *) xs_cfgtable[i].itemData); 755 (gfloat *) xs_cfgtable[i].itemData);
754 break; 756 break;
755 757
756 case CTYPE_STR: 758 case CTYPE_STR:
757 if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName, 759 if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName,
758 (gchar **) &tmpStr)) { 760 (gchar **) &tmpStr))
761 {
759 xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr); 762 xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr);
760 g_free(tmpStr); 763 g_free(tmpStr);
761 } 764 }
762 break; 765 break;
763 } 766 }
1004 void xs_cfg_stil_browse(GtkButton * button, gpointer user_data) 1007 void xs_cfg_stil_browse(GtkButton * button, gpointer user_data)
1005 { 1008 {
1006 (void) button; 1009 (void) button;
1007 (void) user_data; 1010 (void) user_data;
1008 1011
1009 if (xs_stil_fileselector != NULL) { 1012 if (xs_stil_fileselector != NULL)
1013 {
1010 XS_WINDOW_PRESENT(xs_stil_fileselector); 1014 XS_WINDOW_PRESENT(xs_stil_fileselector);
1011 return; 1015 return;
1012 } 1016 }
1013 1017
1014 xs_stil_fileselector = create_xs_stil_fs(); 1018 xs_stil_fileselector = create_xs_stil_fs();
1089 { 1093 {
1090 XS_WINDOW_PRESENT(xs_rom_selector); 1094 XS_WINDOW_PRESENT(xs_rom_selector);
1091 return; 1095 return;
1092 } 1096 }
1093 1097
1094 xs_hvsc_selector = create_xs_rom_fs(); 1098 xs_rom_selector = create_xs_rom_fs();
1095 XS_MUTEX_LOCK(xs_cfg); 1099 XS_MUTEX_LOCK(xs_cfg);
1096 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector), xs_cfg.romPath); 1100 gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector), xs_cfg.romPath);
1097 XS_MUTEX_UNLOCK(xs_cfg); 1101 XS_MUTEX_UNLOCK(xs_cfg);
1098 gtk_widget_show(xs_rom_selector); 1102 gtk_widget_show(xs_rom_selector);
1099 } 1103 }