Mercurial > hg > dmlib

changeset 110:8db49a23b393

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to make the JSS audio subsystem support work again in the engine framework.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 03 Oct 2012 10:15:45 +0300
parents 3de6301dcfe1
children 22ba0490733b
files dmsimple.c dmsimple.h
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dmsimple.c	Wed Oct 03 09:57:05 2012 +0300
+++ b/dmsimple.c	Wed Oct 03 10:15:45 2012 +0300
@@ -340,9 +340,8 @@
     else
 #ifdef DM_USE_JSS
     {
-        JSSMixer *d = (JSSMixer *) userdata;
-        if (d != NULL)
-            jvmRenderAudio(d, stream, len / jvmGetSampleSize(d));
+        if (engine.dev != NULL)
+            jvmRenderAudio(engine.dev, stream, len / jvmGetSampleSize(engine.dev));
     }
 #endif
 #ifdef DM_USE_TREMOR
@@ -399,16 +398,16 @@
 
     switch (engine.optAfmt.format)
     {
-        case AUDIO_S16SYS: engine.jss.format = JSS_AUDIO_S16; break;
-        case AUDIO_U16SYS: engine.jss.format = JSS_AUDIO_U16; break;
-        case AUDIO_S8:     engine.jss.format = JSS_AUDIO_S8; break;
-        case AUDIO_U8:     engine.jss.format = JSS_AUDIO_U8; break;
+        case AUDIO_S16SYS: engine.jss_format = JSS_AUDIO_S16; break;
+        case AUDIO_U16SYS: engine.jss_format = JSS_AUDIO_U16; break;
+        case AUDIO_S8:     engine.jss_format = JSS_AUDIO_S8; break;
+        case AUDIO_U8:     engine.jss_format = JSS_AUDIO_U8; break;
     }
 
     dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
-        engine.jss.format, engine.optAfmt.channels, engine.optAfmt.freq);
+        engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq);
 
-    if ((engine.dev = jvmInit(engine.jss.format, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
+    if ((engine.dev = jvmInit(engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
     {
         dmError("jvmInit() returned NULL, voi perkele.\n");
         goto error_exit;
--- a/dmsimple.h	Wed Oct 03 09:57:05 2012 +0300
+++ b/dmsimple.h	Wed Oct 03 10:15:45 2012 +0300
@@ -30,6 +30,7 @@
 #ifdef DM_USE_JSS
     JSSMixer *dev;
     JSSPlayer *plr;
+    int jss_format;
 #endif
 
 #ifdef DM_USE_TREMOR