--- src/conf.c.orig	Wed Jun 27 19:01:29 2001
+++ src/conf.c	Thu Jul 11 15:06:19 2002
@@ -34,12 +34,12 @@
 #include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
 
-#define FN_PATTERN      "%7-%8.mp3"    /* pattern for filename: %1 = artist,
+#define FN_PATTERN      "%7-%2.mp3"    /* pattern for filename: %1 = artist,
 					  %2 = title, %3 = album, %4 = genre,
 					  %5 = year, %6 = track, %7 = track (with leading zeros)
 					  %8 = cddb-id
 				       	*/
-#define FN_PATTERN_MIX  "%3/%1-%2.mp3"
+#define FN_PATTERN_MIX  "%7-%2.mp3"
 #define DEF_CDDB_SERVER "freedb.freedb.org:8880"
 
 #ifdef CONF_CDDB_PATH
@@ -49,18 +49,18 @@
 #endif   /* CONF_CDDB_PATH */
 
 #if (defined(BSD) && BSD >= 199306)
-#define DEF_CDROM_DEV	"/dev/rcd0d"
+#define DEF_CDROM_DEV	"/dev/acd0c"
 #else
-#define DEF_CDROM_DEV   "/dev/cdrom"
+#define DEF_CDROM_DEV   "/dev/acd0c"
 #endif /* !(defined(BSD) && BSD >= 199306) */
 #define DEF_TMP_FILE    "/tmp/WSPse-MP3Creat.wav"
 #define DEF_MP3_DIR     "./"      /* default dir for mp3s */
 #define DEF_M3U_DIR     "0"       /* default dir for m3us */
 #define DEF_MP3_INFO    "id3tool -r \"%1\" -t \"%2\" -a \"%3\" -y \"%5\" -g %4 -n \"%6\" \"%7\""
-#define DEF_CD_RIP_NF   "cdparanoia -d \"%1\" %2 \"%3\""
-#define DEF_CD_RIP_OF   "cdparanoia -d \"%1\" %2 -"
-#define DEF_MP3_ENC_NF  "mp3enc \"%1\" \"%2\""
-#define DEF_MP3_ENC_OF  "mp3enc - \"%1\""
+#define DEF_CD_RIP_NF   "dagrab -o 6 -n 32 -d %1 -f %3 %2"
+#define DEF_CD_RIP_OF   "cdrip.sh %1 %2"
+#define DEF_MP3_ENC_NF  "gogo  %1 %2"
+#define DEF_MP3_ENC_OF  "gogo /tmp/mp3 \"%1\" -b 160"
 #define DEF_FRM_MULTI   214
 #define DEF_M3U_PATTERN "%1-%3.m3u"    /* pattern for m3u-playlist: %1 = artist,
 				i	  %2 = songtitle, %3 = album */
@@ -165,7 +165,7 @@
   fn_toupper          = TRUE;
   fn_mode             = 1;
   mp3_frame_mult      = DEF_FRM_MULTI;
-  def_on_fly          = FALSE;
+  def_on_fly          = TRUE;
   eased_char_hand     = FALSE;
   replace_slash_ch    = '-';
   rip_enc_ordered     = FALSE;