[Graveman-cvs] Changes to graveman/current/src/config.c

[sylvain cresto]

Index: graveman/current/src/config.c
diff -u graveman/current/src/config.c:1.26 graveman/current/src/config.c:1.27
--- graveman/current/src/config.c:1.26  Tue Mar 22 00:27:13 2005
+++ graveman/current/src/config.c       Thu Mar 31 22:53:12 2005
@@ -61,7 +61,7 @@
   { CONF_STRING, "saveconfig", "1", CONF_SAVEALWAYS },
 
   /* onglet audio */
-  { CONF_STRING, "dstaudiocombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "dstaudiocombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
   { CONF_STRING, "dstaudiospeed", "", CONF_SAVEONEXIT + CONF_COMBO },
   { CONF_STRING, "audiodao", "1", CONF_SAVEONEXIT + CONF_CHECK },
   { CONF_STRING, "audionotfix", "", CONF_SAVEONEXIT + CONF_CHECK },
@@ -69,7 +69,7 @@
   { CONF_STRING, "nbrcdaudio", "1", CONF_SAVEONEXIT + CONF_SPIN },
   
   /* onglet data */
-  { CONF_STRING, "dstdatacombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "dstdatacombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
   { CONF_STRING, "dstdataspeed", "", CONF_SAVEONEXIT + CONF_COMBO },
   { CONF_STRING, "nbrcddata", "1", CONF_SAVEONEXIT + CONF_SPIN },
   { CONF_STRING, "dataformat", "", CONF_SAVEONEXIT + CONF_COMBO },
@@ -82,7 +82,7 @@
   { CONF_STRING, "datasimul", "", CONF_SAVEONEXIT + CONF_CHECK },
 
   /* onglet dvd data */
-  { CONF_STRING, "dstdvddatacombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "dstdvddatacombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
   { CONF_STRING, "dstdvddataspeed", "", CONF_SAVEONEXIT + CONF_COMBO },
   { CONF_STRING, "nbrdvddata", "1", CONF_SAVEONEXIT + CONF_SPIN },
   { CONF_STRING, "dvddatanotfix", "", CONF_SAVEONEXIT + CONF_CHECK },
@@ -90,20 +90,20 @@
 
 
  /* onglet copier */
-  { CONF_STRING, "srccopycombo", "", CONF_SAVEONEXIT + CONF_COMBO },
-  { CONF_STRING, "dstcopycombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "srccopycombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
+  { CONF_STRING, "dstcopycombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
   { CONF_STRING, "dstcopyspeed", "", CONF_SAVEONEXIT + CONF_COMBO },
   { CONF_STRING, "nbrcdcopy", "1", CONF_SAVEONEXIT + CONF_SPIN },
   { CONF_STRING, "copysimul", "", CONF_SAVEONEXIT + CONF_CHECK },
 
   /* onglet autres */
-  { CONF_STRING, "dstothercombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "dstothercombo", "", CONF_SAVEONEXIT + CONF_DEVICE },
   
 #if 0
   { CONF_STRING, "extended", FALSE, "1" },
 #endif
   { CONF_STRING, "version", "1", CONF_SAVEALWAYS },
-  { CONF_STRING, "scan_drives", "1", CONF_SAVEALWAYS + CONF_PERSIST },
+  { CONF_STRING, "scan_drives", "0", CONF_SAVEALWAYS + CONF_PERSIST },
   { CONF_IGNORE, NULL, NULL, 0 },
 };
 
@@ -399,6 +399,9 @@
         
     if (Lcurentry->level & CONF_COMBO) {
       conf_store_value(Lcurentry->entry, get_combo_value(Lwidget));
+    } else if (Lcurentry->level & CONF_DEVICE) {
+      Tdriveinfo *Ldevice = get_combo_value(Lwidget);
+      conf_store_value(Lcurentry->entry, DRIVE_DEV(Ldevice));
     } else if (Lcurentry->level & CONF_SPIN) {
       conf_store_int(Lcurentry->entry, 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(Lwidget)));
     } else if (Lcurentry->level & CONF_CHECK) {