# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1349248545 -10800
# Node ID 8db49a23b393c6a87007330844c16b21030b0f18
# Parent  3de6301dcfe12c73c7e67b1a64bfa43cbf44bc24
Fixes to make the JSS audio subsystem support work again in the engine framework.

diff -r 3de6301dcfe1 -r 8db49a23b393 dmsimple.c
--- 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;
diff -r 3de6301dcfe1 -r 8db49a23b393 dmsimple.h
--- 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