# HG changeset patch # User Matti Hamalainen # Date 1425731369 -7200 # Node ID 5e2b90e3e4bc69c6420c0ccdf072b4871748821f # Parent 22c71fa5698e7a282fb5141e830a4b09d98c4916 Fix hasData handling and include dmfile.h header. diff -r 22c71fa5698e -r 5e2b90e3e4bc tools/xm2jss.c --- a/tools/xm2jss.c Fri Mar 06 20:48:27 2015 +0200 +++ b/tools/xm2jss.c Sat Mar 07 14:29:29 2015 +0200 @@ -13,6 +13,7 @@ #include "dmlib.h" #include "dmargs.h" #include "dmres.h" +#include "dmfile.h" #include "dmmutex.h" @@ -633,8 +634,9 @@ jssI.ERelNote = inst->ERelNote; jssI.EFineTune = inst->EFineTune; jssI.EPanning = inst->EPanning; - jssI.hasData = (inst->data != NULL) ? TRUE : FALSE; jssI.convFlags = (inst->flags & jsf16bit) ? flags16 : flags8; + if (inst->data != NULL) + jssI.convFlags |= jsampHasData; } else JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Instrument #%d NULL!\n", instr);