fixed music still being played in Android version when in background

diff --git a/ChangeLog b/ChangeLog
index 5530b2828446b9a23b7a0e09b502c8f677df30df..b1896e90b1b9c95a69088c3a79287904a3dba7b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-08-30
+       * fixed music still being played in Android version when in background
+
 2014-08-30
        * added Android "menu" button to be treated as "yes" requester button
          (while the Android "back" button was already treated as "no" button)

diff --git a/src/conftime.h b/src/conftime.h
index 3affe7c9ba881e303dec43ae7b68cc6cc6edefce..0e3b4273fd9ad5a5df4cf734ebff8f2d92492d82 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-08-28 11:08"
+#define COMPILE_DATE_STRING "2014-08-28 16:55"

diff --git a/src/events.c b/src/events.c
index 8ca30fcec0babdd1f2516e5da9ce679695df43a7..d91a7c46d8d3ce9c5e70a47a207a43be7ec70fa8 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -175,6 +175,13 @@ void EventLoop(void)
          case EVENT_TEXTINPUT:
            HandleTextEvent((TextEvent *) &event);
            break;
+
+         case SDL_APP_WILLENTERBACKGROUND:
+         case SDL_APP_DIDENTERBACKGROUND:
+         case SDL_APP_WILLENTERFOREGROUND:
+         case SDL_APP_DIDENTERFOREGROUND:
+           HandlePauseResumeEvent((PauseResumeEvent *) &event);
+           break;
 #endif
 
          case EVENT_KEYPRESS:
@@ -976,6 +983,19 @@ void HandleTextEvent(TextEvent *event)
     HandleKey(key, KEY_RELEASED);
   }
 }
+
+void HandlePauseResumeEvent(PauseResumeEvent *event)
+{
+  if (event->type == SDL_APP_WILLENTERBACKGROUND)
+  {
+    Mix_PauseMusic();
+  }
+  else if (event->type == SDL_APP_DIDENTERFOREGROUND)
+  {
+    Mix_ResumeMusic();
+  }
+}
+
 #endif
 
 void HandleKeyEvent(KeyEvent *event)

diff --git a/src/events.h b/src/events.h
index 2b1022b0e442dba5b522d55d17b88d00b47e5da7..e358dc851e5e206cd961ca2e1b855f72c8bebed1 100644 (file)
--- a/src/events.h
+++ b/src/events.h
@@ -35,6 +35,7 @@ void HandleMotionEvent(MotionEvent *);
 void HandleWindowEvent(WindowEvent *);
 void HandleFingerEvent(FingerEvent *);
 void HandleTextEvent(TextEvent *);
+void HandlePauseResumeEvent(PauseResumeEvent *);
 #endif
 void HandleKeyEvent(KeyEvent *);
 void HandleFocusEvent(FocusChangeEvent *);

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 00b2698ad5cb209044da930b55a7ca8c3d3e54a0..fe4bf7daef4bc8bdf2fc5467a10bcd9a3923e701 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -86,6 +86,7 @@ typedef SDL_MouseMotionEvent  MotionEvent;
 #if defined(TARGET_SDL2)
 typedef SDL_TouchFingerEvent   FingerEvent;
 typedef SDL_TextInputEvent     TextEvent;
+typedef SDL_Event              PauseResumeEvent;
 typedef SDL_WindowEvent                WindowEvent;
 #endif
 typedef SDL_KeyboardEvent      KeyEvent;