Mercurial > hg > xmms-sid
changeset 394:7c4216c7aa47
XSERR -> xs_error fixes.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 31 May 2006 10:10:05 +0000 |
parents | 0844db548c06 |
children | b571000e1f8c |
files | src/xmms-sid.h src/xs_sidplay1.cc src/xs_sidplay2.cc |
diffstat | 3 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.h Wed May 31 10:09:04 2006 +0000 +++ b/src/xmms-sid.h Wed May 31 10:10:05 2006 +0000 @@ -210,7 +210,7 @@ t_xs_tuneinfo *xs_tuneinfo_new(gchar *, gint, gint, gchar *, gchar *, gchar *, gint, gint, gint, gint); void xs_tuneinfo_free(t_xs_tuneinfo *); -void XSERR(const char *, ...); +void xs_error(const char *, ...); #ifndef DEBUG_NP void XSDEBUG(const char *, ...);
--- a/src/xs_sidplay1.cc Wed May 31 10:09:04 2006 +0000 +++ b/src/xs_sidplay1.cc Wed May 31 10:10:05 2006 +0000 @@ -81,14 +81,14 @@ /* Initialize engine */ myEngine->currEng = new emuEngine(); if (!myEngine->currEng) { - XSERR("Could not initialize libSIDPlay1 emulation engine\n"); + xs_error("Could not initialize libSIDPlay1 emulation engine\n"); g_free(myEngine); return FALSE; } /* Verify endianess */ if (!myEngine->currEng->verifyEndianess()) { - XSERR("Endianess verification failed\n"); + xs_error("Endianess verification failed\n"); delete myEngine->currEng; g_free(myEngine); return FALSE; @@ -223,7 +223,7 @@ /* Now set the emulator configuration */ if (!myEngine->currEng->setConfig(myEngine->currConfig)) { - XSERR("Emulator engine configuration failed!\n"); + xs_error("Emulator engine configuration failed!\n"); return FALSE; } @@ -262,12 +262,12 @@ if (!myEngine) return FALSE; if (!myEngine->currTune) { - XSERR("Tune was NULL\n"); + xs_error("Tune was NULL\n"); return FALSE; } if (!myEngine->currTune->getStatus()) { - XSERR("Tune status check failed\n"); + xs_error("Tune status check failed\n"); return FALSE; }
--- 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; }