[Gemrb-commits] gemrb: branch master updated. v0.7.0-23-ga54bbbc

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a54bbbc530be8e579802a4365dddc9cf9029ccd5 (commit)

Summary of changes:
 gemrb/plugins/OpenALAudio/OpenALAudio.cpp |    2 ++
 gemrb/plugins/SDLVideo/SDLVideo.cpp       |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
      from  876804a73e54fdd385479c4acc3f40845086549d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a54bbbc530be8e579802a4365dddc9cf9029ccd5

commit a54bbbc530be8e579802a4365dddc9cf9029ccd5
Author: Brad Allred <bra...@me...>
Date:   Tue Jan 3 13:59:18 2012 -0700

    Fix/hack for iOS being unable to play audio after GemRB has been suspended and resumed.

diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
index fde5bcc..2118500 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
@@ -806,6 +806,8 @@ int OpenALAudioDriver::MusicManager(void* arg)
 				default:
 					printMessage("OpenAL", "WARNING: Unhandled Music state", WHITE );
 					printStatus("ERROR", YELLOW);
+				//no break
+				case AL_PAUSED:
 					driver->MusicPlaying = false;
 					return -1;
 				case AL_INITIAL:
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index e7f9097..b3bafbd 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -610,6 +610,12 @@ int SDLVideoDriver::PollEvents() {
 					SDL_Window* window;
 					window = SDL_GetFocusWindow();
 					window->surface_valid = SDL_TRUE;//private attribute!!!
+
+					// FIXME:
+					// sleep for a short while to avoid some unknown Apple threading issue with OpenAL threads being suspended
+					// even using Apple examples of how to properly suspend an OpenAL context and resume on iOS are falling flat
+					// it could be this bug affects only the simulator.
+					sleep(1);
 #endif
 					core->GetAudioDrv()->Resume();//this is for ANDROID mostly
 					break;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator