Mercurial > hg > dmlib
changeset 1049:771e03bf9fcd
Make more error message fall under DM_DEBUG.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 01 Mar 2015 18:16:10 +0200 |
| parents | 509e6ed3a24e |
| children | e4f60c944a2d |
| files | Makefile.gen config.mak.in src/dmengine.c src/dmsimple.c |
| diffstat | 4 files changed, 31 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Sun Mar 01 18:13:01 2015 +0200 +++ b/Makefile.gen Sun Mar 01 18:16:10 2015 +0200 @@ -27,6 +27,10 @@ ### ifeq ($(DM_DEBUG),yes) DM_CFLAGS += -DDM_DEBUG + +# Disable JSS_LIGHT and enable JSS_DEBUG +JSS_LIGHT=no +JSS_DEBUG=yes endif ###
--- a/config.mak.in Sun Mar 01 18:13:01 2015 +0200 +++ b/config.mak.in Sun Mar 01 18:16:10 2015 +0200 @@ -59,10 +59,11 @@ JSS=yes # Build a special "light"/minimized version by removing all -# error messages and few other things. +# error messages and few other things. (disabled by DM_DEBUG=yes) JSS_LIGHT=no -# Build with extra debugging code? (disabled by JSS_LIGHT=yes) +# Build with extra debugging code? (disabled by JSS_LIGHT=yes +# and enabled by DM_DEBUG=yes) JSS_DEBUG=no
--- a/src/dmengine.c Sun Mar 01 18:13:01 2015 +0200 +++ b/src/dmengine.c Sun Mar 01 18:16:10 2015 +0200 @@ -32,7 +32,7 @@ engineEffects = dmRealloc(engineEffects, sizeof(DMEffect) * nengineEffectsAlloc); if (engineEffects == NULL) { - return dmError(DMERR_INIT_FAIL, + return dmErrorDBG(DMERR_INIT_FAIL, "Could not expand effects structure.\n"); } } @@ -53,7 +53,7 @@ engine->effectData = dmCalloc(nengineEffectsAlloc, sizeof(void *)); if (engine->effectData == NULL) { - return dmError(DMERR_INIT_FAIL, + return dmErrorDBG(DMERR_INIT_FAIL, "Could not expand effects data structure.\n"); } @@ -327,7 +327,7 @@ DMResource *res; if (eng == NULL) { - dmError(DMERR_INTERNAL, + dmErrorDBGMsg( "Engine not initialized but engineGetResource('%s') called.\n", name); return NULL; @@ -338,7 +338,7 @@ return res->resData; else { - dmError(DMERR_INTERNAL, + dmErrorDBGMsg( "Could not find resource '%s'.\n", name); return NULL;
--- a/src/dmsimple.c Sun Mar 01 18:13:01 2015 +0200 +++ b/src/dmsimple.c Sun Mar 01 18:16:10 2015 +0200 @@ -41,6 +41,7 @@ static BOOL argHandleOpt(const int optN, char *optArg, char *currArg) { (void) optArg; + (void) currArg; switch (optN) { @@ -54,8 +55,7 @@ break; default: - dmError(DMERR_INTERNAL, - "Unknown option '%s'.\n", currArg); + dmErrorDBGMsg("Unknown option '%s'.\n", currArg); return FALSE; } @@ -260,7 +260,7 @@ sscanf(str, "textEnterToStart %s", engine.setupTextEnterToStart) != 1 ) { - res = dmError(DMERR_INVALID_DATA, + res = dmErrorDBG(DMERR_INVALID_DATA, "Syntax error in configuration:\n%s\n", buf); goto out; } @@ -368,7 +368,7 @@ if (menuBgImage == NULL || menuBarImage == NULL) { - dmError(result, + dmErrorDBGMsg( "Could not instantiate setup screen images, %d: %s\n", result, dmErrorStr(result)); goto out; @@ -377,7 +377,7 @@ if (menuBgImage->w != DM_VSETUP_WIDTH || menuBgImage->h != DM_VSETUP_HEIGHT) { - dmError(DMERR_INIT_FAIL, + dmErrorDBGMsg( "Setup screen background image does not match " "required dimensions (%dx%d vs %dx%d)\n", menuBgImage->w, menuBgImage->h, @@ -395,7 +395,7 @@ } if (result != DMERR_OK) { - dmError(result, + dmErrorDBGMsg( "Could not instantiate setup screen font, %d: %s\n", result, dmErrorStr(result)); goto out; @@ -406,7 +406,7 @@ engine.screen->w, engine.screen->h); if (tmp == NULL) { - dmError(DMERR_MALLOC, + dmErrorDBGMsg( "Could not convert setup screen background image.\n"); goto out; } @@ -622,7 +622,7 @@ if ((err = dmResourcesInit(&engine.resources, engine.optPackFilename, engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Could not initialize resource manager, #%d: %s.\n", err, dmErrorStr(err)); goto error_exit; @@ -683,25 +683,25 @@ if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL) { - dmError(DMERR_INIT_FAIL, + dmErrorDBGMsg( "jvmInit() returned NULL, voi perkele.\n"); goto error_exit; } if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL) { - dmError(DMERR_INIT_FAIL, + dmErrorDBGMsg( "jmpInit() returned NULL\n"); goto error_exit; } #else - dmError(DMERR_INTERNAL, "miniJSS support not included.\n"); + dmErrorDBGMsg("miniJSS support not included.\n"); #endif break; case DM_ASETUP_TREMOR: #ifndef DM_USE_TREMOR - dmError(DMERR_INTERNAL, "Tremor support not included.\n"); + dmErrorDBGMsg("Tremor support not included.\n"); #endif break; } @@ -713,7 +713,7 @@ if ((err = engineInitAudioParts(&engine)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "engineInitAudioParts() failed: #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -723,7 +723,7 @@ if (engine.demoInitPreVideo != NULL && (err = engine.demoInitPreVideo(&engine)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "demoInitPreVideo() failed, #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -735,7 +735,7 @@ if (engine.demoInitPostVideo != NULL && (err = engine.demoInitPostVideo(&engine)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "demoInitPostVideo() failed, #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -748,7 +748,7 @@ dmPrint(1, "Loading resources, please wait...\n"); if ((err = engineLoadResources()) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Error loading resources, #%d: %s.\n", err, dmErrorStr(err)); goto error_exit; @@ -757,7 +757,7 @@ // Final initializations if ((err = engine.demoInit(&engine)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Failure in demoInit(), #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -766,7 +766,7 @@ // Initialize effects if ((err = engineInitializeEffects(&engine)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Effects initialization failed, #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -778,7 +778,7 @@ { if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Error loading timeline, #%d: %s\n", err, dmErrorStr(err)); goto error_exit; @@ -786,7 +786,7 @@ if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK) { - dmError(err, + dmErrorDBGMsg( "Error creating prepared timeline, #%d: %s\n", err, dmErrorStr(err)); goto error_exit;