Mercurial > hg > xmms-sid

diff src/xs_sidplay1.cc @ 364:421e4fc13bce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More and more of indentation fixes.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 08 Nov 2005 08:31:01 +0000
parents b1a858b8cb1a
children 3e55874170eb
line wrap: on
line diff
--- a/src/xs_sidplay1.cc	Tue Nov 08 04:09:00 2005 +0000
+++ b/src/xs_sidplay1.cc	Tue Nov 08 08:31:01 2005 +0000
@@ -34,8 +34,6 @@
 #include <sidplay/myendian.h>
 #include <sidplay/fformat.h>
 
-/* Maximum audio frequency supported by libSIDPlay v1 */
-#define SIDPLAY1_MAX_FREQ	(48000)
 
 typedef struct
 {
@@ -52,288 +50,282 @@
 
 /* Check if we can play the given file
  */
-	gboolean xs_sidplay1_isourfile(gchar * pcFilename)
-	{
-		sidTune *testTune = new sidTune(pcFilename);
+gboolean xs_sidplay1_isourfile(gchar * pcFilename)
+{
+	sidTune *testTune = new sidTune(pcFilename);
+
+	if (!testTune) return FALSE;
 
-		if (!testTune)
-			 return FALSE;
-		if (!testTune->getStatus())
-		{
-			delete testTune;
-			 return FALSE;
-		}
+	if (!testTune->getStatus()) {
+		delete testTune;
+		 return FALSE;
+	}
 
-		delete testTune;
-		return TRUE;
-	}
+	delete testTune;
+	return TRUE;
+}
 
 
 /* Initialize SIDPlay1
  */
-	gboolean xs_sidplay1_init(t_xs_status * myStatus)
-	{
-		gint tmpFreq;
-		t_xs_sidplay1 *myEngine;
-		assert(myStatus);
+gboolean xs_sidplay1_init(t_xs_status * myStatus)
+{
+	gint tmpFreq;
+	t_xs_sidplay1 *myEngine;
+	assert(myStatus);
 
-		/* Allocate internal structures */
-		myEngine = (t_xs_sidplay1 *) g_malloc0(sizeof(t_xs_sidplay1));
-		if (!myEngine)
-			return FALSE;
+	/* Allocate internal structures */
+	myEngine = (t_xs_sidplay1 *) g_malloc0(sizeof(t_xs_sidplay1));
+	if (!myEngine) return FALSE;
 
-		/* Initialize engine */
-		myEngine->currEng = new emuEngine();
-		if (!myEngine->currEng) {
-			XSERR("Could not initialize libSIDPlay1 emulation engine\n");
-			g_free(myEngine);
-			return FALSE;
-		}
+	/* Initialize engine */
+	myEngine->currEng = new emuEngine();
+	if (!myEngine->currEng) {
+		XSERR("Could not initialize libSIDPlay1 emulation engine\n");
+		g_free(myEngine);
+		return FALSE;
+	}
 
-		/* Verify endianess */
-		if (!myEngine->currEng->verifyEndianess()) {
-			XSERR("Endianess verification failed\n");
-			delete myEngine->currEng;
-			g_free(myEngine);
-			return FALSE;
-		}
+	/* Verify endianess */
+	if (!myEngine->currEng->verifyEndianess()) {
+		XSERR("Endianess verification failed\n");
+		delete myEngine->currEng;
+		g_free(myEngine);
+		return FALSE;
+	}
 
-		myStatus->sidEngine = myEngine;
+	myStatus->sidEngine = myEngine;
 
-		/* Get current configuration */
-		myEngine->currEng->getConfig(myEngine->currConfig);
+	/* Get current configuration */
+	myEngine->currEng->getConfig(myEngine->currConfig);
 
-		/* Configure channel parameters */
-		switch (myStatus->audioChannels) {
+	/* Configure channel parameters */
+	switch (myStatus->audioChannels) {
 
-		case XS_CHN_AUTOPAN:
-			myEngine->currConfig.channels = SIDEMU_STEREO;
-			myEngine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
-			myEngine->currConfig.volumeControl = SIDEMU_FULLPANNING;
-			break;
+	case XS_CHN_AUTOPAN:
+		myEngine->currConfig.channels = SIDEMU_STEREO;
+		myEngine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
+		myEngine->currConfig.volumeControl = SIDEMU_FULLPANNING;
+		break;
 
-		case XS_CHN_STEREO:
-			myEngine->currConfig.channels = SIDEMU_STEREO;
-			myEngine->currConfig.autoPanning = SIDEMU_NONE;
-			myEngine->currConfig.volumeControl = SIDEMU_NONE;
-			break;
+	case XS_CHN_STEREO:
+		myEngine->currConfig.channels = SIDEMU_STEREO;
+		myEngine->currConfig.autoPanning = SIDEMU_NONE;
+		myEngine->currConfig.volumeControl = SIDEMU_NONE;
+		break;
 
-		case XS_CHN_MONO:
-		default:
-			myEngine->currConfig.channels = SIDEMU_MONO;
-			myEngine->currConfig.autoPanning = SIDEMU_NONE;
-			myEngine->currConfig.volumeControl = SIDEMU_NONE;
-			myStatus->audioChannels = XS_CHN_MONO;
-			break;
-		}
+	case XS_CHN_MONO:
+	default:
+		myEngine->currConfig.channels = SIDEMU_MONO;
+		myEngine->currConfig.autoPanning = SIDEMU_NONE;
+		myEngine->currConfig.volumeControl = SIDEMU_NONE;
+		myStatus->audioChannels = XS_CHN_MONO;
+		break;
+	}
 
 
-		/* Memory mode settings */
-		switch (xs_cfg.memoryMode) {
-		case XS_MPU_TRANSPARENT_ROM:
-			myEngine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
-			break;
+	/* Memory mode settings */
+	switch (xs_cfg.memoryMode) {
+	case XS_MPU_TRANSPARENT_ROM:
+		myEngine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
+		break;
 
-		case XS_MPU_PLAYSID_ENVIRONMENT:
-			myEngine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
-			break;
+	case XS_MPU_PLAYSID_ENVIRONMENT:
+		myEngine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
+		break;
 
-		case XS_MPU_BANK_SWITCHING:
-		default:
-			myEngine->currConfig.memoryMode = MPU_BANK_SWITCHING;
-			xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
-			break;
-		}
+	case XS_MPU_BANK_SWITCHING:
+	default:
+		myEngine->currConfig.memoryMode = MPU_BANK_SWITCHING;
+		xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
+		break;
+	}
 
 
-		/* Clockspeed settings */
-		switch (xs_cfg.clockSpeed) {
-		case XS_CLOCK_NTSC:
-			myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
-			break;
+	/* Clockspeed settings */
+	switch (xs_cfg.clockSpeed) {
+	case XS_CLOCK_NTSC:
+		myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
+		break;
 
-		case XS_CLOCK_PAL:
-		default:
-			myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
-			xs_cfg.clockSpeed = XS_CLOCK_PAL;
-			break;
-		}
+	case XS_CLOCK_PAL:
+	default:
+		myEngine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
+		xs_cfg.clockSpeed = XS_CLOCK_PAL;
+		break;
+	}
 
 
-		/* Configure rest of the emulation */
-		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;
+	/* Configure rest of the emulation */
+	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;
 
 
-		/* Audio parameters sanity checking and setup */
-		myEngine->currConfig.bitsPerSample = myStatus->audioBitsPerSample;
-		tmpFreq = myStatus->audioFrequency;
-
-		if (myStatus->oversampleEnable) {
-			if ((tmpFreq * myStatus->oversampleFactor) > SIDPLAY1_MAX_FREQ) {
-				myStatus->oversampleEnable = FALSE;
-			} else {
-				tmpFreq = (tmpFreq * myStatus->oversampleFactor);
-			}
-		} else {
-			if (tmpFreq > SIDPLAY1_MAX_FREQ)
-				tmpFreq = SIDPLAY1_MAX_FREQ;
-		}
+	/* Audio parameters sanity checking and setup */
+	myEngine->currConfig.bitsPerSample = myStatus->audioBitsPerSample;
+	tmpFreq = myStatus->audioFrequency;
 
-		myEngine->currConfig.frequency = tmpFreq;
+	if (myStatus->oversampleEnable) {
+		if ((tmpFreq * myStatus->oversampleFactor) > SIDPLAY1_MAX_FREQ) {
+			myStatus->oversampleEnable = FALSE;
+		} else {
+			tmpFreq = (tmpFreq * myStatus->oversampleFactor);
+		}
+	} else {
+		if (tmpFreq > SIDPLAY1_MAX_FREQ)
+			tmpFreq = SIDPLAY1_MAX_FREQ;
+	}
 
-		switch (myStatus->audioBitsPerSample) {
-		case XS_RES_8BIT:
-			switch (myStatus->audioFormat) {
-			case FMT_S8:
-				myStatus->audioFormat = FMT_S8;
-				myEngine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
-				break;
+	myEngine->currConfig.frequency = tmpFreq;
 
-			case FMT_U8:
-			default:
-				myStatus->audioFormat = FMT_U8;
-				myEngine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
-				break;
-			}
+	switch (myStatus->audioBitsPerSample) {
+	case XS_RES_8BIT:
+		switch (myStatus->audioFormat) {
+		case FMT_S8:
+			myStatus->audioFormat = FMT_S8;
+			myEngine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
 			break;
 
-		case XS_RES_16BIT:
+		case FMT_U8:
 		default:
-			switch (myStatus->audioFormat) {
-			case FMT_U16_NE:
-			case FMT_U16_LE:
-			case FMT_U16_BE:
-				myStatus->audioFormat = FMT_U16_NE;
-				myEngine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
-				break;
-
-			case FMT_S16_NE:
-			case FMT_S16_LE:
-			case FMT_S16_BE:
-			default:
-				myStatus->audioFormat = FMT_S16_NE;
-				myEngine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
-				break;
-			}
+			myStatus->audioFormat = FMT_U8;
+			myEngine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
 			break;
 		}
+		break;
 
-		/* Now set the emulator configuration */
-		if (!myEngine->currEng->setConfig(myEngine->currConfig)) {
-			XSERR("Emulator engine configuration failed!\n");
-			return FALSE;
+	case XS_RES_16BIT:
+	default:
+		switch (myStatus->audioFormat) {
+		case FMT_U16_NE:
+		case FMT_U16_LE:
+		case FMT_U16_BE:
+			myStatus->audioFormat = FMT_U16_NE;
+			myEngine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
+			break;
+
+		case FMT_S16_NE:
+		case FMT_S16_LE:
+		case FMT_S16_BE:
+		default:
+			myStatus->audioFormat = FMT_S16_NE;
+			myEngine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
+			break;
 		}
+		break;
+	}
 
-		return TRUE;
+	/* Now set the emulator configuration */
+	if (!myEngine->currEng->setConfig(myEngine->currConfig)) {
+		XSERR("Emulator engine configuration failed!\n");
+		return FALSE;
 	}
 
+	return TRUE;
+}
+
 
 /* Close SIDPlay1 engine
  */
-	void xs_sidplay1_close(t_xs_status * myStatus)
-	{
-		t_xs_sidplay1 *myEngine;
-		assert(myStatus);
+void xs_sidplay1_close(t_xs_status * myStatus)
+{
+	t_xs_sidplay1 *myEngine;
+	assert(myStatus);
 
-		myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+	myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
 
-		/* Free internals */
-		if (myEngine->currEng) {
-			delete myEngine->currEng;
-			myEngine->currEng = NULL;
-		}
+	/* Free internals */
+	if (myEngine->currEng) {
+		delete myEngine->currEng;
+		myEngine->currEng = NULL;
+	}
 
-		g_free(myEngine);
-		myStatus->sidEngine = NULL;
-	}
+	g_free(myEngine);
+	myStatus->sidEngine = NULL;
+}
 
 
 /* Initialize current song and sub-tune
  */
-	gboolean xs_sidplay1_initsong(t_xs_status * myStatus)
-	{
-		t_xs_sidplay1 *myEngine;
-		assert(myStatus);
+gboolean xs_sidplay1_initsong(t_xs_status * myStatus)
+{
+	t_xs_sidplay1 *myEngine;
+	assert(myStatus);
 
-		myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
-		if (!myEngine)
-			return FALSE;
+	myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+	if (!myEngine) return FALSE;
 
-		if (!myEngine->currTune) {
-			XSERR("Tune was NULL\n");
-			return FALSE;
-		}
+	if (!myEngine->currTune) {
+		XSERR("Tune was NULL\n");
+		return FALSE;
+	}
 
-		if (!myEngine->currTune->getStatus()) {
-			XSERR("Tune status check failed\n");
-			return FALSE;
-		}
+	if (!myEngine->currTune->getStatus()) {
+		XSERR("Tune status check failed\n");
+		return FALSE;
+	}
 
-		return sidEmuInitializeSong(*myEngine->currEng, *myEngine->currTune, myStatus->currSong);
-	}
+	return sidEmuInitializeSong(*myEngine->currEng, *myEngine->currTune, myStatus->currSong);
+}
 
 
 /* Emulate and render audio data to given buffer
  */
-	guint xs_sidplay1_fillbuffer(t_xs_status * myStatus, gchar * audioBuffer, guint audioBufSize)
-	{
-		t_xs_sidplay1 *myEngine;
-		assert(myStatus);
+guint xs_sidplay1_fillbuffer(t_xs_status * myStatus, gchar * audioBuffer, guint audioBufSize)
+{
+	t_xs_sidplay1 *myEngine;
+	assert(myStatus);
 
-		myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
-		if (!myEngine)
-			return 0;
+	myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+	if (!myEngine) return 0;
 
-		sidEmuFillBuffer(*myEngine->currEng, *myEngine->currTune, audioBuffer, audioBufSize);
+	sidEmuFillBuffer(*myEngine->currEng, *myEngine->currTune, audioBuffer, audioBufSize);
 
-		return audioBufSize;
-	}
+	return audioBufSize;
+}
 
 
 /* Load a given SID-tune file
  */
-	gboolean xs_sidplay1_loadsid(t_xs_status * myStatus, gchar * pcFilename)
-	{
-		t_xs_sidplay1 *myEngine;
-		sidTune *newTune;
-		assert(myStatus);
+gboolean xs_sidplay1_loadsid(t_xs_status * myStatus, gchar * pcFilename)
+{
+	t_xs_sidplay1 *myEngine;
+	sidTune *newTune;
+	assert(myStatus);
 
-		myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+	myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
 
-		/* Try to get the tune */
-		if (!pcFilename)
-			return FALSE;
+	/* Try to get the tune */
+	if (!pcFilename) return FALSE;
 
-		newTune = new sidTune(pcFilename);
-		if (!newTune)
-			return FALSE;
+	newTune = new sidTune(pcFilename);
+	if (!newTune) return FALSE;
 
-		myEngine->currTune = newTune;
+	myEngine->currTune = newTune;
 
-		return TRUE;
-	}
+	return TRUE;
+}
 
 
 /* Delete INTERNAL information
  */
-	void xs_sidplay1_deletesid(t_xs_status * myStatus)
-	{
-		t_xs_sidplay1 *myEngine;
-		assert(myStatus);
+void xs_sidplay1_deletesid(t_xs_status * myStatus)
+{
+	t_xs_sidplay1 *myEngine;
+	assert(myStatus);
 
-		myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
-		if (!myEngine)
-			return;
+	myEngine = (t_xs_sidplay1 *) myStatus->sidEngine;
+	if (!myEngine)
+		return;
 
-		if (myEngine->currTune) {
-			delete myEngine->currTune;
-			myEngine->currTune = NULL;
-		}
+	if (myEngine->currTune) {
+		delete myEngine->currTune;
+		myEngine->currTune = NULL;
 	}
+}
 
 
 /* Return song information