Mercurial > hg > dmlib

comparison minijss/jloadjss.c @ 1236:b8c9af10b7fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on JSSMOD format.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 06 Mar 2015 16:36:10 +0200
parents beae399c6473
children 2be42ba9fc39
comparison
equal deleted inserted replaced
1235:5b8245e5f785 1236:b8c9af10b7fd
493 inst->flags = jssI.flags; 493 inst->flags = jssI.flags;
494 inst->C4BaseSpeed = jssI.C4BaseSpeed; 494 inst->C4BaseSpeed = jssI.C4BaseSpeed;
495 inst->ERelNote = jssI.ERelNote; 495 inst->ERelNote = jssI.ERelNote;
496 inst->EFineTune = jssI.EFineTune; 496 inst->EFineTune = jssI.EFineTune;
497 inst->EPanning = jssI.EPanning; 497 inst->EPanning = jssI.EPanning;
498 inst->hasData = jssI.hasData;
499 inst->convFlags = jssI.convFlags; 498 inst->convFlags = jssI.convFlags;
500 } 499 }
501 500
502 #ifdef JM_SUP_SAMPLES 501 #ifdef JM_SUP_SAMPLES
503 // Read sample data 502 // Read sample data
504 for (index = 0; index < module->ninstruments; index++) 503 for (index = 0; index < module->ninstruments; index++)
505 { 504 {
506 JSSInstrument *inst = module->instruments[index]; 505 JSSInstrument *inst = module->instruments[index];
507 if (inst != NULL && inst->hasData) 506 if (inst != NULL && inst->convFlags & jsampHasData)
508 { 507 {
509 int ret; 508 int ret;
510 size_t bsize = (inst->flags & jsf16bit) ? sizeof(Uint16) : sizeof(Uint8); 509 size_t bsize = (inst->flags & jsf16bit) ? sizeof(Uint16) : sizeof(Uint8);
511 bsize *= inst->size; 510 bsize *= inst->size;
512 511