--- a/src/xs_sidplay1.cc	Mon Nov 05 22:39:12 2012 +0200
+++ b/src/xs_sidplay1.cc	Mon Nov 05 22:40:01 2012 +0200
@@ -38,9 +38,9 @@
 
 
 typedef struct {
-    emuEngine *currEng;
+    emuEngine *emu;
     emuConfig currConfig;
-    sidTune *currTune;
+    sidTune *tune;
     guint8 *buf;
     size_t bufSize;
 } XSSIDPlay1;
@@ -91,17 +91,17 @@
     if (!engine) return FALSE;
 
     /* Initialize engine */
-    engine->currEng = new emuEngine();
-    if (!engine->currEng) {
+    engine->emu = new emuEngine();
+    if (!engine->emu) {
         xs_error("[SIDPlay1] Could not initialize emulation engine.\n");
         g_free(engine);
         return FALSE;
     }
 
     /* Verify endianess */
-    if (!engine->currEng->verifyEndianess()) {
+    if (!engine->emu->verifyEndianess()) {
         xs_error("[SIDPlay1] Endianess verification failed.\n");
-        delete engine->currEng;
+        delete engine->emu;
         g_free(engine);
         return FALSE;
     }
@@ -109,7 +109,7 @@
     state->internal = engine;
 
     /* Get current configuration */
-    engine->currEng->getConfig(engine->currConfig);
+    engine->emu->getConfig(engine->currConfig);
 
     /* Configure channel parameters */
     switch (state->audioChannels) {
@@ -226,14 +226,14 @@
 
 
     /* Now set the emulator configuration */
-    if (!engine->currEng->setConfig(engine->currConfig)) {
+    if (!engine->emu->setConfig(engine->currConfig)) {
         xs_error("[SIDPlay1] Emulator engine configuration failed!\n");
         return FALSE;
     }
     
     /* Create sidtune object */
-    engine->currTune = new sidTune(0);
-    if (!engine->currTune) {
+    engine->tune = new sidTune(0);
+    if (!engine->tune) {
         xs_error("[SIDPlay1] Could not initialize SIDTune object.\n");
         return FALSE;
     }
@@ -252,14 +252,14 @@
     engine = (XSSIDPlay1 *) state->internal;
 
     /* Free internals */
-    if (engine->currEng) {
-        delete engine->currEng;
-        engine->currEng = NULL;
+    if (engine->emu) {
+        delete engine->emu;
+        engine->emu = NULL;
     }
 
-    if (engine->currTune) {
-        delete engine->currTune;
-        engine->currTune = NULL;
+    if (engine->tune) {
+        delete engine->tune;
+        engine->tune = NULL;
     }
 
     xs_sidplay1_delete(state);
@@ -279,19 +279,19 @@
     engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return FALSE;
 
-    if (!engine->currTune) {
+    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->currTune->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;
     }
 
     state->isInitialized = TRUE;
 
-    return sidEmuInitializeSong(*engine->currEng, *engine->currTune, state->currSong);
+    return sidEmuInitializeSong(*engine->emu, *engine->tune, state->currSong);
 }
 
 
@@ -305,7 +305,7 @@
     engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return 0;
 
-    sidEmuFillBuffer(*engine->currEng, *engine->currTune, audioBuffer, audioBufSize);
+    sidEmuFillBuffer(*engine->emu, *engine->tune, audioBuffer, audioBufSize);
 
     return audioBufSize;
 }
@@ -328,7 +328,7 @@
     if (xs_fload_buffer(filename, &(engine->buf), &(engine->bufSize)) != 0)
         return FALSE;
     
-    if (!engine->currTune->load(engine->buf, engine->bufSize))
+    if (!engine->tune->load(engine->buf, engine->bufSize))
         return FALSE;
 
     return TRUE;