Mercurial > hg > dmlib

changeset 1118:de25e0f2b856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sNumForNotes conversion/handling in JSSMOD loader and xm2jss.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Mar 2015 03:33:25 +0200
parents 378e5914be1e
children 007a9446256c
files minijss/jloadjss.c tools/xm2jss.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jloadjss.c	Wed Mar 04 03:30:28 2015 +0200
+++ b/minijss/jloadjss.c	Wed Mar 04 03:33:25 2015 +0200
@@ -439,7 +439,7 @@
         for (i = 0; i < jsetNNotes; i++)
         {
             int snum = jssE.sNumForNotes[i];
-            einst->sNumForNotes[i] = (snum > 0) ? snum : jsetNotSet;
+            einst->sNumForNotes[i] = (snum > 0) ? snum - 1 : jsetNotSet;
         }
 
         jssCopyEnvelope(&(einst->volumeEnv), &jssE.volumeEnv);
--- a/tools/xm2jss.c	Wed Mar 04 03:30:28 2015 +0200
+++ b/tools/xm2jss.c	Wed Mar 04 03:33:25 2015 +0200
@@ -550,7 +550,7 @@
             for (i = 0; i < jsetNNotes; i++)
             {
                 int snum = einst->sNumForNotes[i];
-                jssE.sNumForNotes[i] = (snum != jsetNotSet) ? snum : 0;
+                jssE.sNumForNotes[i] = (snum != jsetNotSet) ? snum + 1: 0;
             }
             
             jssCopyEnvelope(&jssE.volumeEnv, &(einst->volumeEnv));