Mercurial > hg > xmms-sid
diff src/xs_config.c @ 874:350f755549dd
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 |
line wrap: on
line diff
--- a/src/xs_config.c Fri Nov 09 04:39:41 2012 +0200 +++ b/src/xs_config.c Fri Nov 09 05:08:49 2012 +0200 @@ -166,7 +166,7 @@ { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID }, { WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID }, -{ WTYPE_TEXT, CTYPE_STR, "cfg_rom_path", &xs_cfg.hvscPath, 0 }, +{ WTYPE_TEXT, CTYPE_STR, "cfg_rom_path", &xs_cfg.romPath, 0 }, { WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 }, { WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1Filter.fs, 0 }, @@ -267,6 +267,8 @@ xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt"); xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music"); + xs_pstrcpy(&xs_cfg.romPath, "/usr/lib/vice/C64"); + #if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN) xs_cfg.subsongControl = XS_SSC_PATCH; #else @@ -755,7 +757,8 @@ case CTYPE_STR: if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName, - (gchar **) &tmpStr)) { + (gchar **) &tmpStr)) + { xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr); g_free(tmpStr); } @@ -1006,7 +1009,8 @@ (void) button; (void) user_data; - if (xs_stil_fileselector != NULL) { + if (xs_stil_fileselector != NULL) + { XS_WINDOW_PRESENT(xs_stil_fileselector); return; } @@ -1091,7 +1095,7 @@ return; } - xs_hvsc_selector = create_xs_rom_fs(); + xs_rom_selector = create_xs_rom_fs(); XS_MUTEX_LOCK(xs_cfg); gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector), xs_cfg.romPath); XS_MUTEX_UNLOCK(xs_cfg);