Mercurial > hg > dmlib
diff tools/ppl.c @ 2586:9807ae37ad69
Require stdbool.h, we require C11 now.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 08 Dec 2022 15:59:22 +0200 |
| parents | d56a0e86067a |
| children |
line wrap: on
line diff
--- a/tools/ppl.c Thu Dec 08 15:56:36 2022 +0200 +++ b/tools/ppl.c Thu Dec 08 15:59:22 2022 +0200 @@ -23,7 +23,7 @@ struct { - BOOL exitFlag; + bool exitFlag; SDL_Window *window; SDL_Renderer *renderer; @@ -34,7 +34,7 @@ int optScrWidth, optScrHeight, optVFlags, optScrDepth; int actChannel; - BOOL pauseFlag; + bool pauseFlag; JSSModule *mod; JSSMixer *dev; @@ -61,8 +61,8 @@ optOutFreq = 48000, optMuteOChannels = -1, optStartOrder = 0; -BOOL optUsePlayTime = FALSE, - optUseGUI = TRUE; +bool optUsePlayTime = false, + optUseGUI = true; size_t optPlayTime; @@ -97,7 +97,7 @@ } -BOOL argHandleOpt(const int optN, char *optArg, char *currArg) +bool argHandleOpt(const int optN, char *optArg, char *currArg) { switch (optN) { @@ -120,7 +120,7 @@ break; case 12: - optUseGUI = FALSE; + optUseGUI = false; break; case 14: @@ -131,7 +131,7 @@ if (w < 320 || h < 200 || w > 3200 || h > 3200) { dmErrorMsg("Invalid width or height: %d x %d\n", w, h); - return FALSE; + return false; } eng.optScrWidth = w; eng.optScrHeight = h; @@ -139,7 +139,7 @@ else { dmErrorMsg("Invalid size argument '%s'.\n", optArg); - return FALSE; + return false; } } break; @@ -174,29 +174,29 @@ case 32: optPlayTime = atoi(optArg); - optUsePlayTime = TRUE; + optUsePlayTime = true; break; default: dmErrorMsg("Unimplemented option argument '%s'.\n", currArg); - return FALSE; + return false; } - return TRUE; + return true; } -BOOL argHandleFile(char *currArg) +bool argHandleFile(char *currArg) { if (!optFilename) optFilename = currArg; else { dmErrorMsg("Too many filename arguments '%s'\n", currArg); - return FALSE; + return false; } - return TRUE; + return true; } @@ -206,7 +206,7 @@ } -BOOL dmInitializeVideo() +bool dmInitializeVideo() { SDL_DestroyTexture(eng.texture); SDL_FreeSurface(eng.screen); @@ -216,7 +216,7 @@ eng.optScrWidth, eng.optScrHeight)) == NULL) { dmErrorMsg("Could not create SDL texture.\n"); - return FALSE; + return false; } if ((eng.screen = SDL_CreateRGBSurfaceWithFormat(0, @@ -224,7 +224,7 @@ 32, SDL_PIXELFORMAT_RGBA32)) == NULL) { dmErrorMsg("Could not create SDL surface.\n"); - return FALSE; + return false; } col.black = dmCol(0 , 0 , 0); @@ -239,7 +239,7 @@ col.scope = dmCol(0 , 0.8, 0); col.red = dmCol(1 , 0 , 0); - return TRUE; + return true; } @@ -539,7 +539,7 @@ } -void dmMuteChannels(BOOL mute) +void dmMuteChannels(bool mute) { for (int i = 0; i < eng.mod->nchannels; i++) jvmMute(eng.dev, i, mute); @@ -548,10 +548,10 @@ int main(int argc, char *argv[]) { - BOOL initSDL = FALSE, audioInit = FALSE; + bool initSDL = false, audioInit = false; DMResource *file = NULL; int res = DMERR_OK; - BOOL muteState = FALSE; + bool muteState = false; memset(&eng, 0, sizeof(eng)); @@ -592,10 +592,10 @@ { dmMsg(2, "* Trying XM...\n"); dmfreset(file); - if ((res = jssLoadXM(file, &eng.mod, TRUE)) == DMERR_OK) + if ((res = jssLoadXM(file, &eng.mod, true)) == DMERR_OK) { dmfreset(file); - res = jssLoadXM(file, &eng.mod, FALSE); + res = jssLoadXM(file, &eng.mod, false); } } #endif @@ -604,10 +604,10 @@ { dmMsg(1, "* Trying JSSMOD ...\n"); dmfreset(file); - if ((res = jssLoadJSSMOD(file, &eng.mod, TRUE)) == DMERR_OK) + if ((res = jssLoadJSSMOD(file, &eng.mod, true)) == DMERR_OK) { dmfreset(file); - res = jssLoadJSSMOD(file, &eng.mod, FALSE); + res = jssLoadJSSMOD(file, &eng.mod, false); } } #endif @@ -646,7 +646,7 @@ SDL_GetError()); goto out; } - initSDL = TRUE; + initSDL = true; // Initialize mixing device @@ -688,7 +688,7 @@ SDL_GetError()); goto out; } - audioInit = TRUE; + audioInit = true; // Initialize player if ((eng.plr = jmpInit(eng.dev)) == NULL) @@ -705,10 +705,10 @@ if (optMuteOChannels >= 0 && optMuteOChannels < eng.mod->nchannels) { - dmMuteChannels(TRUE); - jvmMute(eng.dev, optMuteOChannels, FALSE); + dmMuteChannels(true); + jvmMute(eng.dev, optMuteOChannels, false); eng.actChannel = optMuteOChannels; - muteState = TRUE; + muteState = true; } if (optUseGUI) @@ -782,8 +782,8 @@ while (!eng.exitFlag) { currTick = SDL_GetTicks(); - BOOL needUpdate = (currTick - prevTick > 500), - needRender = FALSE; + bool needUpdate = (currTick - prevTick > 500), + needRender = false; while (SDL_PollEvent(&eng.event)) switch (eng.event.type) @@ -793,7 +793,7 @@ { case SDLK_ESCAPE: case SDLK_q: - eng.exitFlag = TRUE; + eng.exitFlag = true; break; case SDLK_SPACE: @@ -805,7 +805,7 @@ if (eng.actChannel > 0) { eng.actChannel--; - needUpdate = TRUE; + needUpdate = true; } break; @@ -813,7 +813,7 @@ if (eng.actChannel < eng.mod->nchannels - 1) { eng.actChannel++; - needUpdate = TRUE; + needUpdate = true; } break; @@ -826,13 +826,13 @@ else if (eng.event.key.keysym.mod & KMOD_CTRL) { - dmMuteChannels(FALSE); + dmMuteChannels(false); } else { jvmMute(eng.dev, eng.actChannel, !jvmGetMute(eng.dev, eng.actChannel)); } - needUpdate = TRUE; + needUpdate = true; break; case SDLK_PAGEUP: @@ -841,7 +841,7 @@ jmpChangeOrder(eng.plr, dmClamp(eng.plr->order - 1, 0, eng.mod->norders)); JSS_UNLOCK(eng.plr); JSS_UNLOCK(eng.dev); - needUpdate = TRUE; + needUpdate = true; break; case SDLK_PAGEDOWN: @@ -850,14 +850,14 @@ jmpChangeOrder(eng.plr, dmClamp(eng.plr->order + 1, 0, eng.mod->norders)); JSS_UNLOCK(eng.plr); JSS_UNLOCK(eng.dev); - needUpdate = TRUE; + needUpdate = true; break; case SDLK_f: eng.optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP; if (SDL_SetWindowFullscreen(eng.window, eng.optVFlags) != 0) goto out; - needUpdate = TRUE; + needUpdate = true; break; default: @@ -870,7 +870,7 @@ switch (eng.event.window.event) { case SDL_WINDOWEVENT_EXPOSED: - needUpdate = TRUE; + needUpdate = true; break; case SDL_WINDOWEVENT_RESIZED: @@ -879,20 +879,20 @@ if (!dmInitializeVideo()) goto out; - needUpdate = TRUE; + needUpdate = true; break; } break; case SDL_QUIT: - eng.exitFlag = TRUE; + eng.exitFlag = true; break; } // Check for end of song JSS_LOCK(eng.plr); if (!eng.plr->isPlaying) - eng.exitFlag = TRUE; + eng.exitFlag = true; JSS_UNLOCK(eng.plr); if (optUseGUI) @@ -906,7 +906,7 @@ if (currRow != prevRow || needUpdate) { prevRow = currRow; - needUpdate = TRUE; + needUpdate = true; } // Draw frame @@ -935,7 +935,7 @@ eng.plr->order + 1, eng.mod->norders, eng.plr->npattern, eng.mod->npatterns); JSS_UNLOCK(eng.plr); - needRender = TRUE; + needRender = true; } if (needUpdate || currTick - prevTick >= (eng.pauseFlag ? 100 : 20)) @@ -944,7 +944,7 @@ dmDisplayChannels(eng.screen, 5, eng.screen->h * 0.8 + 5, eng.screen->w - 5, eng.screen->h - 5, eng.dev); JSS_UNLOCK(eng.dev); - needRender = TRUE; + needRender = true; } if (needUpdate) @@ -957,7 +957,7 @@ SDL_LockTexture(eng.texture, NULL, &dst.pixels, &dst.pitch); if (dst.pitch != eng.screen->pitch) - eng.exitFlag = TRUE; + eng.exitFlag = true; else memcpy(dst.pixels, eng.screen->pixels, eng.screen->h * dst.pitch);