--- a/src/xs_sidplay2.cc	Sun Dec 19 16:57:01 2004 +0000
+++ b/src/xs_sidplay2.cc	Tue Dec 21 09:25:03 2004 +0000
@@ -23,14 +23,12 @@
 
 #ifdef HAVE_SIDPLAY2
 
-extern "C" {
 #include "xs_sidplay2.h"
 #include <stdio.h>
-#include <xmms/titlestring.h>
 #include "xs_config.h"
 #include "xs_support.h"
 #include "xs_length.h"
-}
+#include "xs_title.h"
 
 #include <sidplay/sidplay2.h>
 #ifdef HAVE_RESID_BUILDER
@@ -79,17 +77,17 @@
  */
 gboolean xs_sidplay2_init(t_xs_status *myStatus)
 {
- t_xs_sidplay2 *myPlayer;
+ t_xs_sidplay2 *myEngine;
  assert(myStatus);
 
  /* Allocate internal structures */
- myPlayer = (t_xs_sidplay2 *) g_malloc0(sizeof(t_xs_sidplay2));
- if (!myPlayer) return FALSE;
+ myEngine = (t_xs_sidplay2 *) g_malloc0(sizeof(t_xs_sidplay2));
+ if (!myEngine) return FALSE;
 
 
  /* Initialize the engine */
- myPlayer->currEng = new sidplay2;
- if (!myPlayer->currEng)
+ myEngine->currEng = new sidplay2;
+ if (!myEngine->currEng)
 	{
 	XSERR("Could not initialize libSIDPlay2 emulation engine\n");
 	return FALSE;
@@ -103,9 +101,9 @@
 	ReSIDBuilder *tmpb = new ReSIDBuilder("SIDPlay2 suxx and is made by a fag - ReSID builder");
 
 	/* Create the builder -- WHAT IS THIS MEANT FOR??? */
-	tmpb->create(myPlayer->currEng->info().maxsids);
+	tmpb->create(myEngine->currEng->info().maxsids);
 
-	myPlayer->currBuilder = (sidbuilder *) tmpb;
+	myEngine->currBuilder = (sidbuilder *) tmpb;
 	}
 #endif
 #ifdef HAVE_HARDSID_BUILDER
@@ -114,25 +112,25 @@
 	}
 #endif
 
- if (!myPlayer->currBuilder)
+ if (!myEngine->currBuilder)
 	{
 	XSERR("Could not initialize SIDBuilder object.\n");
 	return FALSE;
 	}
 
- XSDEBUG("%s\n", myPlayer->currBuilder->credits());
+ XSDEBUG("%s\n", myEngine->currBuilder->credits());
 
 
  /* Create the sidtune */
- myPlayer->currTune = new SidTune(0);
- if (!myPlayer->currTune)
+ myEngine->currTune = new SidTune(0);
+ if (!myEngine->currTune)
 	{
 	XSERR("Could not initialize SIDTune object.\n");
 	return FALSE;
 	}
  
  /* OK */
- myStatus->player = myPlayer;
+ myStatus->sidEngine = myEngine;
  return TRUE;
 }
 
@@ -142,50 +140,50 @@
  */
 void xs_sidplay2_close(t_xs_status *myStatus)
 {
- t_xs_sidplay2 *myPlayer;
+ t_xs_sidplay2 *myEngine;
  assert(myStatus);
 
  /* Free internals */
- myPlayer = (t_xs_sidplay2 *) myStatus->player;
+ myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
 
- if (myPlayer->currBuilder)
+ if (myEngine->currBuilder)
 	{
-	delete myPlayer->currBuilder;
-	myPlayer->currBuilder = NULL;
+	delete myEngine->currBuilder;
+	myEngine->currBuilder = NULL;
 	}
 
- if (myPlayer->currEng)
+ if (myEngine->currEng)
 	{
-	delete myPlayer->currEng;
-	myPlayer->currEng = NULL;
+	delete myEngine->currEng;
+	myEngine->currEng = NULL;
 	}
 
- if (myPlayer->currTune)
+ if (myEngine->currTune)
 	{
-	delete myPlayer->currTune;
-	myPlayer->currTune = NULL;
+	delete myEngine->currTune;
+	myEngine->currTune = NULL;
 	}
 
  xs_sidplay2_deletesid(myStatus);
 
- g_free(myPlayer);
- myStatus->player = NULL;
+ g_free(myEngine);
+ myStatus->sidEngine = NULL;
 }
 
 
 gboolean xs_sidplay2_initsong(t_xs_status *myStatus)
 {
- t_xs_sidplay2 *myPlayer = (t_xs_sidplay2 *) myStatus->player;
+ t_xs_sidplay2 *myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
 
- if (!myPlayer) return FALSE;
+ if (!myEngine) return FALSE;
 
- if (!myPlayer->currTune->selectSong(myStatus->currSong))
+ if (!myEngine->currTune->selectSong(myStatus->currSong))
 	{
 	XSERR("ENGINE selectSong() failed\n");
 	return FALSE;
 	}
 
- if (myPlayer->currEng->load(myPlayer->currTune) < 0)
+ if (myEngine->currEng->load(myEngine->currTune) < 0)
 	{
 	XSERR("ENGINE load() failed\n");
 	return FALSE;
@@ -197,38 +195,38 @@
 
 guint xs_sidplay2_fillbuffer(t_xs_status *myStatus, gchar *audioBuffer, guint audioBufSize)
 {
- t_xs_sidplay2 *myPlayer = (t_xs_sidplay2 *) myStatus->player;
+ t_xs_sidplay2 *myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
 
- return myPlayer->currEng->play(audioBuffer, audioBufSize);
+ return myEngine->currEng->play(audioBuffer, audioBufSize);
 }
 
 
 gboolean xs_sidplay2_loadsid(t_xs_status *myStatus, gchar *pcFilename)
 {
- t_xs_sidplay2 *myPlayer = (t_xs_sidplay2 *) myStatus->player;
+ t_xs_sidplay2 *myEngine = (t_xs_sidplay2 *) myStatus->sidEngine;
  assert(myStatus);
 
  /* Try to get the tune */
  if (!pcFilename) return FALSE;
- if (!myPlayer->currTune->load(pcFilename)) return FALSE;
+ if (!myEngine->currTune->load(pcFilename)) return FALSE;
 
  /* Get current configuration */
- myPlayer->currConfig = myPlayer->currEng->config();
+ myEngine->currConfig = myEngine->currEng->config();
 
  /* Configure channels and stuff */
  switch (myStatus->audioChannels) {
 
 	case XS_CHN_AUTOPAN:
-		myPlayer->currConfig.playback = sid2_stereo;
+		myEngine->currConfig.playback = sid2_stereo;
 		break;
 
 	case XS_CHN_STEREO:
-		myPlayer->currConfig.playback = sid2_stereo;
+		myEngine->currConfig.playback = sid2_stereo;
 		break;
 
 	case XS_CHN_MONO:
 	default:
-		myPlayer->currConfig.playback = sid2_mono;
+		myEngine->currConfig.playback = sid2_mono;
 		break;
  }
 
@@ -236,20 +234,20 @@
  /* Memory mode settings */
  switch (xs_cfg.memoryMode) {
 	case XS_MPU_BANK_SWITCHING:
-		myPlayer->currConfig.environment = sid2_envBS;
+		myEngine->currConfig.environment = sid2_envBS;
 		break;
 
 	case XS_MPU_TRANSPARENT_ROM:
-		myPlayer->currConfig.environment = sid2_envTP;
+		myEngine->currConfig.environment = sid2_envTP;
 		break;
 
 	case XS_MPU_PLAYSID_ENVIRONMENT:
-		myPlayer->currConfig.environment = sid2_envPS;
+		myEngine->currConfig.environment = sid2_envPS;
 		break;
 
 	case XS_MPU_REAL:
 	default:
-		myPlayer->currConfig.environment = sid2_envR;
+		myEngine->currConfig.environment = sid2_envR;
 		break;
  }
 
@@ -257,64 +255,64 @@
  /* Clockspeed settings */
  switch (xs_cfg.clockSpeed) {
 	case XS_CLOCK_NTSC:
-		myPlayer->currConfig.clockSpeed = myPlayer->currConfig.clockDefault = SID2_CLOCK_NTSC;
+		myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault = SID2_CLOCK_NTSC;
 		break;
 
 	case XS_CLOCK_PAL:
 	default:
-		myPlayer->currConfig.clockSpeed = myPlayer->currConfig.clockDefault = SID2_CLOCK_PAL;
+		myEngine->currConfig.clockSpeed = myEngine->currConfig.clockDefault = SID2_CLOCK_PAL;
 		break;
  }
 
 
  /* Configure rest of the emulation */
- myPlayer->currConfig.sidEmulation	= myPlayer->currBuilder;
- myPlayer->currConfig.clockForced	= xs_cfg.forceSpeed;
- myPlayer->currConfig.optimisation	= (xs_cfg.sid2OptLevel) ? 1 : 0;
- myPlayer->currConfig.sidDefault	= myPlayer->currConfig.sidModel = (xs_cfg.mos8580) ? SID2_MOS8580 : SID2_MOS6581;
- myPlayer->currConfig.sidSamples	= TRUE;	// FIXME FIX ME, make configurable!
- myPlayer->currConfig.precision		= myStatus->audioBitsPerSample;
- myPlayer->currConfig.frequency		= myStatus->audioFrequency; 
+ myEngine->currConfig.sidEmulation	= myEngine->currBuilder;
+ myEngine->currConfig.clockForced	= xs_cfg.forceSpeed;
+ myEngine->currConfig.optimisation	= (xs_cfg.sid2OptLevel) ? 1 : 0;
+ myEngine->currConfig.sidDefault	= myEngine->currConfig.sidModel = (xs_cfg.mos8580) ? SID2_MOS8580 : SID2_MOS6581;
+ myEngine->currConfig.sidSamples	= TRUE;	// FIXME FIX ME, make configurable!
+ myEngine->currConfig.precision		= myStatus->audioBitsPerSample;
+ myEngine->currConfig.frequency		= myStatus->audioFrequency; 
 
  switch (myStatus->audioBitsPerSample) {
  case XS_RES_8BIT:
 	myStatus->audioFormat 			= FMT_U8;
-	myPlayer->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
+	myEngine->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
 	break;
 
  case XS_RES_16BIT:
 	switch (myStatus->audioFormat) {
 	case FMT_U16_LE:
-		myPlayer->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
 		break;
 
 	case FMT_U16_BE:
-		myPlayer->currConfig.sampleFormat	= SID2_BIG_UNSIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_BIG_UNSIGNED;
 		break;
 
 	case FMT_U16_NE:
 		myStatus->audioFormat			= FMT_U16_NE;
 #ifdef WORDS_BIGENDIAN
-		myPlayer->currConfig.sampleFormat	= SID2_BIG_UNSIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_BIG_UNSIGNED;
 #else
-		myPlayer->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_LITTLE_UNSIGNED;
 #endif
 		break;
 
 	case FMT_S16_LE:
-		myPlayer->currConfig.sampleFormat	= SID2_LITTLE_SIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_LITTLE_SIGNED;
 		break;
 
 	case FMT_S16_BE:
-		myPlayer->currConfig.sampleFormat	= SID2_BIG_SIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_BIG_SIGNED;
 		break;
 
 	default:
 		myStatus->audioFormat			= FMT_S16_NE;
 #ifdef WORDS_BIGENDIAN
-		myPlayer->currConfig.sampleFormat	= SID2_BIG_SIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_BIG_SIGNED;
 #else
-		myPlayer->currConfig.sampleFormat	= SID2_LITTLE_SIGNED;
+		myEngine->currConfig.sampleFormat	= SID2_LITTLE_SIGNED;
 #endif
 		break;
 
@@ -324,7 +322,7 @@
 
 
  /* Now set the emulator configuration */
- if (myPlayer->currEng->config(myPlayer->currConfig) < 0)
+ if (myEngine->currEng->config(myEngine->currConfig) < 0)
 	{
 	XSERR("Emulator engine configuration failed!\n");
 	return FALSE;
@@ -348,8 +346,7 @@
 /*
  * Return song information
  */
-#define TFUNCTION1	xs_sidplay2_filetitle
-#define TFUNCTION2	xs_sidplay2_getsidinfo
+#define TFUNCTION	xs_sidplay2_getsidinfo
 #define TTUNEINFO	SidTuneInfo
 #define TTUNE		SidTune
 #include "xs_sidplay.h"