--- a/src/xs_sidplay1.cc	Sun Dec 19 16:57:01 2004 +0000
+++ b/src/xs_sidplay1.cc	Tue Dec 21 09:25:03 2004 +0000
@@ -23,13 +23,11 @@
 
 #ifdef HAVE_SIDPLAY1
 
-extern "C" {
 #include "xs_sidplay1.h"
 #include <stdio.h>
 #include "xs_config.h"
 #include "xs_length.h"
 #include "xs_title.h"
-}
 
 #include <sidplay/player.h>
 #include <sidplay/myendian.h>
@@ -73,32 +71,32 @@
  */
 gboolean xs_sidplay1_init(t_xs_status *myStatus)
 {
- t_xs_sidplay1 *myPlayer;
+ t_xs_sidplay1 *myEngine;
  assert(myStatus);
 
  /* Allocate internal structures */
- myPlayer = (t_xs_sidplay1 *) g_malloc0(sizeof(t_xs_sidplay1));
- if (!myPlayer) return FALSE;
+ myEngine = (t_xs_sidplay1 *) g_malloc0(sizeof(t_xs_sidplay1));
+ if (!myEngine) return FALSE;
 
  /* Initialize engine */
- myPlayer->currEng = new emuEngine();
- if (!myPlayer->currEng)
+ myEngine->currEng = new emuEngine();
+ if (!myEngine->currEng)
 	{
 	XSERR("Could not initialize libSIDPlay1 emulation engine\n");
-	g_free(myPlayer);
+	g_free(myEngine);
 	return FALSE;
 	}
 
  /* Verify endianess */
- if (!myPlayer->currEng->verifyEndianess())
+ if (!myEngine->currEng->verifyEndianess())
 	{
 	XSERR("Endianess verification failed\n");
-	delete myPlayer->currEng;
-	g_free(myPlayer);
+	delete myEngine->currEng;
+	g_free(myEngine);
 	return FALSE;
 	}
 
- myStatus->player = myPlayer;
+ myStatus->sidEngine = myEngine;
  return TRUE;
 }
 
@@ -108,56 +106,56 @@
  */
 void xs_sidplay1_close(t_xs_status *myStatus)
 {
- t_xs_sidplay1 *myPlayer;
+ t_xs_sidplay1 *myEngine;
  assert(myStatus);
 
  /* Free internals */
- myPlayer = (t_xs_sidplay1 *) myStatus->player;
- if (myPlayer->currEng)
+ myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+ if (myEngine->currEng)
 	{
-	delete myPlayer->currEng;
-	myPlayer->currEng = NULL;	
+	delete myEngine->currEng;
+	myEngine->currEng = NULL;	
 	}
 
- g_free(myPlayer);
- myStatus->player = NULL;
+ g_free(myEngine);
+ myStatus->sidEngine = NULL;
 }
 
 
 gboolean xs_sidplay1_initsong(t_xs_status *myStatus)
 {
- t_xs_sidplay1 *myPlayer = (t_xs_sidplay1 *) myStatus->player;
+ t_xs_sidplay1 *myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
 
- if (!myPlayer) return FALSE;
+ if (!myEngine) return FALSE;
 
- if (!myPlayer->currTune)
+ if (!myEngine->currTune)
 	{
 	XSERR("Tune was NULL\n");
 	return FALSE;
 	}
 
- if (!myPlayer->currTune->getStatus())
+ if (!myEngine->currTune->getStatus())
 	{
 	XSERR("Tune status check failed\n");
 	return FALSE;
 	}
 
  return sidEmuInitializeSong(
-	*myPlayer->currEng,
-	*myPlayer->currTune,
+	*myEngine->currEng,
+	*myEngine->currTune,
 	myStatus->currSong);
 }
 
 
 guint xs_sidplay1_fillbuffer(t_xs_status *myStatus, gchar *audioBuffer, guint audioBufSize)
 {
- t_xs_sidplay1 *myPlayer = (t_xs_sidplay1 *) myStatus->player;
+ t_xs_sidplay1 *myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
 
- if (!myPlayer) return FALSE;
+ if (!myEngine) return FALSE;
 
  sidEmuFillBuffer(
-	*myPlayer->currEng,
-	*myPlayer->currTune,
+	*myEngine->currEng,
+	*myEngine->currTune,
 	audioBuffer,
 	audioBufSize);
 
@@ -167,7 +165,7 @@
 
 gboolean xs_sidplay1_loadsid(t_xs_status *myStatus, gchar *pcFilename)
 {
- t_xs_sidplay1 *myPlayer = (t_xs_sidplay1 *) myStatus->player;
+ t_xs_sidplay1 *myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
  sidTune *newTune;
  assert(myStatus);
 
@@ -177,28 +175,28 @@
  if (!newTune) return FALSE;
 
  /* Get current configuration */
- myPlayer->currEng->getConfig(myPlayer->currConfig);
+ myEngine->currEng->getConfig(myEngine->currConfig);
 
  /* Configure channels and stuff */
  switch (myStatus->audioChannels) {
 
 	case XS_CHN_AUTOPAN:
-		myPlayer->currConfig.channels = SIDEMU_STEREO;
-		myPlayer->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
-		myPlayer->currConfig.volumeControl = SIDEMU_FULLPANNING;
+		myEngine->currConfig.channels = SIDEMU_STEREO;
+		myEngine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
+		myEngine->currConfig.volumeControl = SIDEMU_FULLPANNING;
 		break;
 
 	case XS_CHN_STEREO:
-		myPlayer->currConfig.channels = SIDEMU_STEREO;
-		myPlayer->currConfig.autoPanning = SIDEMU_NONE;
-		myPlayer->currConfig.volumeControl = SIDEMU_NONE;
+		myEngine->currConfig.channels = SIDEMU_STEREO;
+		myEngine->currConfig.autoPanning = SIDEMU_NONE;
+		myEngine->currConfig.volumeControl = SIDEMU_NONE;
 		break;
 
 	case XS_CHN_MONO:
 	default:
-		myPlayer->currConfig.channels = SIDEMU_MONO;
-		myPlayer->currConfig.autoPanning = SIDEMU_NONE;
-		myPlayer->currConfig.volumeControl = SIDEMU_NONE;
+		myEngine->currConfig.channels = SIDEMU_MONO;
+		myEngine->currConfig.autoPanning = SIDEMU_NONE;
+		myEngine->currConfig.volumeControl = SIDEMU_NONE;
 		break;
  }
 
@@ -206,19 +204,19 @@
  /* Memory mode settings */
  switch (xs_cfg.memoryMode) {
 	case XS_MPU_BANK_SWITCHING:
-		myPlayer->currConfig.memoryMode = MPU_BANK_SWITCHING;
+		myEngine->currConfig.memoryMode = MPU_BANK_SWITCHING;
 		break;
 
 	case XS_MPU_TRANSPARENT_ROM:
-		myPlayer->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
+		myEngine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
 		break;
 
 	case XS_MPU_PLAYSID_ENVIRONMENT:
-		myPlayer->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
+		myEngine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
 		break;
 
 	default:
-		myPlayer->currConfig.memoryMode = MPU_BANK_SWITCHING;
+		myEngine->currConfig.memoryMode = MPU_BANK_SWITCHING;
 		break;
  }
 
@@ -226,37 +224,37 @@
  /* Clockspeed settings */
  switch (xs_cfg.clockSpeed) {
 	case XS_CLOCK_NTSC:
-		myPlayer->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
+		myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
 		break;
 
 	case XS_CLOCK_PAL:
 	default:
-		myPlayer->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
+		myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
 		break;
  }
 
 
  /* Configure rest of the emulation */
- myPlayer->currConfig.mos8580		= xs_cfg.mos8580;
- myPlayer->currConfig.emulateFilter	= xs_cfg.emulateFilters;
- myPlayer->currConfig.filterFs		= xs_cfg.filterFs;
- myPlayer->currConfig.filterFm		= xs_cfg.filterFm;
- myPlayer->currConfig.filterFt		= xs_cfg.filterFt;
+ myEngine->currConfig.mos8580		= xs_cfg.mos8580;
+ myEngine->currConfig.emulateFilter	= xs_cfg.emulateFilters;
+ myEngine->currConfig.filterFs		= xs_cfg.filterFs;
+ myEngine->currConfig.filterFm		= xs_cfg.filterFm;
+ myEngine->currConfig.filterFt		= xs_cfg.filterFt;
 
- myPlayer->currConfig.bitsPerSample	= myStatus->audioBitsPerSample;
- myPlayer->currConfig.frequency		= myStatus->audioFrequency;
+ myEngine->currConfig.bitsPerSample	= myStatus->audioBitsPerSample;
+ myEngine->currConfig.frequency		= myStatus->audioFrequency;
 
  switch (myStatus->audioBitsPerSample) {
  case XS_RES_8BIT:
 	switch (myStatus->audioFormat) {
 	case FMT_S8:
-		myPlayer->currConfig.sampleFormat	= SIDEMU_SIGNED_PCM;
+		myEngine->currConfig.sampleFormat	= SIDEMU_SIGNED_PCM;
 		break;
 
 	case FMT_U8:
 	default:
 		myStatus->audioFormat			= FMT_U8;
-		myPlayer->currConfig.sampleFormat	= SIDEMU_UNSIGNED_PCM;
+		myEngine->currConfig.sampleFormat	= SIDEMU_UNSIGNED_PCM;
 		break;
 	}
 	break;
@@ -267,7 +265,7 @@
 	case FMT_U16_LE:
 	case FMT_U16_BE:
 		myStatus->audioFormat			= FMT_U16_NE;
-		myPlayer->currConfig.sampleFormat       = SIDEMU_UNSIGNED_PCM;
+		myEngine->currConfig.sampleFormat       = SIDEMU_UNSIGNED_PCM;
 		break;
 
 	case FMT_S16_NE:
@@ -275,21 +273,21 @@
 	case FMT_S16_BE:
 	default:
 		myStatus->audioFormat			= FMT_S16_NE;
-		myPlayer->currConfig.sampleFormat       = SIDEMU_SIGNED_PCM;
+		myEngine->currConfig.sampleFormat       = SIDEMU_SIGNED_PCM;
 		break;
 	}
 	break;
  }
 
  /* Now set the emulator configuration */
- if (!myPlayer->currEng->setConfig(myPlayer->currConfig))
+ if (!myEngine->currEng->setConfig(myEngine->currConfig))
 	{
 	XSERR("Emulator engine configuration failed!\n");
 	return FALSE;
 	}
 
  /* Initialize status information */
- myPlayer->currTune = newTune;
+ myEngine->currTune = newTune;
 
  return TRUE;
 }
@@ -300,16 +298,16 @@
  */
 void xs_sidplay1_deletesid(t_xs_status *myStatus)
 {
- t_xs_sidplay1 *myPlayer;
+ t_xs_sidplay1 *myEngine;
  assert(myStatus);
 
- myPlayer = (t_xs_sidplay1 *) myStatus->player;
- if (!myPlayer) return;
+ myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+ if (!myEngine) return;
 
- if (myPlayer->currTune)
+ if (myEngine->currTune)
 	{
-	delete myPlayer->currTune;
-	myPlayer->currTune = NULL;
+	delete myEngine->currTune;
+	myEngine->currTune = NULL;
 	}
 }