Mercurial > hg > dmlib
diff minijss/jloadjss.c @ 1310:dce4730372c7
Add some blocks, cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 20 Aug 2017 01:01:12 +0300 |
parents | 197c9ccdb33c |
children | f1c4b9b074ad |
line wrap: on
line diff
--- a/minijss/jloadjss.c Sat Aug 19 15:27:43 2017 +0300 +++ b/minijss/jloadjss.c Sun Aug 20 01:01:12 2017 +0300 @@ -329,8 +329,10 @@ if (probe) return DMERR_NOT_SUPPORTED; else + { JSSERROR(DMERR_NOT_SUPPORTED, DMERR_NOT_SUPPORTED, "Not a JSSMOD file, header signature mismatch!\n"); + } } if (jssH.idVersion != JSSMOD_VERSION) @@ -338,9 +340,11 @@ if (probe) return DMERR_VERSION; else - JSSERROR(DMERR_VERSION, DMERR_VERSION, - "Unsupported version of JSSMOD 0x%2x, this version only supports 0x%2x!\n", - jssH.idVersion, JSSMOD_VERSION); + { + JSSERROR(DMERR_VERSION, DMERR_VERSION, + "Unsupported version of JSSMOD 0x%2x, this version only supports 0x%2x!\n", + jssH.idVersion, JSSMOD_VERSION); + } } // Read rest of the header @@ -351,12 +355,15 @@ !dmf_read_le16(inFile, &jssH.nextInstruments) || !dmf_read_le16(inFile, &jssH.ninstruments) || !dmf_read_le16(inFile, &jssH.defRestartPos) || + !dmf_read_byte(inFile, &jssH.nchannels) || !dmf_read_byte(inFile, &jssH.defSpeed) || !dmf_read_byte(inFile, &jssH.defTempo) || !dmf_read_byte(inFile, &jssH.patMode)) + { JSSERROR(DMERR_FREAD, DMERR_FREAD, "Failed to read JSSMOD header #2.\n"); + } if (probe) return DMERR_OK; @@ -431,9 +438,11 @@ // Allocate pattern pattern = module->patterns[index] = jssAllocatePattern(jssP.nrows, module->nchannels); if (pattern == NULL) + { JSSERROR(DMERR_MALLOC, DMERR_MALLOC, "Could not allocate memory for pattern #%d.\n", index); + } // Get pattern data switch (jssH.patMode)