Mercurial > hg > dmlib
comparison minijss/jloadjss.c @ 1219:62a76a3d9bc2
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 06 Mar 2015 09:45:55 +0200 |
parents | 30c2dbf05841 f57dc769bd39 |
children | a275b7382ffa |
comparison
equal
deleted
inserted
replaced
1218:30c2dbf05841 | 1219:62a76a3d9bc2 |
---|---|
347 "Could not allocate memory for module structure.\n"); | 347 "Could not allocate memory for module structure.\n"); |
348 } | 348 } |
349 *ppModule = module; | 349 *ppModule = module; |
350 | 350 |
351 // Copy header information | 351 // Copy header information |
352 module->defFlags = jssH.defFlags; | |
353 module->intVersion = jssH.intVersion; | |
354 | |
352 module->norders = jssH.norders; | 355 module->norders = jssH.norders; |
353 module->npatterns = jssH.npatterns; | 356 module->npatterns = jssH.npatterns; |
354 module->nchannels = jssH.nchannels; | 357 module->nchannels = jssH.nchannels; |
355 module->nextInstruments = jssH.nextInstruments; | 358 module->nextInstruments = jssH.nextInstruments; |
356 module->ninstruments = jssH.ninstruments; | 359 module->ninstruments = jssH.ninstruments; |
357 module->defFlags = jssH.defFlags; | |
358 module->intVersion = jssH.intVersion; | |
359 module->defRestartPos = jssH.defRestartPos; | 360 module->defRestartPos = jssH.defRestartPos; |
360 module->defSpeed = jssH.defSpeed; | 361 module->defSpeed = jssH.defSpeed; |
361 module->defTempo = jssH.defTempo; | 362 module->defTempo = jssH.defTempo; |
362 | 363 |
363 // Get the orders list | 364 // Get the orders list |