audiotrack: reset and play after a DEAD_OBJECT error

8d6d383a · Thomas Guillem · 57fa6824 · 8d6d383a
Commit 8d6d383a authored Jul 08, 2015 by Thomas Guillem
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

modules/audio_output/audiotrack.c modules/audio_output/audiotrack.c +6 -1

No files found.
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -1314,7 +1314,12 @@ AudioTrack_Play( JNIEnv *env, audio_output_t *p_aout,
        {
            msg_Warn( p_aout, "ERROR_DEAD_OBJECT: "
                              "try recreating AudioTrack" );
-            i_ret = AudioTrack_Recreate( env, p_aout );
+            if( ( i_ret = AudioTrack_Recreate( env, p_aout ) ) == 0 )
+            {
+                AudioTrack_Reset( env, p_aout );
+                JNI_AT_CALL_VOID( play );
+                CHECK_AT_EXCEPTION( "play" );
+            }
        } else
        {
            const char *str;