--- a/src/xs_sidplay2.cc	Wed May 31 10:09:04 2006 +0000
+++ b/src/xs_sidplay2.cc	Wed May 31 10:10:05 2006 +0000
@@ -89,7 +89,7 @@
 	/* Initialize the engine */
 	myEngine->currEng = new sidplay2;
 	if (!myEngine->currEng) {
-		XSERR("Could not initialize libSIDPlay2 emulation engine\n");
+		xs_error("Could not initialize libSIDPlay2 emulation engine\n");
 		return FALSE;
 	}
 
@@ -202,25 +202,25 @@
 			/* Builder object created, initialize it */
 			rs->create((myEngine->currEng->info()).maxsids);
 			if (!*rs) {
-				XSERR("rs->create() failed. SIDPlay2 suxx again.\n");
+				xs_error("rs->create() failed. SIDPlay2 suxx again.\n");
 				return FALSE;
 			}
 
 			rs->filter(xs_cfg.emulateFilters);
 			if (!*rs) {
-				XSERR("rs->filter(%d) failed.\n", xs_cfg.emulateFilters);
+				xs_error("rs->filter(%d) failed.\n", xs_cfg.emulateFilters);
 				return FALSE;
 			}
 
 			rs->sampling(tmpFreq);
 			if (!*rs) {
-				XSERR("rs->sampling(%d) failed.\n", tmpFreq);
+				xs_error("rs->sampling(%d) failed.\n", tmpFreq);
 				return FALSE;
 			}
 
 			rs->filter((sid_filter_t *) NULL);
 			if (!*rs) {
-				XSERR("rs->filter(NULL) failed.\n");
+				xs_error("rs->filter(NULL) failed.\n");
 				return FALSE;
 			}
 		}
@@ -234,13 +234,13 @@
 			/* Builder object created, initialize it */
 			hs->create((myEngine->currEng->info()).maxsids);
 			if (!*hs) {
-				XSERR("hs->create() failed. SIDPlay2 suxx again.\n");
+				xs_error("hs->create() failed. SIDPlay2 suxx again.\n");
 				return FALSE;
 			}
 
 			hs->filter(xs_cfg.emulateFilters);
 			if (!*hs) {
-				XSERR("hs->filter(%d) failed.\n", xs_cfg.emulateFilters);
+				xs_error("hs->filter(%d) failed.\n", xs_cfg.emulateFilters);
 				return FALSE;
 			}
 		}
@@ -248,7 +248,7 @@
 #endif
 
 	if (!myEngine->currBuilder) {
-		XSERR("Could not initialize SIDBuilder object.\n");
+		xs_error("Could not initialize SIDBuilder object.\n");
 		return FALSE;
 	}
 
@@ -300,14 +300,14 @@
 
 	/* Now set the emulator configuration */
 	if (myEngine->currEng->config(myEngine->currConfig) < 0) {
-		XSERR("Emulator engine configuration failed!\n");
+		xs_error("Emulator engine configuration failed!\n");
 		return FALSE;
 	}
 
 	/* Create the sidtune */
 	myEngine->currTune = new SidTune(0);
 	if (!myEngine->currTune) {
-		XSERR("Could not initialize SIDTune object.\n");
+		xs_error("Could not initialize SIDTune object.\n");
 		return FALSE;
 	}
 
@@ -358,12 +358,12 @@
 	if (!myEngine) return FALSE;
 
 	if (!myEngine->currTune->selectSong(myStatus->currSong)) {
-		XSERR("currTune->selectSong() failed\n");
+		xs_error("currTune->selectSong() failed\n");
 		return FALSE;
 	}
 
 	if (myEngine->currEng->load(myEngine->currTune) < 0) {
-		XSERR("currEng->load() failed\n");
+		xs_error("currEng->load() failed\n");
 		return FALSE;
 	}