changeset 1241:5e2b90e3e4bc

Fix hasData handling and include dmfile.h header.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Mar 2015 14:29:29 +0200
parents 22c71fa5698e
children e44a2b7abe07
files tools/xm2jss.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);