Mercurial > hg > dmlib

changeset 1266:c43c8e5118a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 25 May 2015 12:58:37 +0300
parents 4e074b9b4789 (current diff) 4e9deb14e67f (diff)
children ad13510c8e41
files
diffstat 3 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmengine.c	Mon May 25 12:58:23 2015 +0300
+++ b/src/dmengine.c	Mon May 25 12:58:37 2015 +0300
@@ -422,12 +422,12 @@
 }
 
 
-void enginePauseAudio(int status)
+void enginePauseAudio(DMEngineData *engine, int status)
 {
     if (status)
-        engine.audioStatus = SDL_AUDIO_PAUSED;
+        engine->audioStatus = SDL_AUDIO_PAUSED;
     else
-        engine.audioStatus = SDL_AUDIO_PLAYING;
+        engine->audioStatus = SDL_AUDIO_PLAYING;
 
     SDL_PauseAudio(status);
 }
@@ -497,7 +497,6 @@
     DMEngineData *engine = (DMEngineData *) userdata;
     if (engine == NULL)
         return 0;
-
     do
     {
         dmMutexLock(engine->audioStreamMutex);
@@ -543,7 +542,7 @@
         engine->audioSimBufSize = (engine->optAfmt.freq / 45) * engine->audioSampleSize;
         engine->audioSimBuf     = dmMalloc(engine->audioSimBufSize);
         engine->audioSimDone    = FALSE;
-        engine->audioSimThread  = SDL_CreateThread(engineAudioThreadFunc, NULL);
+        engine->audioSimThread  = SDL_CreateThread(engineAudioThreadFunc, engine);
         if (engine->audioSimThread == NULL)
             return DMERR_INIT_FAIL;
     }
--- a/src/dmengine.h	Mon May 25 12:58:23 2015 +0300
+++ b/src/dmengine.h	Mon May 25 12:58:37 2015 +0300
@@ -376,7 +376,7 @@
 
 int    engineInitAudioParts(DMEngineData *engine);
 void   engineAudioCallback(void *userdata, Uint8 *stream, int len);
-void   enginePauseAudio(int status);
+void   enginePauseAudio(DMEngineData *engine, int status);
 int    engineGetVideoAspect(int width, int height);
 
 
--- a/src/dmsimple.c	Mon May 25 12:58:23 2015 +0300
+++ b/src/dmsimple.c	Mon May 25 12:58:37 2015 +0300
@@ -822,7 +822,7 @@
     engine.startTime = SDL_GetTicks();
 
     SDL_LockAudio();
-    enginePauseAudio(0);
+    enginePauseAudio(&engine, 0);
     SDL_UnlockAudio();
 
     while (!engine.exitFlag)
@@ -928,7 +928,7 @@
     SDL_ShowCursor(SDL_ENABLE);
 
     SDL_LockAudio();
-    enginePauseAudio(1);
+    enginePauseAudio(&engine, 1);
 #ifdef DM_USE_JSS
     if (engine.optAudioSetup == DM_ASETUP_JSS)
     {