Mercurial > hg > dmlib
comparison 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 |
comparison
equal
deleted
inserted
replaced
1309:5ad7d780a09b | 1310:dce4730372c7 |
---|---|
327 if (memcmp(jssH.idMagic, "JM", 2) != 0) | 327 if (memcmp(jssH.idMagic, "JM", 2) != 0) |
328 { | 328 { |
329 if (probe) | 329 if (probe) |
330 return DMERR_NOT_SUPPORTED; | 330 return DMERR_NOT_SUPPORTED; |
331 else | 331 else |
332 { | |
332 JSSERROR(DMERR_NOT_SUPPORTED, DMERR_NOT_SUPPORTED, | 333 JSSERROR(DMERR_NOT_SUPPORTED, DMERR_NOT_SUPPORTED, |
333 "Not a JSSMOD file, header signature mismatch!\n"); | 334 "Not a JSSMOD file, header signature mismatch!\n"); |
335 } | |
334 } | 336 } |
335 | 337 |
336 if (jssH.idVersion != JSSMOD_VERSION) | 338 if (jssH.idVersion != JSSMOD_VERSION) |
337 { | 339 { |
338 if (probe) | 340 if (probe) |
339 return DMERR_VERSION; | 341 return DMERR_VERSION; |
340 else | 342 else |
341 JSSERROR(DMERR_VERSION, DMERR_VERSION, | 343 { |
342 "Unsupported version of JSSMOD 0x%2x, this version only supports 0x%2x!\n", | 344 JSSERROR(DMERR_VERSION, DMERR_VERSION, |
343 jssH.idVersion, JSSMOD_VERSION); | 345 "Unsupported version of JSSMOD 0x%2x, this version only supports 0x%2x!\n", |
346 jssH.idVersion, JSSMOD_VERSION); | |
347 } | |
344 } | 348 } |
345 | 349 |
346 // Read rest of the header | 350 // Read rest of the header |
347 if (!dmf_read_le16(inFile, &jssH.defFlags) || | 351 if (!dmf_read_le16(inFile, &jssH.defFlags) || |
348 !dmf_read_le16(inFile, &jssH.intVersion) || | 352 !dmf_read_le16(inFile, &jssH.intVersion) || |
349 !dmf_read_le16(inFile, &jssH.norders) || | 353 !dmf_read_le16(inFile, &jssH.norders) || |
350 !dmf_read_le16(inFile, &jssH.npatterns) || | 354 !dmf_read_le16(inFile, &jssH.npatterns) || |
351 !dmf_read_le16(inFile, &jssH.nextInstruments) || | 355 !dmf_read_le16(inFile, &jssH.nextInstruments) || |
352 !dmf_read_le16(inFile, &jssH.ninstruments) || | 356 !dmf_read_le16(inFile, &jssH.ninstruments) || |
353 !dmf_read_le16(inFile, &jssH.defRestartPos) || | 357 !dmf_read_le16(inFile, &jssH.defRestartPos) || |
358 | |
354 !dmf_read_byte(inFile, &jssH.nchannels) || | 359 !dmf_read_byte(inFile, &jssH.nchannels) || |
355 !dmf_read_byte(inFile, &jssH.defSpeed) || | 360 !dmf_read_byte(inFile, &jssH.defSpeed) || |
356 !dmf_read_byte(inFile, &jssH.defTempo) || | 361 !dmf_read_byte(inFile, &jssH.defTempo) || |
357 !dmf_read_byte(inFile, &jssH.patMode)) | 362 !dmf_read_byte(inFile, &jssH.patMode)) |
363 { | |
358 JSSERROR(DMERR_FREAD, DMERR_FREAD, | 364 JSSERROR(DMERR_FREAD, DMERR_FREAD, |
359 "Failed to read JSSMOD header #2.\n"); | 365 "Failed to read JSSMOD header #2.\n"); |
366 } | |
360 | 367 |
361 if (probe) | 368 if (probe) |
362 return DMERR_OK; | 369 return DMERR_OK; |
363 | 370 |
364 // Check some of the things for sanity | 371 // Check some of the things for sanity |
429 index, jssP.nrows); | 436 index, jssP.nrows); |
430 | 437 |
431 // Allocate pattern | 438 // Allocate pattern |
432 pattern = module->patterns[index] = jssAllocatePattern(jssP.nrows, module->nchannels); | 439 pattern = module->patterns[index] = jssAllocatePattern(jssP.nrows, module->nchannels); |
433 if (pattern == NULL) | 440 if (pattern == NULL) |
441 { | |
434 JSSERROR(DMERR_MALLOC, DMERR_MALLOC, | 442 JSSERROR(DMERR_MALLOC, DMERR_MALLOC, |
435 "Could not allocate memory for pattern #%d.\n", | 443 "Could not allocate memory for pattern #%d.\n", |
436 index); | 444 index); |
445 } | |
437 | 446 |
438 // Get pattern data | 447 // Get pattern data |
439 switch (jssH.patMode) | 448 switch (jssH.patMode) |
440 { | 449 { |
441 #ifdef JM_SUP_PATMODE_1 | 450 #ifdef JM_SUP_PATMODE_1 |