# HG changeset patch # User Matti Hamalainen # Date 1425658443 -7200 # Node ID e8c99da451cd9efdfb40c5b3665fa4d3579db5d4 # Parent 8b6ed580e80036de18d5f576e97fe7a063c8837a Cosmetics. diff -r 8b6ed580e800 -r e8c99da451cd minijss/jssmod.c --- a/minijss/jssmod.c Fri Mar 06 16:37:15 2015 +0200 +++ b/minijss/jssmod.c Fri Mar 06 18:14:03 2015 +0200 @@ -351,7 +351,7 @@ JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern structure.\n"); // Allocate notedata - pattern->data = dmCalloc(nrows * nchannels, sizeof(JSSNote)); + pattern->data = dmMalloc(nrows * nchannels * sizeof(JSSNote)); if (pattern->data == NULL) { dmFree(pattern); @@ -359,8 +359,8 @@ nchannels); } - // Initialize - pattern->nrows = nrows; + // Initialize structure + pattern->nrows = nrows; pattern->nchannels = nchannels; pnote = pattern->data; @@ -375,7 +375,6 @@ } } - // OK, return pointer to struct return pattern; } diff -r 8b6ed580e800 -r e8c99da451cd minijss/jssmod.h --- a/minijss/jssmod.h Fri Mar 06 16:37:15 2015 +0200 +++ b/minijss/jssmod.h Fri Mar 06 18:14:03 2015 +0200 @@ -304,10 +304,13 @@ JSSModule * jssAllocateModule(void); int jssFreeModule(JSSModule * module); + JSSPattern * jssAllocatePattern(const int nrows, const int nchannels); void jssFreePattern(JSSPattern *pattern); + JSSInstrument * jssAllocateInstrument(void); void jssFreeInstrument(JSSInstrument *inst); + JSSExtInstrument * jssAllocateExtInstrument(void); void jssFreeExtInstrument(JSSExtInstrument *inst); diff -r 8b6ed580e800 -r e8c99da451cd tools/objlink.c --- a/tools/objlink.c Fri Mar 06 16:37:15 2015 +0200 +++ b/tools/objlink.c Fri Mar 06 18:14:03 2015 +0200 @@ -265,7 +265,7 @@ dmErrorMsg("Section start address '%s' in '%s' invalid.\n", str, arg); goto error; } - + // Check for name namesep = strchr(sep + 1, ','); if (canHasName && namesep != NULL) @@ -437,7 +437,7 @@ default: dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n", p[1], optArg); - return FALSE; + return FALSE; } } if (!dmGetIntVal(optArg, &tmpi)) @@ -708,7 +708,7 @@ siz = (curr->start - 1) - (prev->end + 1) + 1; else siz = 0; - + if (prev != NULL && siz > 1) { kz = siz / (1024 * 2); diff -r 8b6ed580e800 -r e8c99da451cd tools/packed.c --- a/tools/packed.c Fri Mar 06 16:37:15 2015 +0200 +++ b/tools/packed.c Fri Mar 06 18:14:03 2015 +0200 @@ -118,7 +118,7 @@ optDefResFlags = i; } break; - + case 9: if (nexcFilenames < SET_MAX_FILES) { @@ -630,7 +630,7 @@ // Parse arguments dmInitProg("packed", "Pack File Editor", "0.5", NULL, NULL); dmVerbosity = 0; - + if (!dmArgsProcess(argc, argv, optList, optListN, argHandleOpt, argHandleFile, OPTH_BAILOUT)) exit(1); @@ -646,7 +646,7 @@ exit(0); return 0; } - + dmMsg(1, "Processing %s ...\n", optPackFilename); // Execute command @@ -719,7 +719,7 @@ for (node = pack->entries; node != NULL; node = node->next) { BOOL match; - + // Check for matches in specified filenames/patterns if (nsrcFilenames > 0) { @@ -763,7 +763,7 @@ for (node = pack->entries; node != NULL; node = node->next) { BOOL match; - + // Check for matches if (nsrcFilenames > 0) { @@ -791,7 +791,7 @@ } dmMsg(1, "c=%d\n", dmPackClose(pack)); - + if (resFile != NULL) fclose(resFile); } diff -r 8b6ed580e800 -r e8c99da451cd tools/ppl.c --- a/tools/ppl.c Fri Mar 06 16:37:15 2015 +0200 +++ b/tools/ppl.c Fri Mar 06 18:14:03 2015 +0200 @@ -93,7 +93,7 @@ case 1: dmVerbosity++; break; - + case 2: engine.optVFlags |= SDL_FULLSCREEN; break; @@ -111,7 +111,7 @@ engine.optScrWidth = w; engine.optScrHeight = h; } - else + else { dmErrorMsg("Invalid size argument '%s'.\n", optArg); return FALSE; @@ -156,7 +156,7 @@ dmErrorMsg("Unknown option '%s'.\n", currArg); return FALSE; } - + return TRUE; } @@ -170,7 +170,7 @@ dmErrorMsg("Too many filename arguments '%s'\n", currArg); return FALSE; } - + return TRUE; } @@ -190,12 +190,12 @@ xc += 4; continue; } - + if (ch >= 0 && ch < font->nglyphs && (glyph = font->glyphs[ch]) != NULL) { if (blit == NULL) blit = dmGetUnscaledBlitFunc(glyph->format, screen->format, mode); - + blit(glyph, xc, yc, screen); xc += font->width; } @@ -216,7 +216,7 @@ void dmDrawBMTextQ(SDL_Surface *screen, DMBitmapFont *font, int mode, int xc, int yc, const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); dmDrawBMTextVAQ(screen, font, mode, xc, yc, fmt, ap); va_end(ap); @@ -310,10 +310,10 @@ qheight = y1 - y0, nwidth = jsetNChannels, nheight = 1; - + if (qheight < 40) return; - + while (qwidth / nwidth <= 60 && qheight / nheight >= 40) { nheight++; @@ -321,7 +321,7 @@ } // fprintf(stderr, "%d x %d\n", nwidth, nheight); - + if (qheight / nheight <= 40) { nwidth = qwidth / 60; @@ -330,7 +330,7 @@ qwidth /= nwidth; qheight /= nheight; - + for (nchannel = qy = 0; qy < nheight && nchannel < jsetNChannels; qy++) { for (qx = 0; qx < nwidth && nchannel < jsetNChannels; qx++) @@ -371,7 +371,7 @@ { char text[32]; char *ptr = text; - + switch (n->note) { case jsetNotSet: @@ -434,7 +434,7 @@ *ptr++ = dmHexVal(n->volume); } *ptr++ = '_'; - + if (n->effect >= 0 && n->effect < jmpNMODEffectTable) *ptr++ = jmpMODEffectTable[n->effect]; else @@ -480,7 +480,7 @@ for (nchannel = 0; nchannel < qwidth; nchannel++) { - int bx0 = x0 + lwidth + 1 + nchannel * cwidth, + int bx0 = x0 + lwidth + 1 + nchannel * cwidth, bx1 = bx0 + cwidth; dmFillRect(screen, bx0+1, qy0+1, bx1-1, qy1-1, @@ -492,7 +492,7 @@ for (nchannel = 0; nchannel < qwidth; nchannel++) { - int bx0 = x0 + lwidth + 1 + nchannel * cwidth, + int bx0 = x0 + lwidth + 1 + nchannel * cwidth, bx1 = bx0 + cwidth; dmDrawVLine(screen, qy0 + 1, qy1 - 1, bx1, col.viewDiv); @@ -502,17 +502,17 @@ dmDrawBMTextConstQ(screen, font, DMD_TRANSPARENT, bx0 + (cwidth - font->width * 5) / 2, qy1 + 3, "MUTED"); } - + dmDrawBMTextQ(screen, font, DMD_TRANSPARENT, bx0 + (cwidth - font->width * 3) / 2, y0 + 1, "%3d", nchannel + choffs); } - + for (nrow = 0; nrow < qheight; nrow++) { int crow = nrow - midrow + row; yc = qy0 + 2 + (font->height + 1) * nrow; - + if (crow >= 0 && crow < pat->nrows) { dmDrawBMTextQ(screen, font, DMD_TRANSPARENT, x0, yc, "%03d", crow); @@ -574,7 +574,7 @@ dmErrorMsg("No filename specified.\n"); return 1; } - + if ((result = dmf_create_stdio(optFilename, "rb", &file)) != DMERR_OK) { dmErrorMsg("Error opening file '%s', %d: (%s)\n", @@ -659,7 +659,7 @@ dmErrorMsg("jvmInit() returned NULL\n"); goto error_exit; } - + switch (optOutFormat) { case JSS_AUDIO_S16: engine.afmt.format = AUDIO_S16SYS; break; @@ -686,14 +686,14 @@ goto error_exit; } audioInit = TRUE; - + // Initialize player if ((engine.plr = jmpInit(engine.dev)) == NULL) { dmErrorMsg("jmpInit() returned NULL\n"); goto error_exit; } - + jvmSetCallback(engine.dev, jmpExec, engine.plr); jmpSetModule(engine.plr, engine.mod); jmpPlayOrder(engine.plr, optStartOrder); @@ -721,7 +721,7 @@ SDL_UnlockAudio(); int currTick, prevTick = 0, prevRow = -1; - + while (!engine.exitFlag) { currTick = SDL_GetTicks(); @@ -736,7 +736,7 @@ case SDLK_ESCAPE: engine.exitFlag = TRUE; break; - + case SDLK_SPACE: engine.pauseFlag = !engine.pauseFlag; SDL_PauseAudio(engine.pauseFlag); @@ -832,13 +832,13 @@ if (!engine.plr->isPlaying) engine.exitFlag = TRUE; JSS_UNLOCK(engine.plr); - + if (currRow != prevRow || force) { prevRow = currRow; force = TRUE; } - + // Draw frame if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0) { @@ -849,7 +849,7 @@ if (force) { dmClearSurface(engine.screen, col.boxBg); - + dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5, "%s v%s by ccr/TNSP - (c) Copyright 2012-2015 TNSP", dmProgDesc, dmProgVersion); dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5 + 12 + 11, @@ -859,7 +859,7 @@ dmDisplayPattern(engine.screen, 5, 40, engine.screen->w - 6, engine.screen->h * 0.8, currPattern, currRow); - + JSS_LOCK(engine.plr); dmDrawBMTextQ(engine.screen, font, DMD_TRANSPARENT, 5, 5 + 12, "Tempo: %3d | Speed: %3d | Row: %3d/%-3d | Order: %3d/%-3d | Pattern: %3d/%-3d", diff -r 8b6ed580e800 -r e8c99da451cd tools/view64.c --- a/tools/view64.c Fri Mar 06 16:37:15 2015 +0200 +++ b/tools/view64.c Fri Mar 06 18:14:03 2015 +0200 @@ -69,7 +69,7 @@ case 1: dmVerbosity++; break; - + case 2: optVFlags |= SDL_FULLSCREEN; break; @@ -114,12 +114,12 @@ } } break; - + default: dmErrorMsg("Unknown option '%s'.\n", currArg); return FALSE; } - + return TRUE; } @@ -164,7 +164,7 @@ int ret; dmSetScaleFactor(2.0); - + dmInitProg("view64", "Display some C64 bitmap graphics formats", "0.2", NULL, NULL); /* Parse arguments */ @@ -178,7 +178,7 @@ dmErrorMsg("No input file specified, perhaps you need some --help\n"); goto error; } - + if ((ret = dmReadDataFile(NULL, optFilename, &dataBuf, &dataSize)) != DMERR_OK) goto error; @@ -271,14 +271,14 @@ switch (event.key.keysym.sym) { case SDLK_ESCAPE: exitFlag = TRUE; break; - + default: break; } needRedraw = TRUE; break; - + case SDL_VIDEORESIZE: optScrWidth = event.resize.w; optScrHeight = event.resize.h; @@ -287,7 +287,7 @@ needRedraw = TRUE; break; - + case SDL_VIDEOEXPOSE: needRedraw = TRUE; break; @@ -295,7 +295,7 @@ case SDL_QUIT: exit(0); } - + if (needRedraw) { float aspect = (float) bmap.height / (float) bmap.width; @@ -307,7 +307,7 @@ dmErrorMsg("Can't lock surface.\n"); goto error; } - + dmScaledBlitSurface8to8(surf, 0, ypos, optScrWidth, sheight, screen); SDL_SetColors(screen, (SDL_Color *)dmC64Palette, 0, C64_NCOLORS); @@ -317,7 +317,7 @@ SDL_Flip(screen); needRedraw = FALSE; } - + SDL_Delay(100); }