From bb0993b6eb9277594133e113287b4a937a2a5d09 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Mon, 15 Jul 2013 20:36:18 +0200
Subject: [PATCH] Fix Android build.

---
 audio/thread_wrapper.c |  2 +-
 dynamic.c              | 14 +++++++++++++-
 retroarch.c            |  5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/audio/thread_wrapper.c b/audio/thread_wrapper.c
index b7d5fa2a8f..387bb0ea0f 100644
--- a/audio/thread_wrapper.c
+++ b/audio/thread_wrapper.c
@@ -110,7 +110,7 @@ static bool audio_thread_start(void *data)
 
 static void audio_thread_set_nonblock_state(void *data, bool state)
 {
-   audio_thread_t *thr = (audio_thread_t*)data;
+   (void)data;
    (void)state;
 }
 
diff --git a/dynamic.c b/dynamic.c
index d49ac9d862..401b1f4e46 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -729,8 +729,16 @@ static bool environment_cb(unsigned cmd, void *data)
          RARCH_LOG("Environ SET_AUDIO_CALLBACK.\n");
          const struct retro_audio_callback *info = (const struct retro_audio_callback*)data;
 
-         if (g_extern.recording || g_extern.netplay_enable) // A/V sync is a must.
+#ifdef HAVE_FFMPEG
+         if (g_extern.recording) // A/V sync is a must.
             return false;
+#endif
+
+#ifdef HAVE_NETPLAY
+         if (g_extern.netplay_enable)
+            return false;
+#endif
+
          g_extern.system.audio_callback = info->callback;
          break;
       }
@@ -739,8 +747,12 @@ static bool environment_cb(unsigned cmd, void *data)
       case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK:
       {
          RARCH_LOG("Environ SET_FRAME_TIME_CALLBACK.\n");
+
+#ifdef HAVE_NETPLAY
          if (g_extern.netplay_enable) // retro_run() will be called in very strange and mysterious ways, have to disable it.
             return false;
+#endif
+
          const struct retro_frame_time_callback *info = (const struct retro_frame_time_callback*)data;
          g_extern.system.frame_time = *info;
          break;
diff --git a/retroarch.c b/retroarch.c
index 33e524352d..941722b032 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2993,7 +2993,10 @@ static inline void update_frame_time(void)
    rarch_time_t time = rarch_get_time_usec();
    rarch_time_t delta = 0;
 
-   bool is_locked_fps = g_extern.is_paused || driver.nonblock_state || g_extern.recording;
+   bool is_locked_fps = g_extern.is_paused || driver.nonblock_state;
+#ifdef HAVE_FFMPEG
+   is_locked_fps |= g_extern.recording;
+#endif
    
    if (!g_extern.system.frame_time_last || is_locked_fps)
       delta = g_extern.system.frame_time.reference;