changeset 837:5b3e2116408f

Cosmetic cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Nov 2012 20:58:45 +0200
parents ccfe44f567c0
children ae1f6418d093
files src/xs_sidplay1.cpp
diffstat 1 files changed, 92 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_sidplay1.cpp	Thu Nov 08 20:49:18 2012 +0200
+++ b/src/xs_sidplay1.cpp	Thu Nov 08 20:58:45 2012 +0200
@@ -1,7 +1,7 @@
 /*
    XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
 
-   libSIDPlay v1 support
+   libSIDPlay1 support
 
    Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
    (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
@@ -92,14 +92,16 @@
 
     /* Initialize engine */
     engine->emu = new emuEngine();
-    if (!engine->emu) {
+    if (!engine->emu)
+    {
         xs_error("[SIDPlay1] Could not initialize emulation engine.\n");
         g_free(engine);
         return FALSE;
     }
 
     /* Verify endianess */
-    if (!engine->emu->verifyEndianess()) {
+    if (!engine->emu->verifyEndianess())
+    {
         xs_error("[SIDPlay1] Endianess verification failed.\n");
         delete engine->emu;
         g_free(engine);
@@ -112,45 +114,46 @@
     engine->emu->getConfig(engine->currConfig);
 
     /* Configure channel parameters */
-    switch (state->audioChannels) {
-
-    case XS_CHN_AUTOPAN:
-        engine->currConfig.channels = SIDEMU_STEREO;
-        engine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
-        engine->currConfig.volumeControl = SIDEMU_FULLPANNING;
-        break;
+    switch (state->audioChannels)
+    {
+        case XS_CHN_AUTOPAN:
+            engine->currConfig.channels = SIDEMU_STEREO;
+            engine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
+            engine->currConfig.volumeControl = SIDEMU_FULLPANNING;
+            break;
 
-    case XS_CHN_STEREO:
-        engine->currConfig.channels = SIDEMU_STEREO;
-        engine->currConfig.autoPanning = SIDEMU_NONE;
-        engine->currConfig.volumeControl = SIDEMU_NONE;
-        break;
+        case XS_CHN_STEREO:
+            engine->currConfig.channels = SIDEMU_STEREO;
+            engine->currConfig.autoPanning = SIDEMU_NONE;
+            engine->currConfig.volumeControl = SIDEMU_NONE;
+            break;
 
-    case XS_CHN_MONO:
-    default:
-        engine->currConfig.channels = SIDEMU_MONO;
-        engine->currConfig.autoPanning = SIDEMU_NONE;
-        engine->currConfig.volumeControl = SIDEMU_NONE;
-        state->audioChannels = XS_CHN_MONO;
-        break;
+        case XS_CHN_MONO:
+        default:
+            engine->currConfig.channels = SIDEMU_MONO;
+            engine->currConfig.autoPanning = SIDEMU_NONE;
+            engine->currConfig.volumeControl = SIDEMU_NONE;
+            state->audioChannels = XS_CHN_MONO;
+            break;
     }
 
 
     /* Memory mode settings */
-    switch (xs_cfg.memoryMode) {
-    case XS_MPU_TRANSPARENT_ROM:
-        engine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
-        break;
+    switch (xs_cfg.memoryMode)
+    {
+        case XS_MPU_TRANSPARENT_ROM:
+            engine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
+            break;
 
-    case XS_MPU_PLAYSID_ENVIRONMENT:
-        engine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
-        break;
+        case XS_MPU_PLAYSID_ENVIRONMENT:
+            engine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
+            break;
 
-    case XS_MPU_BANK_SWITCHING:
-    default:
-        engine->currConfig.memoryMode = MPU_BANK_SWITCHING;
-        xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
-        break;
+        case XS_MPU_BANK_SWITCHING:
+        default:
+            engine->currConfig.memoryMode = MPU_BANK_SWITCHING;
+            xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
+            break;
     }
 
 
@@ -163,54 +166,58 @@
 
     engine->currConfig.frequency = tmpFreq;
 
-    switch (state->audioBitsPerSample) {
-    case XS_RES_8BIT:
-        switch (state->audioFormat) {
-        case FMT_S8:
-            state->audioFormat = FMT_S8;
-            engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
+    switch (state->audioBitsPerSample)
+    {
+        case XS_RES_8BIT:
+            switch (state->audioFormat)
+            {
+                case FMT_S8:
+                    state->audioFormat = FMT_S8;
+                    engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
+                    break;
+
+                case FMT_U8:
+                default:
+                    state->audioFormat = FMT_U8;
+                    engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
+                    break;
+            }
             break;
 
-        case FMT_U8:
+        case XS_RES_16BIT:
         default:
-            state->audioFormat = FMT_U8;
-            engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
-            break;
-        }
-        break;
+            switch (state->audioFormat)
+            {
+                case FMT_U16_NE:
+                case FMT_U16_LE:
+                case FMT_U16_BE:
+                    state->audioFormat = FMT_U16_NE;
+                    engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
+                    break;
 
-    case XS_RES_16BIT:
-    default:
-        switch (state->audioFormat) {
-        case FMT_U16_NE:
-        case FMT_U16_LE:
-        case FMT_U16_BE:
-            state->audioFormat = FMT_U16_NE;
-            engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
+                case FMT_S16_NE:
+                case FMT_S16_LE:
+                case FMT_S16_BE:
+                default:
+                    state->audioFormat = FMT_S16_NE;
+                    engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
+                    break;
+            }
             break;
-
-        case FMT_S16_NE:
-        case FMT_S16_LE:
-        case FMT_S16_BE:
-        default:
-            state->audioFormat = FMT_S16_NE;
-            engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
-            break;
-        }
-        break;
     }
 
     /* Clockspeed settings */
-    switch (xs_cfg.clockSpeed) {
-    case XS_CLOCK_NTSC:
-        engine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
-        break;
+    switch (xs_cfg.clockSpeed)
+    {
+        case XS_CLOCK_NTSC:
+            engine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
+            break;
 
-    case XS_CLOCK_PAL:
-    default:
-        engine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
-        xs_cfg.clockSpeed = XS_CLOCK_PAL;
-        break;
+        case XS_CLOCK_PAL:
+        default:
+            engine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
+            xs_cfg.clockSpeed = XS_CLOCK_PAL;
+            break;
     }
 
     engine->currConfig.forceSongSpeed = xs_cfg.forceSpeed;
@@ -226,14 +233,16 @@
 
 
     /* Now set the emulator configuration */
-    if (!engine->emu->setConfig(engine->currConfig)) {
+    if (!engine->emu->setConfig(engine->currConfig))
+    {
         xs_error("[SIDPlay1] Emulator engine configuration failed!\n");
         return FALSE;
     }
     
     /* Create sidtune object */
     engine->tune = new sidTune(0);
-    if (!engine->tune) {
+    if (!engine->tune)
+    {
         xs_error("[SIDPlay1] Could not initialize SIDTune object.\n");
         return FALSE;
     }
@@ -252,12 +261,14 @@
     engine = (XSSIDPlay1 *) state->internal;
 
     /* Free internals */
-    if (engine->emu) {
+    if (engine->emu)
+    {
         delete engine->emu;
         engine->emu = NULL;
     }
 
-    if (engine->tune) {
+    if (engine->tune)
+    {
         delete engine->tune;
         engine->tune = NULL;
     }
@@ -279,12 +290,14 @@
     engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return FALSE;
 
-    if (!engine->tune) {
+    if (!engine->tune)
+    {
         xs_error("[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, report to XMMS-SID author.\n");
         return FALSE;
     }
 
-    if (!engine->tune->getStatus()) {
+    if (!engine->tune->getStatus())
+    {
         xs_error("[SIDPlay1] SID-tune status check failed. This should not happen, report to XMMS-SID author.\n");
         return FALSE;
     }