# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1077559142 0
# Node ID a3f522cbe787591fcedad90fc1563e546ab66914
# Parent  d4f8f5632bd6289bb5ce37ff1c7297b5dfbbd2c2
Fixes in audio format selection/emuengine configuration.


diff -r d4f8f5632bd6 -r a3f522cbe787 src/xs_sidplay1.cc
--- a/src/xs_sidplay1.cc	Mon Feb 23 17:58:05 2004 +0000
+++ b/src/xs_sidplay1.cc	Mon Feb 23 17:59:02 2004 +0000
@@ -250,12 +250,14 @@
  switch (myStatus->audioBitsPerSample) {
  case XS_RES_8BIT:
 	switch (myStatus->audioFormat) {
-	case FMT_U8:
-		myPlayer->currConfig.sampleFormat	= SIDEMU_UNSIGNED_PCM;
+	case FMT_S8:
+		myPlayer->currConfig.sampleFormat	= SIDEMU_SIGNED_PCM;
 		break;
 
-	case FMT_S8:
-		myPlayer->currConfig.sampleFormat	= SIDEMU_SIGNED_PCM;
+	case FMT_U8:
+	default:
+		myStatus->audioFormat			= FMT_U8;
+		myPlayer->currConfig.sampleFormat	= SIDEMU_UNSIGNED_PCM;
 		break;
 	}
 	break;
@@ -272,6 +274,7 @@
 	case FMT_S16_NE:
 	case FMT_S16_LE:
 	case FMT_S16_BE:
+	default:
 		myStatus->audioFormat			= FMT_S16_NE;
 		myPlayer->currConfig.sampleFormat       = SIDEMU_SIGNED_PCM;
 		break;
@@ -279,6 +282,21 @@
 	break;
  }
 
+XSDEBUG(
+"mos8580=%i\n"
+"emulateFilter=%i\n"
+"filterFs=%1.4f\n"
+"filterFm=%1.4f\n"
+"filterFt=%1.4f\n"
+"bitsPerSample=%i\n"
+"frequency=%i\n"
+"audioFormat=%i\n"
+"sampleFormat=%i\n",
+xs_cfg.mos8580, xs_cfg.emulateFilters, xs_cfg.filterFs, xs_cfg.filterFm, xs_cfg.filterFt,
+myStatus->audioBitsPerSample,
+myStatus->audioFrequency,
+myStatus->audioFormat,
+myPlayer->currConfig.sampleFormat);
 
  /* Now set the emulator configuration */
  if (!myPlayer->currEng->setConfig(myPlayer->currConfig))