dmlib: tools/ppl.c annotate

annotate tools/ppl.c @ 2305:3bcad61594b4

Cleanup.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 08 Jul 2019 10:28:00 +0300
parents	2c90e455f006
children	b7cd5dd0b82e

rev	line source
216 247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	1 /*
247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	2 * Cyrbe Pasci Player - A simple SDL-based UI for XM module playing
247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
2283 2c90e455f006 Bump copyright. Matti Hamalainen <ccr@tnsp.org> parents: 2275 diff changeset	4 * (C) Copyright 2012-2019 Tecnic Software productions (TNSP)
216 247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	5 *
247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
247b03797fc9 Rename player, add a copyright note. Matti Hamalainen <ccr@tnsp.org> parents: 203 diff changeset	7 */
643 ad738873083e Add SDL.h #include to ppl. Matti Hamalainen <ccr@tnsp.org> parents: 584 diff changeset	8 #include "dmlib.h"
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	9 #include <SDL.h>
1327 59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	10 #include "libgutil.h"
643 ad738873083e Add SDL.h #include to ppl. Matti Hamalainen <ccr@tnsp.org> parents: 584 diff changeset	11
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 #include "jss.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 #include "jssmod.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 #include "jssmix.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 #include "jssplr.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 #include "dmargs.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 #include "dmimage.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 #include "dmtext.h"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20
584 923d920a8a85 Build setupfont.h and setupimage.h from source data files. Use setupfont in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 559 diff changeset	21 #include "setupfont.h"
164 a49d431ff40e Add a hardcoded font to PPL. Matti Hamalainen <ccr@tnsp.org> parents: 159 diff changeset	22
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 struct
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 BOOL exitFlag;
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	27
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	28 SDL_Window *window;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	29 SDL_Renderer *renderer;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	30 SDL_Texture *texture;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 SDL_Surface *screen;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 SDL_Event event;
1556 8f06c23e197d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1555 diff changeset	33
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 int optScrWidth, optScrHeight, optVFlags, optScrDepth;
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	35
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	36 int actChannel;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	37 BOOL pauseFlag;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	38
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	39 JSSModule *mod;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	40 JSSMixer *dev;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	41 JSSPlayer *plr;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	42 SDL_AudioSpec afmt;
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	43 } eng;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 struct
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 {
1555 813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	47 Uint32
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	48 boxBg, inboxBg,
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	49 box1, box2,
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	50 viewDiv,
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	51 activeRow, activeChannel,
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	52 scope, muted, black, red;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 } col;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 DMBitmapFont *font = NULL;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57
273 3b5493fac928 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 216 diff changeset	58 char *optFilename = NULL;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 int optOutFormat = JSS_AUDIO_S16,
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 optOutChannels = 2,
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 optOutFreq = 48000,
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 optMuteOChannels = -1,
179 b29c9a2fbeb5 Add full screen switching to PPL via 'f' key, and various other Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	63 optStartOrder = 0;
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	64 BOOL optUsePlayTime = FALSE,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	65 optUseGUI = TRUE;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 size_t optPlayTime;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	69 static const DMOptArg optList[] =
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 { 0, '?', "help", "Show this help", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 { 2, 0, "fs", "Fullscreen", OPT_NONE },
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	74 { 12, 'C', "cli", "Do not open GUI window", OPT_NONE },
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 { 3, 'w', "window", "Initial window size/resolution -w 640x480", OPT_ARGREQ },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 { 4, '1', "16bit", "16-bit output", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 { 5, '8', "8bit", "8-bit output", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 { 6, 'm', "mono", "Mono output", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 { 7, 's', "stereo", "Stereo output", OPT_NONE },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 { 8, 'f', "freq", "Output frequency", OPT_ARGREQ },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 { 9, 'M', "mute", "Mute other channels than #", OPT_ARGREQ },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 { 10, 'o', "order", "Start from order #", OPT_ARGREQ },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 { 11, 't', "time", "Play for # seconds", OPT_ARGREQ },
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 };
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 const int optListN = sizeof(optList) / sizeof(optList[0]);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 void argShowHelp()
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 dmPrintBanner(stdout, dmProgName, "[options] <module>");
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	94 dmArgsPrintHelp(stdout, optList, optListN, 0);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 BOOL argHandleOpt(const int optN, char optArg, char currArg)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 switch (optN) {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 case 0:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 argShowHelp();
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 exit(0);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 case 1:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 dmVerbosity++;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	109
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 case 2:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	111 eng.optVFlags \|= SDL_WINDOW_FULLSCREEN_DESKTOP;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 case 3:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 int w, h;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 if (sscanf(optArg, "%dx%d", &w, &h) == 2)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 if (w < 320 \|\| h < 200 \|\| w > 3200 \|\| h > 3200)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	121 dmErrorMsg("Invalid width or height: %d x %d\n", w, h);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 return FALSE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 }
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	124 eng.optScrWidth = w;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	125 eng.optScrHeight = h;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	127 else
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	129 dmErrorMsg("Invalid size argument '%s'.\n", optArg);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 return FALSE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 case 4:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 optOutFormat = JSS_AUDIO_S16;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 case 5:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 optOutFormat = JSS_AUDIO_U8;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 case 6:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 optOutChannels = JSS_AUDIO_MONO;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 case 7:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 optOutChannels = JSS_AUDIO_STEREO;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 case 8:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 optOutFreq = atoi(optArg);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 case 9:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 optMuteOChannels = atoi(optArg);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 case 10:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 optStartOrder = atoi(optArg);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 case 11:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 optPlayTime = atoi(optArg);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 optUsePlayTime = TRUE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	168 case 12:
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	169 optUseGUI = FALSE;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	170 break;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	171
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 default:
2183 e3f0eaf23f4f Change the error message for unimplemented option argument. Matti Hamalainen <ccr@tnsp.org> parents: 2102 diff changeset	173 dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 return FALSE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	176
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 return TRUE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 BOOL argHandleFile(char *currArg)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 if (!optFilename)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 optFilename = currArg;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 else
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	187 dmErrorMsg("Too many filename arguments '%s'\n", currArg);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 return FALSE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	190
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 return TRUE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194
1327 59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	195 static inline Uint32 dmCol(const float r, const float g, const float b)
78 3b3908d28a4b PPL now looks a bit saner, but does not do anything interesting yet. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	196 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	197 return dmMapRGB(eng.screen, 255.0f * r, 255.0f * g, 255.0f * b);
78 3b3908d28a4b PPL now looks a bit saner, but does not do anything interesting yet. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	198 }
3b3908d28a4b PPL now looks a bit saner, but does not do anything interesting yet. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	199
130 1d7dc7c8745c Move custom bitmap font text rendering functions into PPL code itself. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	200
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 BOOL dmInitializeVideo()
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	203 SDL_DestroyTexture(eng.texture);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	204 SDL_FreeSurface(eng.screen);
179 b29c9a2fbeb5 Add full screen switching to PPL via 'f' key, and various other Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	205
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	206 if ((eng.texture = SDL_CreateTexture(eng.renderer,
1561 b6ee934496d1 Make texture/surface creation better. Matti Hamalainen <ccr@tnsp.org> parents: 1559 diff changeset	207 SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_STREAMING,
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	208 eng.optScrWidth, eng.optScrHeight)) == NULL)
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	209 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	210 dmErrorMsg("Could not create SDL texture.\n");
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	211 return FALSE;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	212 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	214 if ((eng.screen = SDL_CreateRGBSurfaceWithFormat(0,
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	215 eng.optScrWidth, eng.optScrHeight,
1564 d1e2f7a22fb8 Oops, 8 vs 32bits. Didn't seem to matter anyhow, though. Matti Hamalainen <ccr@tnsp.org> parents: 1562 diff changeset	216 32, SDL_PIXELFORMAT_RGBA32)) == NULL)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	218 dmErrorMsg("Could not create SDL surface.\n");
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 return FALSE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
1555 813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	222 col.black = dmCol(0 , 0 , 0);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	223 col.inboxBg = dmCol(0.6, 0.5, 0.2);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	224 col.boxBg = dmCol(0.7, 0.6, 0.3);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	225 col.box1 = dmCol(1.0, 0.9, 0.6);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	226 col.box2 = dmCol(0.3, 0.3, 0.15);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	227 col.viewDiv = dmCol(0 , 0 , 0);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	228 col.activeRow = dmCol(0.5, 0.4, 0.1);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	229 col.activeChannel = dmCol(0.6, 0.8, 0.2);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	230 col.muted = dmCol(0.3, 0.1, 0.1);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	231 col.scope = dmCol(0 , 0.8, 0);
813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	232 col.red = dmCol(1 , 0 , 0);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 return TRUE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237
1327 59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	238 //
59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	239 // XXX TODO: To display actual continuous sample data for channel,
59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	240 // we would need to have separate "FIFO" buffers for each, updating
59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	241 // them with new data from incoming channel data.
59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	242 //
165 3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	243 void dmDisplayChn(SDL_Surface screen, int x0, int y0, int x1, int y1, int nchannel, JSSChannel chn)
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	244 {
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	245 int yh = y1 - y0 - 2;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	246 if (yh < 10 \|\| chn == NULL)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	247 return;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	248
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	249 int xc, ym = y0 + (y1 - y0) / 2, vol = FP_GETH32(chn->chVolume);
1556 8f06c23e197d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1555 diff changeset	250 DMFixedPoint offs = chn->chPos;
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	251 int len = FP_GETH32(chn->chSize);
1556 8f06c23e197d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1555 diff changeset	252 Uint32 pitch = screen->pitch / sizeof(Uint32);
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	253 Uint32 *pix = screen->pixels;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	254 Sint16 *data = chn->chData;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	255
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	256 dmFillBox3D(screen, x0, y0, x1, y1,
1555 813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	257 (chn->chMute ? col.muted : col.black),
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	258 nchannel == eng.actChannel ? col.red : col.box2,
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	259 nchannel == eng.actChannel ? col.red : col.box1);
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	260
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	261 if (chn->chData == NULL \|\| !chn->chPlaying)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	262 return;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	263
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	264 if (chn->chDirection)
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	265 {
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	266 for (xc = x0 + 1; xc < x1 - 1; xc++)
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	267 {
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	268 if (FP_GETH32(offs) >= len)
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	269 break;
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	270 Sint16 val = ym + (data[FP_GETH32(offs)] * yh * vol) / (65535 * 255);
1555 813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	271 pix[xc + val * pitch] = col.scope;
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	272 FP_ADD(offs, chn->chDeltaO);
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	273 }
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	274 }
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	275 else
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	276 {
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	277 for (xc = x0 + 1; xc < x1 - 1; xc++)
31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	278 {
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	279 if (FP_GETH32(offs) < 0)
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	280 break;
809 eba3b87f3f84 Add some separate macros for 64/32 precision fixed point types. Matti Hamalainen <ccr@tnsp.org> parents: 797 diff changeset	281 Sint16 val = ym + (data[FP_GETH32(offs)] * yh * vol) / (65535 * 255);
1555 813244726b32 Remove useless dmCol() calls. Matti Hamalainen <ccr@tnsp.org> parents: 1409 diff changeset	282 pix[xc + val * pitch] = col.scope;
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	283 FP_SUB(offs, chn->chDeltaO);
274 31e62b1f1b6e Add boundary checks for the scope drawing. Matti Hamalainen <ccr@tnsp.org> parents: 273 diff changeset	284 }
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	285 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	286 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	287
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	288
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	289 void dmDisplayChannels(SDL_Surface screen, int x0, int y0, int x1, int y1, JSSMixer dev)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	290 {
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	291 int nchannel, qx, qy,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	292 qwidth = x1 - x0,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	293 qheight = y1 - y0,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	294 nwidth = jsetNChannels,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	295 nheight = 1;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	296
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	297 if (qheight < 40)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	298 return;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	299
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	300 while (qwidth / nwidth <= 60 && qheight / nheight >= 40)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	301 {
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	302 nheight++;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	303 nwidth /= nheight;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	304 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	305
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	306 // fprintf(stderr, "%d x %d\n", nwidth, nheight);
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	307
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	308 if (qheight / nheight <= 40)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	309 {
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	310 nwidth = qwidth / 60;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	311 nheight = qheight / 40;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	312 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	313
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	314 qwidth /= nwidth;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	315 qheight /= nheight;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	316
165 3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	317 for (nchannel = qy = 0; qy < nheight && nchannel < jsetNChannels; qy++)
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	318 {
165 3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	319 for (qx = 0; qx < nwidth && nchannel < jsetNChannels; qx++)
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	320 {
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	321 int xc = x0 + qx * qwidth,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	322 yc = y0 + qy * qheight;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	323
165 3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	324 dmDisplayChn(screen, xc + 1, yc + 1,
3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	325 xc + qwidth - 1, yc + qheight - 1,
3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	326 nchannel, &dev->channels[nchannel]);
3e8e0dc30711 Minor visual improvements. Matti Hamalainen <ccr@tnsp.org> parents: 164 diff changeset	327
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	328 nchannel++;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	329 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	330 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	331 }
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	332
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	333
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 static const char patNoteTable[12][3] =
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 "C-", "C#", "D-",
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 "D#", "E-", "F-",
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 "F#", "G-", "G#",
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 "A-", "A#", "B-"
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 };
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 #define jmpNMODEffectTable (36)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 static const char jmpMODEffectTable[jmpNMODEffectTable] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	346 static const char jmpHexTab[16] = "0123456789ABCDEF";
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	347
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	348 static inline char dmHexVal(int v)
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	349 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	350 return jmpHexTab[v & 15];
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	351 }
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	352
1327 59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	353
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 void dmPrintNote(SDL_Surface screen, int xc, int yc, JSSNote n)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 char text[32];
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 char *ptr = text;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	358
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 switch (n->note)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 case jsetNotSet:
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	362 strcpy(ptr, "..._");
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364 case jsetNoteOff:
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	365 strcpy(ptr, "===_");
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 default:
78 3b3908d28a4b PPL now looks a bit saner, but does not do anything interesting yet. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	368 sprintf(ptr, "%s%i_",
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 patNoteTable[n->note % 12],
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 n->note / 12);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 ptr += 4;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 if (n->instrument != jsetNotSet)
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	377 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	378 int v = n->instrument + 1;
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	379 *ptr++ = dmHexVal(v >> 4);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	380 *ptr++ = dmHexVal(v);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	381 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 else
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	383 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	384 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	385 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	386 }
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	387 *ptr++ = '_';
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 if (n->volume == jsetNotSet)
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	390 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	391 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	392 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	393 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 else
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 if (n->volume >= 0x00 && n->volume <= 0x40)
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	396 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	397 *ptr++ = dmHexVal(n->volume >> 4);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	398 *ptr++ = dmHexVal(n->volume);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	399 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 else
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 char c;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 switch (n->volume & 0xf0)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 case 0x50: c = '-'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 case 0x60: c = '+'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 case 0x70: c = '/'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 case 0x80: c = '\\'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409 case 0x90: c = 'S'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 case 0xa0: c = 'V'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 case 0xb0: c = 'P'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 case 0xc0: c = '<'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 case 0xd0: c = '>'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 case 0xe0: c = 'M'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 default: c = '?'; break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 }
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	417 *ptr++ = c;
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	418 *ptr++ = dmHexVal(n->volume);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 }
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	420 *ptr++ = '_';
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	421
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 if (n->effect >= 0 && n->effect < jmpNMODEffectTable)
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	423 *ptr++ = jmpMODEffectTable[n->effect];
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 else
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	425 *ptr++ = (n->effect == jsetNotSet ? '.' : '?');
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 if (n->param != jsetNotSet)
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	428 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	429 *ptr++ = dmHexVal(n->param >> 4);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	430 *ptr++ = dmHexVal(n->param);
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	431 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 else
201 844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	433 {
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	434 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	435 *ptr++ = '.';
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	436 }
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	437
844f38cbff65 Optimize pattern drawing a bit. Matti Hamalainen <ccr@tnsp.org> parents: 199 diff changeset	438 *ptr = 0;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439
130 1d7dc7c8745c Move custom bitmap font text rendering functions into PPL code itself. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	440 dmDrawBMTextConstQ(screen, font, DMD_TRANSPARENT, xc, yc, text);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	444 void dmDisplayPattern(SDL_Surface screen, int x0, int y0, int x1, int y1, JSSPattern pat, int row)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 {
78 3b3908d28a4b PPL now looks a bit saner, but does not do anything interesting yet. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	446 int cwidth = (font->width * 10 + 3 * 4 + 5),
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 lwidth = 6 + font->width * 3,
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	448 qy0 = y0 + font->height + 2,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	449 qy1 = y1 - font->height - 2,
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 qwidth = ((x1 - x0 - lwidth) / cwidth),
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	451 qheight = ((qy1 - qy0 - 4) / (font->height + 1)),
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	452 nrow, nchannel, yc, choffs,
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453 midrow = qheight / 2;
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	454
1258 13c274d22a29 Add some extra error checking. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	455 if (pat == NULL)
13c274d22a29 Add some extra error checking. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	456 return;
13c274d22a29 Add some extra error checking. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	457
1962 951e07b80b40 If pattern has less channels than what fits on the screen, and active Matti Hamalainen <ccr@tnsp.org> parents: 1956 diff changeset	458 if (qwidth > pat->nchannels)
951e07b80b40 If pattern has less channels than what fits on the screen, and active Matti Hamalainen <ccr@tnsp.org> parents: 1956 diff changeset	459 qwidth = pat->nchannels;
951e07b80b40 If pattern has less channels than what fits on the screen, and active Matti Hamalainen <ccr@tnsp.org> parents: 1956 diff changeset	460
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	461 if (eng.actChannel < qwidth / 2)
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	462 choffs = 0;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	463 else
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	464 if (eng.actChannel >= pat->nchannels - qwidth/2)
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	465 choffs = pat->nchannels - qwidth;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	466 else
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	467 choffs = eng.actChannel - qwidth/2;
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	468
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	469 dmDrawBox3D(screen, x0 + lwidth, qy0, x1, qy1, col.box2, col.box1);
99 7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	470
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	471 for (nchannel = 0; nchannel < qwidth; nchannel++)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 {
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	473 int bx0 = x0 + lwidth + 1 + nchannel * cwidth,
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	474 bx1 = bx0 + cwidth;
1098 441a1ca43b02 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1096 diff changeset	475
441a1ca43b02 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1096 diff changeset	476 dmFillRect(screen, bx0+1, qy0+1, bx1-1, qy1-1,
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	477 (eng.actChannel == nchannel + choffs) ? col.activeChannel : col.inboxBg);
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	478 }
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	479
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	480 yc = qy0 + 2 + (font->height + 1) * midrow;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	481 dmFillRect(screen, x0 + lwidth + 1, yc - 1, x1 - 1, yc + font->height, col.activeRow);
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	482
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	483 for (nchannel = 0; nchannel < qwidth; nchannel++)
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	484 {
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	485 int bx0 = x0 + lwidth + 1 + nchannel * cwidth,
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	486 bx1 = bx0 + cwidth;
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	487
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	488 dmDrawVLine(screen, qy0 + 1, qy1 - 1, bx1, col.viewDiv);
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	489
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	490 if (jvmGetMute(eng.dev, nchannel + choffs))
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	491 {
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	492 dmDrawBMTextConstQ(screen, font, DMD_TRANSPARENT,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	493 bx0 + (cwidth - font->width * 5) / 2, qy1 + 3, "MUTED");
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	494 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	495
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	496 dmDrawBMTextQ(screen, font, DMD_TRANSPARENT,
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	497 bx0 + (cwidth - font->width * 3) / 2, y0 + 1, "%3d",
8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	498 nchannel + choffs);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	500
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 for (nrow = 0; nrow < qheight; nrow++)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 {
99 7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	503 int crow = nrow - midrow + row;
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	504 yc = qy0 + 2 + (font->height + 1) * nrow;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	505
99 7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	506 if (crow >= 0 && crow < pat->nrows)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 {
130 1d7dc7c8745c Move custom bitmap font text rendering functions into PPL code itself. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	508 dmDrawBMTextQ(screen, font, DMD_TRANSPARENT, x0, yc, "%03d", crow);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509
99 7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	510 for (nchannel = 0; nchannel < qwidth; nchannel++)
7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	511 {
7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	512 if (choffs + nchannel >= pat->nchannels)
7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	513 break;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
99 7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	515 dmPrintNote(screen, x0 + lwidth + 4 + nchannel * cwidth, yc,
7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	516 pat->data + (pat->nchannels * crow) + choffs + nchannel);
7a59611f9d4f Various minor improvements in PPL. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	517 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 void audioCallback(void userdata, Uint8 stream, int len)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 JSSMixer d = (JSSMixer ) userdata;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 if (d != NULL)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 jvmRenderAudio(d, stream, len / jvmGetSampleSize(d));
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	534 void dmMuteChannels(BOOL mute)
198 4568c479541c Make 'm' key mute all but selected active channel. Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	535 {
2305 3bcad61594b4 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2283 diff changeset	536 for (int i = 0; i < eng.mod->nchannels; i++)
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	537 jvmMute(eng.dev, i, mute);
198 4568c479541c Make 'm' key mute all but selected active channel. Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	538 }
4568c479541c Make 'm' key mute all but selected active channel. Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	539
1327 59e9ad13b50e Move common functions to libgutil. Matti Hamalainen <ccr@tnsp.org> parents: 1323 diff changeset	540
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 int main(int argc, char *argv[])
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 {
290 61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	543 BOOL initSDL = FALSE, audioInit = FALSE;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 DMResource *file = NULL;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 int result = -1;
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	546 BOOL muteState = FALSE;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	548 dmMemset(&eng, 0, sizeof(eng));
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	550 eng.optScrWidth = 640;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	551 eng.optScrHeight = 480;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	552 eng.optScrDepth = 32;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553
1562 83979ecc6576 Bump version and copyright of PPL/CBP. Matti Hamalainen <ccr@tnsp.org> parents: 1561 diff changeset	554 dmInitProg("CBP", "Cyrbe Basci Player", "0.2", NULL, NULL);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 // Parse arguments
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 if (!dmArgsProcess(argc, argv, optList, optListN,
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 809 diff changeset	558 argHandleOpt, argHandleFile, OPTH_BAILOUT))
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 exit(1);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 // Open the files
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 if (optFilename == NULL)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	564 dmErrorMsg("No filename specified.\n");
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 return 1;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	567
1606 93d1050eac99 Rename dmf_create_() functions to dmf_open_(). Matti Hamalainen <ccr@tnsp.org> parents: 1602 diff changeset	568 if ((result = dmf_open_stdio(optFilename, "rb", &file)) != DMERR_OK)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	570 dmErrorMsg("Error opening file '%s', %d: (%s)\n",
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	571 optFilename, result, dmErrorStr(result));
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 return 1;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 // Initialize miniJSS
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 jssInit();
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 // Read module file
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 dmMsg(1, "Reading file: %s\n", optFilename);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 #ifdef JSS_SUP_XM
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	581 result = jssLoadXM(file, &eng.mod, TRUE);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 #endif
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 #ifdef JSS_SUP_JSSMOD
1199 a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	584 dmfreset(file);
a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	585 if (result != DMERR_OK)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 {
777 ed60a7ee3ebb Change JSSMOD loader to use DMResources. Matti Hamalainen <ccr@tnsp.org> parents: 745 diff changeset	587 dmMsg(1, "* Trying JSSMOD ...\n");
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	588 result = jssLoadJSSMOD(file, &eng.mod, TRUE);
1199 a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	589 dmfreset(file);
a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	590 if (result == DMERR_OK)
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	591 result = jssLoadJSSMOD(file, &eng.mod, FALSE);
1199 a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	592 }
a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	593 else
a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	594 {
a79edf59d5d8 Improve use of probing in dumpmod, mod2wav and ppl. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	595 dmMsg(2, "* Trying XM...\n");
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	596 result = jssLoadXM(file, &eng.mod, FALSE);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 #endif
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 dmf_close(file);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 if (result != DMERR_OK)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	603 dmErrorMsg("Error loading module file, %d: %s\n",
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604 result, dmErrorStr(result));
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	605 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 // Try to convert it
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	609 if ((result = jssConvertModuleForPlaying(eng.mod)) != DMERR_OK)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	611 dmErrorMsg("Could not convert module for playing, %d: %s\n",
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 result, dmErrorStr(result));
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	613 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615
1971 c27f7cd25684 Set the PPL font palette to be more appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1970 diff changeset	616
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 // Initialize SDL components
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| SDL_INIT_TIMER) != 0)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	620 dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError());
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	621 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 initSDL = TRUE;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 // Initialize mixing device
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 dmMsg(2, "Initializing miniJSS mixer with: %d, %d, %d\n",
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 optOutFormat, optOutChannels, optOutFreq);
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	630 eng.dev = jvmInit(optOutFormat, optOutChannels, optOutFreq, JMIX_AUTO);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	631 if (eng.dev == NULL)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	633 dmErrorMsg("jvmInit() returned NULL\n");
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	634 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	636
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637 switch (optOutFormat)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	639 case JSS_AUDIO_S16: eng.afmt.format = AUDIO_S16SYS; break;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	640 case JSS_AUDIO_U16: eng.afmt.format = AUDIO_U16SYS; break;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	641 case JSS_AUDIO_S8: eng.afmt.format = AUDIO_S8; break;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	642 case JSS_AUDIO_U8: eng.afmt.format = AUDIO_U8; break;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	644 dmErrorMsg("Unsupported audio format %d (could not set matching SDL format)\n",
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645 optOutFormat);
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	646 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	649 eng.afmt.freq = optOutFreq;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	650 eng.afmt.channels = optOutChannels;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	651 eng.afmt.samples = optOutFreq / 16;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	652 eng.afmt.callback = audioCallback;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	653 eng.afmt.userdata = (void *) eng.dev;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 // Open the audio device
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	656 if (SDL_OpenAudio(&eng.afmt, NULL) < 0)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	658 dmErrorMsg("Couldn't open SDL audio: %s\n",
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 SDL_GetError());
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	660 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 }
290 61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	662 audioInit = TRUE;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	663
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664 // Initialize player
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	665 if ((eng.plr = jmpInit(eng.dev)) == NULL)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	667 dmErrorMsg("jmpInit() returned NULL\n");
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	668 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	670
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	671 jvmSetCallback(eng.dev, jmpExec, eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	672 jmpSetModule(eng.plr, eng.mod);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	673 jmpPlayOrder(eng.plr, optStartOrder);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	674 jvmSetGlobalVol(eng.dev, 200);
190 87b46e61f2c4 Make it possible to mute channels. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	675
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	676 if (optMuteOChannels >= 0 && optMuteOChannels < eng.mod->nchannels)
190 87b46e61f2c4 Make it possible to mute channels. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	677 {
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	678 dmMuteChannels(TRUE);
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	679 jvmMute(eng.dev, optMuteOChannels, FALSE);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	680 eng.actChannel = optMuteOChannels;
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	681 muteState = TRUE;
190 87b46e61f2c4 Make it possible to mute channels. Matti Hamalainen <ccr@tnsp.org> parents: 185 diff changeset	682 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	684 if (optUseGUI)
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	685 {
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	686 // Get font
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	687 result = dmf_open_memio(NULL, "pplfont.fnt", engineSetupFont, sizeof(engineSetupFont), &file);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	688 if (result != DMERR_OK)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	689 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	690 dmErrorMsg("Error opening font file 'pplfont.fnt', #%d: %s\n",
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	691 result, dmErrorStr(result));
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	692 goto exit;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	693 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	694 result = dmLoadBitmapFont(file, &font);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	695 dmf_close(file);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	696 if (result != DMERR_OK)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	697 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	698 dmErrorMsg("Could not load font from file, %d: %s\n",
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	699 result, dmErrorStr(result));
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	700 goto exit;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	701 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	702
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	703 SDL_Color pal[DMFONT_NPALETTE];
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	704 for (int n = 0; n < DMFONT_NPALETTE; n++)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	705 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	706 pal[n].r = pal[n].g = pal[n].b = 0;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	707 pal[n].a = n > 0 ? 255 : 0;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	708 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	709 dmSetBitmapFontPalette(font, pal, 0, DMFONT_NPALETTE);
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	710
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	711 // Open window
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	712 if ((eng.window = SDL_CreateWindow(dmProgName,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	713 SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	714 eng.optScrWidth, eng.optScrHeight,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	715 eng.optVFlags \| SDL_WINDOW_RESIZABLE
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	716 //\| SDL_WINDOW_HIDDEN
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	717 )) == NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	718 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	719 dmErrorMsg("Can't create an SDL window: %s\n", SDL_GetError());
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	720 goto exit;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	721 }
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	722
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	723 SDL_SetWindowTitle(eng.window, dmProgDesc);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	724
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	725 if ((eng.renderer = SDL_CreateRenderer(eng.window, -1, SDL_RENDERER_PRESENTVSYNC)) == NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	726 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	727 dmErrorMsg("Can't create an SDL renderer: %s\n", SDL_GetError());
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	728 goto exit;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	729 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	730
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	731 if (!dmInitializeVideo())
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	732 goto exit;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	733
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	734 //SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	735 //SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	736 }
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	737
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 // okay, main loop here ... "play" module and print out info
275 26d714c72c0f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 274 diff changeset	739 SDL_LockAudio();
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740 SDL_PauseAudio(0);
275 26d714c72c0f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 274 diff changeset	741 SDL_UnlockAudio();
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	743 int currTick, prevTick = 0, prevRow = -1;
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	744 while (!eng.exitFlag)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745 {
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	746 currTick = SDL_GetTicks();
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	747 BOOL needUpdate = (currTick - prevTick > 500),
61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	748 needRender = FALSE;
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	749
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	750 while (SDL_PollEvent(&eng.event))
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	751 switch (eng.event.type)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 case SDL_KEYDOWN:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	754 switch (eng.event.key.keysym.sym)
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 {
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	756 case SDLK_ESCAPE:
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	757 case SDLK_q:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	758 eng.exitFlag = TRUE;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	760
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	761 case SDLK_SPACE:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	762 eng.pauseFlag = !eng.pauseFlag;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	763 SDL_PauseAudio(eng.pauseFlag);
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	764 break;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	765
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	766 case SDLK_LEFT:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	767 if (eng.actChannel > 0)
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	768 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	769 eng.actChannel--;
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	770 needUpdate = TRUE;
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	771 }
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	772 break;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	773
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	774 case SDLK_RIGHT:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	775 if (eng.actChannel < eng.mod->nchannels - 1)
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	776 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	777 eng.actChannel++;
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	778 needUpdate = TRUE;
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	779 }
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	780 break;
ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	781
198 4568c479541c Make 'm' key mute all but selected active channel. Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	782 case SDLK_m:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	783 if (eng.event.key.keysym.mod & KMOD_SHIFT)
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	784 {
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	785 muteState = !muteState;
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	786 dmMuteChannels(muteState);
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	787 }
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	788 else
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	789 if (eng.event.key.keysym.mod & KMOD_CTRL)
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	790 {
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	791 dmMuteChannels(FALSE);
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	792 }
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	793 else
bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	794 {
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	795 jvmMute(eng.dev, eng.actChannel, !jvmGetMute(eng.dev, eng.actChannel));
203 bed7457cd8da Improve channel mute control. Now shift+M will toggle mute of all channels, Matti Hamalainen <ccr@tnsp.org> parents: 201 diff changeset	796 }
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	797 needUpdate = TRUE;
198 4568c479541c Make 'm' key mute all but selected active channel. Matti Hamalainen <ccr@tnsp.org> parents: 190 diff changeset	798 break;
147 ead759da30b4 Various improvements, implement channel muting. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	799
167 e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	800 case SDLK_PAGEUP:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	801 JSS_LOCK(eng.dev);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	802 JSS_LOCK(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	803 jmpChangeOrder(eng.plr, dmClamp(eng.plr->order - 1, 0, eng.mod->norders));
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	804 JSS_UNLOCK(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	805 JSS_UNLOCK(eng.dev);
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	806 needUpdate = TRUE;
167 e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	807 break;
e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	808
e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	809 case SDLK_PAGEDOWN:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	810 JSS_LOCK(eng.dev);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	811 JSS_LOCK(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	812 jmpChangeOrder(eng.plr, dmClamp(eng.plr->order + 1, 0, eng.mod->norders));
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	813 JSS_UNLOCK(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	814 JSS_UNLOCK(eng.dev);
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	815 needUpdate = TRUE;
167 e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	816 break;
e281663f04ba Implement moving around in order list via pageup/down. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	817
179 b29c9a2fbeb5 Add full screen switching to PPL via 'f' key, and various other Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	818 case SDLK_f:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	819 eng.optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	820 if (SDL_SetWindowFullscreen(eng.window, eng.optVFlags) != 0)
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	821 goto exit;
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	822 needUpdate = TRUE;
179 b29c9a2fbeb5 Add full screen switching to PPL via 'f' key, and various other Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	823 break;
b29c9a2fbeb5 Add full screen switching to PPL via 'f' key, and various other Matti Hamalainen <ccr@tnsp.org> parents: 176 diff changeset	824
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	825 default:
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	831 case SDL_WINDOWEVENT:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	832 switch (eng.event.window.event)
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	833 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	834 case SDL_WINDOWEVENT_EXPOSED:
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	835 needUpdate = TRUE;
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	836 break;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	838 case SDL_WINDOWEVENT_RESIZED:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	839 eng.optScrWidth = eng.event.window.data1;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	840 eng.optScrHeight = eng.event.window.data2;
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	841 if (!dmInitializeVideo())
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	842 goto exit;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843
1568 61495ea0767e Rename some variables to be more meaningful. Matti Hamalainen <ccr@tnsp.org> parents: 1564 diff changeset	844 needUpdate = TRUE;
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	845 break;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	846 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	848
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 case SDL_QUIT:
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	850 eng.exitFlag = TRUE;
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 break;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	852 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	854 // Check for end of song
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	855 JSS_LOCK(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	856 if (!eng.plr->isPlaying)
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	857 eng.exitFlag = TRUE;
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	858 JSS_UNLOCK(eng.plr);
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1199 diff changeset	859
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	860 if (optUseGUI)
296 6d62918739c6 Improve screen update logic. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	861 {
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	862 // Check if we need to update screen
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	863 JSS_LOCK(eng.plr);
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	864 JSSPattern *currPattern = eng.plr->pattern;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	865 int currRow = eng.plr->row;
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	866 JSS_UNLOCK(eng.plr);
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	867
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	868 if (currRow != prevRow \|\| needUpdate)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	869 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	870 prevRow = currRow;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	871 needUpdate = TRUE;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	872 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	873
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	874 // Draw frame
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	875 if (needUpdate)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	876 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	877 dmClearSurface(eng.screen, col.boxBg);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	879 dmDrawBMTextQ(eng.screen, font, DMD_TRANSPARENT, 5, 5,
2283 2c90e455f006 Bump copyright. Matti Hamalainen <ccr@tnsp.org> parents: 2275 diff changeset	880 "%s v%s by ccr/TNSP - (c) Copyright 2012-2019 TNSP",
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	881 dmProgDesc, dmProgVersion);
176 dfe7e392ea7e Optimize screen updates. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	882
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	883 dmDrawBMTextQ(eng.screen, font, DMD_TRANSPARENT, 5, 5 + (font->height + 2),
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	884 "Song: '%s'",
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	885 eng.mod->moduleName);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	886
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	887 dmDisplayPattern(eng.screen, 5, 5 + (font->height + 2) * 3 + 4,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	888 eng.screen->w - 6,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	889 eng.screen->h * 0.8,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	890 currPattern, currRow);
151 8708b0354eb8 Various improvements and small optimizations in display drawing/updating. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	891
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	892 JSS_LOCK(eng.plr);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	893 dmDrawBMTextQ(eng.screen, font, DMD_TRANSPARENT, 5, 5 + (font->height + 2) * 2,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	894 "Tempo: %3d \| Speed: %3d \| Row: %3d/%-3d \| Order: %3d/%-3d \| Pattern: %3d/%-3d",
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	895 eng.plr->tempo, eng.plr->speed,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	896 eng.plr->row, (eng.plr->pattern != NULL) ? eng.plr->pattern->nrows : 0,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	897 eng.plr->order + 1, eng.mod->norders,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	898 eng.plr->npattern, eng.mod->npatterns);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	899 JSS_UNLOCK(eng.plr);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	900 needRender = TRUE;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	901 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	902
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	903 if (needUpdate \|\| currTick - prevTick >= (eng.pauseFlag ? 100 : 20))
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	904 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	905 JSS_LOCK(eng.dev);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	906 dmDisplayChannels(eng.screen, 5, eng.screen->h * 0.8 + 5,
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	907 eng.screen->w - 5, eng.screen->h - 5, eng.dev);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	908 JSS_UNLOCK(eng.dev);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	909 needRender = TRUE;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	910 }
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	912 if (needUpdate)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	913 prevTick = currTick;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	914
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	915 // Flip screen
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	916 if (needRender)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	917 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	918 SDL_Surface dst;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	919 SDL_LockTexture(eng.texture, NULL, &dst.pixels, &dst.pitch);
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	920
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	921 if (dst.pitch != eng.screen->pitch)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	922 eng.exitFlag = TRUE;
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	923 else
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	924 memcpy(dst.pixels, eng.screen->pixels, eng.screen->h * dst.pitch);
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1556 diff changeset	925
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	926 SDL_UnlockTexture(eng.texture);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	927
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	928 //SDL_RenderClear(eng.renderer);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	929 SDL_RenderCopy(eng.renderer, eng.texture, NULL, NULL);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	930 SDL_RenderPresent(eng.renderer);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	931 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	932 } // optUseGUI
296 6d62918739c6 Improve screen update logic. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	933
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	934 SDL_Delay(eng.pauseFlag ? 100 : 30);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 }
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	937 exit:
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	938 // Cleanup
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	939 if (optUseGUI)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	940 {
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	941 dmMsg(1, "GUI shutdown.\n");
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	942 if (eng.texture != NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	943 SDL_DestroyTexture(eng.texture);
2102 e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	944
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	945 if (eng.renderer != NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	946 SDL_DestroyRenderer(eng.renderer);
2102 e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	947
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	948 if (eng.window != NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	949 SDL_DestroyWindow(eng.window);
2102 e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	950
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	951 if (eng.screen != NULL)
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	952 SDL_FreeSurface(eng.screen);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	954 dmFreeBitmapFont(font);
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	955 }
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	956
ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	957 dmMsg(1, "Audio shutdown.\n");
290 61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	958 if (audioInit)
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	959 {
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	960 SDL_LockAudio();
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	961 SDL_PauseAudio(1);
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	962 SDL_UnlockAudio();
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	963 SDL_CloseAudio();
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	964 }
61cab36b6d32 Improve locking. Matti Hamalainen <ccr@tnsp.org> parents: 287 diff changeset	965
2017 3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	966 jmpClose(eng.plr);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	967 jvmClose(eng.dev);
3a768f8d409d Rename variable s/engine/eng/g to avoid aliasing with dmsimple::engine. This Matti Hamalainen <ccr@tnsp.org> parents: 1971 diff changeset	968 jssFreeModule(eng.mod);
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969
2275 ba696835f66d Add CLI-only mode to PPL (-C option). Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	970 dmMsg(1, "Shut down SDL.\n");
71 b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 if (initSDL)
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 SDL_Quit();
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	973
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	974 jssClose();
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976 return 0;
b908fda1036e Add a simplistic skeleton of a module player with SDL-based view. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 }

Mercurial > hg > dmlib

annotate tools/ppl.c @ 2305:3bcad61594b4