# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1056072965 0
# Node ID 84214a409d19b9bd03c3c62f3dc316d7519a1f65
# Parent  90cd38b28a7249ce60b7458055451ce236c63269
Minor fixes


diff -r 90cd38b28a72 -r 84214a409d19 src/xmms-sid.cc
--- a/src/xmms-sid.cc	Fri Jun 20 01:12:03 2003 +0000
+++ b/src/xmms-sid.cc	Fri Jun 20 01:36:05 2003 +0000
@@ -417,7 +417,7 @@
 
 
  /* Configure rest of the emulation */
- xs_emuConf.precision    = audio.precision; 
+ xs_emuConf.precision    = xs_cfg.fmtBitsPerSample;
  xs_emuConf.frequency    = xs_cfg.fmtFrequency; 
  xs_emuConf.clockForced  = xs_cfg.forceSpeed;
  xs_emuConf.optimisation = xs_cfg.optimiseLevel;
@@ -614,10 +614,6 @@
 		return g_strdup(finfo->infoString[0]);
 		}
 
-	/* Check the format-string for NULL */
-	if (xs_cfg.titleFormat == NULL)
-		return g_strdup_printf("%s - %s", finfo->nameString, finfo->authorString);
-
 	/* Construct the final result info */
 	for (j = i = 0; i < strlen(xs_cfg.titleFormat); i++)
 		{
diff -r 90cd38b28a72 -r 84214a409d19 src/xs_config.c
--- a/src/xs_config.c	Fri Jun 20 01:12:03 2003 +0000
+++ b/src/xs_config.c	Fri Jun 20 01:36:05 2003 +0000
@@ -129,8 +129,12 @@
 
  xs_cfg.detectMagic		= FALSE;
 
+#ifdef HAVE_XMMSEXTRA
  xs_cfg.titleOverride		= FALSE;
- xs_strcalloc(&xs_cfg.titleFormat, "%1 - %2");
+#else
+ xs_cfg.titleOverride		= TRUE;
+#endif
+ xs_strcalloc(&xs_cfg.titleFormat, "%1 - %2 (%3)");
 
 
  /* Try to open the XMMS configuration file */
@@ -295,6 +299,9 @@
 
 
  /* Memorymode settings */
+ if (GTK_TOGGLE_BUTTON(LUW("cfg_emu_mem_real"))->active)
+	xs_cfg.memoryMode = XS_MPU_REAL;
+	else
  if (GTK_TOGGLE_BUTTON(LUW("cfg_emu_mem_banksw"))->active)
 	xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
 	else
@@ -464,8 +471,18 @@
 #else
  gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE);
  gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2_opt"), FALSE);
+
+ gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), FALSE);
+
+ gtk_widget_set_sensitive(LUW("cfg_oversample_grp"), FALSE);
+ gtk_widget_set_sensitive(LUW("cfg_oversample"), FALSE);
+ gtk_widget_set_sensitive(LUW("cfg_oversample_factor"), FALSE);
 #endif
 
+#ifndef HAVE_XMMSEXTRA
+ gtk_widget_set_sensitive(LUW("cfg_ftitle_override"), FALSE);
+ xs_cfg.titleOverride = TRUE;
+#endif
  	
  /* Sound resolution settings */
  switch (xs_cfg.fmtBitsPerSample) {
@@ -495,6 +512,10 @@
 
  /* Memorymode settings */
  switch (xs_cfg.memoryMode) {
+	case XS_MPU_REAL:
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW("cfg_emu_mem_real")), TRUE);
+		break;
+
 	case XS_MPU_BANK_SWITCHING:
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW("cfg_emu_mem_banksw")), TRUE);
 		break;