# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1352430529 -7200
# Node ID 350f755549dd3e816752736bc271128f23c7d639
# Parent  50111e99456a8459cdba0ffbda0d9a9967c86ee6
More work on the ROM images configuration stuff.

diff -r 50111e99456a -r 350f755549dd src/xs_config.c
--- 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);
diff -r 50111e99456a -r 350f755549dd src/xs_genui.h
--- a/src/xs_genui.h	Fri Nov 09 04:39:41 2012 +0200
+++ b/src/xs_genui.h	Fri Nov 09 05:08:49 2012 +0200
@@ -203,3 +203,11 @@
 xs_rom_fs_delete                       (GtkWidget       *widget,
                                         GdkEvent        *event,
                                         gpointer         user_data);
+
+void
+xs_rom_fs_ok                           (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+xs_rom_fs_cancel                       (GtkButton       *button,
+                                        gpointer         user_data);
diff -r 50111e99456a -r 350f755549dd src/xs_interface.c
--- a/src/xs_interface.c	Fri Nov 09 04:39:41 2012 +0200
+++ b/src/xs_interface.c	Fri Nov 09 05:08:49 2012 +0200
@@ -2539,6 +2539,12 @@
   gtk_signal_connect (GTK_OBJECT (xs_rom_fs), "delete_event",
                       GTK_SIGNAL_FUNC (xs_rom_fs_delete),
                       NULL);
+  gtk_signal_connect (GTK_OBJECT (ok_button65), "clicked",
+                      GTK_SIGNAL_FUNC (xs_rom_fs_ok),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (cancel_button65), "clicked",
+                      GTK_SIGNAL_FUNC (xs_rom_fs_cancel),
+                      NULL);
 
   return xs_rom_fs;
 }
diff -r 50111e99456a -r 350f755549dd xmms-sid.glade
--- a/xmms-sid.glade	Fri Nov 09 04:39:41 2012 +0200
+++ b/xmms-sid.glade	Fri Nov 09 05:08:49 2012 +0200
@@ -3572,6 +3572,11 @@
     <name>ok_button65</name>
     <can_default>True</can_default>
     <can_focus>True</can_focus>
+    <signal>
+      <name>clicked</name>
+      <handler>xs_rom_fs_ok</handler>
+      <last_modification_time>Fri, 09 Nov 2012 03:05:42 GMT</last_modification_time>
+    </signal>
     <label>OK</label>
     <relief>GTK_RELIEF_NORMAL</relief>
   </widget>
@@ -3582,6 +3587,11 @@
     <name>cancel_button65</name>
     <can_default>True</can_default>
     <can_focus>True</can_focus>
+    <signal>
+      <name>clicked</name>
+      <handler>xs_rom_fs_cancel</handler>
+      <last_modification_time>Fri, 09 Nov 2012 03:06:07 GMT</last_modification_time>
+    </signal>
     <label>Cancel</label>
     <relief>GTK_RELIEF_NORMAL</relief>
   </widget>