Mercurial > hg > dmlib

changeset 754:ce7acde37dc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 05 May 2013 03:34:32 +0300
parents 8dd6d512cbb2
children 614df17de975
files dmengine.h dmsimple.c
diffstat 2 files changed, 20 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dmengine.h	Sun May 05 03:06:48 2013 +0300
+++ b/dmengine.h	Sun May 05 03:34:32 2013 +0300
@@ -241,8 +241,6 @@
 
     SDL_Surface *screen;
     SDL_Event event;
-    SDL_AudioSpec optAfmt;
-    int optAudioSetup;
 
     int optVidWidth, optVidHeight,
         optVidDepth, optVFlags,
@@ -252,10 +250,15 @@
     int optResFlags;
     char *optDataPath, *optPackFilename;
 
+    SDL_AudioSpec optAfmt;
+    int optAudioSetup;
+    Uint8 * audioStreamBuf;
+    size_t audioStreamLen;
+
 #ifdef DM_USE_JSS
-    JSSMixer *dev;
-    JSSPlayer *plr;
-    int jss_format;
+    JSSMixer *jssDev;
+    JSSPlayer *jssPlr;
+    int jssFormat;
 #endif
 
 #ifdef DM_USE_TREMOR
--- a/dmsimple.c	Sun May 05 03:06:48 2013 +0300
+++ b/dmsimple.c	Sun May 05 03:34:32 2013 +0300
@@ -65,6 +65,9 @@
 {
     (void) userdata;
 
+    engine.audioStreamBuf = stream;
+    engine.audioStreamLen = len;
+
     if (engine.paused)
     {
         memset(stream, 0, len);
@@ -74,8 +77,8 @@
     {
 #ifdef DM_USE_JSS
         case DM_ASETUP_JSS:
-            if (engine.dev != NULL)
-                jvmRenderAudio(engine.dev, stream, len / jvmGetSampleSize(engine.dev));
+            if (engine.jssDev != NULL)
+                jvmRenderAudio(engine.jssDev, stream, len / jvmGetSampleSize(engine.jssDev));
             break;
 #endif
 #ifdef DM_USE_TREMOR
@@ -658,22 +661,22 @@
 
             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.jssFormat = JSS_AUDIO_S16; break;
+                case AUDIO_U16SYS: engine.jssFormat = JSS_AUDIO_U16; break;
+                case AUDIO_S8:     engine.jssFormat = JSS_AUDIO_S8; break;
+                case AUDIO_U8:     engine.jssFormat = 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.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq);
 
-            if ((engine.dev = jvmInit(engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
+            if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL)
             {
                 dmError("jvmInit() returned NULL, voi perkele.\n");
                 goto error_exit;
             }
 
-            if ((engine.plr = jmpInit(engine.dev)) == NULL)
+            if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL)
             {
                 dmError("jmpInit() returned NULL\n");
                 goto error_exit;