Mercurial > hg > dmlib

changeset 779:954b1b392c8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore old note frequency calculation for now.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 24 May 2013 01:34:20 +0300
parents a4cf7716ba58
children 88ee233bf849
files dmengine.c minijss/jssplr.c
diffstat 2 files changed, 40 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dmengine.c	Fri May 24 01:34:00 2013 +0300
+++ b/dmengine.c	Fri May 24 01:34:20 2013 +0300
@@ -134,20 +134,40 @@
 
 
 #ifdef JSS_SUP_XM
-static int engineResModuleLoad(DMResource *res)
+static int engineResXMModuleLoad(DMResource *res)
 {
     return jssLoadXM(res, (JSSModule **) &(res->resData));
 }
 
-static void engineResModuleFree(DMResource *res)
+static void engineResXMModuleFree(DMResource *res)
 {
     jssFreeModule((JSSModule *) res->resData);
 }
 
-static BOOL engineResModuleProbe(DMResource *res, const char *fext)
+static BOOL engineResXMModuleProbe(DMResource *res, const char *fext)
 {
     (void) res;
-    return fext != NULL && (strcasecmp(fext, ".xm") == 0 || strcasecmp(fext, ".jmod") == 0);
+    return fext != NULL && strcasecmp(fext, ".xm") == 0;
+}
+#endif
+
+
+#ifdef JSS_SUP_JSSMOD
+static int engineResJSSModuleLoad(DMResource *res)
+{
+    return jssLoadJSSMOD(res, (JSSModule **) &(res->resData));
+}
+
+static void engineResJSSModuleFree(DMResource *res)
+{
+    jssFreeModule((JSSModule *) res->resData);
+}
+
+static BOOL engineResJSSModuleProbe(DMResource *res, const char *fext)
+{
+    (void) res;
+    return fext != NULL &&
+        (strcasecmp(fext, ".jss") == 0 || strcasecmp(fext, ".jmod") == 0);
 }
 #endif
 
@@ -249,11 +269,19 @@
         engineResImageFree
     },
 
+#ifdef JSS_SUP_JSSMOD
+    {
+        engineResJSSModuleProbe,
+        engineResJSSModuleLoad,
+        engineResJSSModuleFree
+    },
+#endif
+
 #ifdef JSS_SUP_XM
     {
-        engineResModuleProbe,
-        engineResModuleLoad,
-        engineResModuleFree
+        engineResXMModuleProbe,
+        engineResXMModuleLoad,
+        engineResXMModuleFree
     },
 #endif
 
@@ -264,6 +292,7 @@
         engineResVorbisFree
     },
 #endif
+
 };
 
 static const int nengineResOps = sizeof(engineResOps) / sizeof(engineResOps[0]);
--- a/minijss/jssplr.c	Fri May 24 01:34:00 2013 +0300
+++ b/minijss/jssplr.c	Fri May 24 01:34:20 2013 +0300
@@ -5,6 +5,8 @@
  */
 #include "jssplr.h"
 
+#include <math.h>
+
 /* Miscellaneous tables
  */
 static const Uint8 jmpSineTab[32] =
@@ -97,8 +99,8 @@
         else
         {
             // Frequency = Frequency = 8363*2^((6*12*16*4 - Period) / (12*16*4))
-            //chn->cfreq = chn->freq = 8363.0f * pow(2.0f, (4608.0f - (double) value) / 768.0f);
-            chn->cfreq = chn->freq = 8363 * (1 << ((4608 - value) / 768));
+            chn->cfreq = chn->freq = 8363.0f * pow(2.0f, (4608.0f - (double) value) / 768.0f);
+            //chn->cfreq = chn->freq = 8363 * (1 << ((4608 - value) / 768));
         }
 
         JMPSETNDFLAGS(cdfNewFreq);