--- a/src/xs_sidplay2.cc	Mon Nov 05 18:52:43 2012 +0200
+++ b/src/xs_sidplay2.cc	Mon Nov 05 18:53:20 2012 +0200
@@ -37,7 +37,7 @@
 #  include <sidplay/sidlazyiptr.h>
 #endif
 
-class xs_sidplay2_t {
+class XSSIDPlay2 {
 public:
 #ifdef HAVE_SIDPLAY2_FP
     sidplay2 *currEng;
@@ -51,8 +51,8 @@
     guint8 *buf;
     size_t bufSize;
     
-    xs_sidplay2_t(void);
-    virtual ~xs_sidplay2_t(void) { ; }
+    XSSIDPlay2(void);
+    virtual ~XSSIDPlay2(void) { ; }
 };
 
 
@@ -73,7 +73,7 @@
 #endif
 
 
-xs_sidplay2_t::xs_sidplay2_t(void)
+XSSIDPlay2::XSSIDPlay2(void)
 #ifdef HAVE_SIDPLAY2_FP
 :currEng(NULL)
 #else
@@ -97,7 +97,7 @@
 #define TFUNCTION2  xs_sidplay2_updateinfo
 #define TTUNEINFO   SidTuneInfo
 #define TTUNE       SidTune
-#define TENGINE     xs_sidplay2_t
+#define TENGINE     XSSIDPlay2
 #include "xs_sidplay.h"
 
 
@@ -124,13 +124,13 @@
 gboolean xs_sidplay2_init(XSEngineState * state)
 {
     gint i;
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     sid_filter_t tmpFilter;
     xs_sid_filter_t *f;
     assert(state);
 
     /* Allocate internal structures */
-    engine = new xs_sidplay2_t();
+    engine = new XSSIDPlay2();
     state->internal = engine;
     if (!engine) return FALSE;
 
@@ -432,10 +432,10 @@
  */
 void xs_sidplay2_close(XSEngineState * state)
 {
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     assert(state);
 
-    engine = (xs_sidplay2_t *) state->internal;
+    engine = (XSSIDPlay2 *) state->internal;
 
     /* Free internals */
     if (engine->currBuilder) {
@@ -468,10 +468,10 @@
  */
 gboolean xs_sidplay2_initsong(XSEngineState * state)
 {
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     assert(state);
 
-    engine = (xs_sidplay2_t *) state->internal;
+    engine = (XSSIDPlay2 *) state->internal;
     if (!engine) return FALSE;
 
     if (!engine->currTune->selectSong(state->currSong)) {
@@ -494,10 +494,10 @@
  */
 guint xs_sidplay2_fillbuffer(XSEngineState * state, gchar * audioBuffer, guint audioBufSize)
 {
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     assert(state);
 
-    engine = (xs_sidplay2_t *) state->internal;
+    engine = (XSSIDPlay2 *) state->internal;
     if (!engine) return 0;
 
     return engine->currEng->play((short *) audioBuffer, audioBufSize / sizeof(short));
@@ -508,11 +508,11 @@
  */
 gboolean xs_sidplay2_load(XSEngineState * state, gchar * pcFilename)
 {
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     assert(state);
     state->isInitialized = FALSE;
 
-    engine = (xs_sidplay2_t *) state->internal;
+    engine = (XSSIDPlay2 *) state->internal;
     if (!engine) return FALSE;
 
     /* Try to get the tune */
@@ -532,10 +532,10 @@
  */
 void xs_sidplay2_delete(XSEngineState * state)
 {
-    xs_sidplay2_t *engine;
+    XSSIDPlay2 *engine;
     assert(state);
 
-    engine = (xs_sidplay2_t *) state->internal;
+    engine = (XSSIDPlay2 *) state->internal;
     if (!engine) return;
     
     g_free(engine->buf);