Merge remote-tracking branch 'upstream/unstable' into gfx-rdp

include/mixer.h

@@ -357,6 +357,18 @@ void mixer_unthrottle(void);
  */
 void mixer_poll(int16_t *out, int nsamples);
 
+/**
+ * @brief Request the mixer to try and write audio samples to be played,
+ * if possible.
+ * 
+ * This function is a user helper for asking the mixer and audio subsystems
+ * to play audio during a game frame. You should call this function many times
+ * during one frame (eg. during the render step or after processing each game
+ * object) as many times as necessary. Not polling the audio subsystem often
+ * enough will result in audio stutter. 
+ */
+void mixer_try_play();
+
 /**
  * @brief Callback invoked by mixer_poll at a specified time
  * 

src/audio/mixer.c

@@ -750,3 +750,13 @@ void mixer_poll(int16_t *out16, int num_samples) {
 		}
 	}
 }
+
+void mixer_try_play()
+{
+    if (audio_can_write())
+    {
+        short *buf = audio_write_begin();
+        mixer_poll(buf, audio_get_buffer_length());
+        audio_write_end();
+    }
+}