Merge pull request #6 from h6ah4i/feature/tunnel_player_workaroundmaster

Implement Tunnel Player workaround code

1 files changed, 27 insertions, 0 deletions

diff --git a/src/com/pheelicks/app/MainActivity.java b/src/com/pheelicks/app/MainActivity.java
index 1b38f44..a2d52dd 100644
--- a/src/com/pheelicks/app/MainActivity.java
+++ b/src/com/pheelicks/app/MainActivity.java
@@ -17,6 +17,7 @@ import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.view.View;
 
+import com.pheelicks.utils.TunnelPlayerWorkaround;
 import com.pheelicks.visualizer.R;
 import com.pheelicks.visualizer.VisualizerView;
 import com.pheelicks.visualizer.renderer.BarGraphRenderer;
@@ -29,6 +30,7 @@ import com.pheelicks.visualizer.renderer.LineRenderer;
  */
 public class MainActivity extends Activity {
   private MediaPlayer mPlayer;
+  private MediaPlayer mSilentPlayer;  /* to avoid tunnel player issue */
   private VisualizerView mVisualizerView;
 
   /** Called when the activity is first created. */
@@ -42,6 +44,7 @@ public class MainActivity extends Activity {
   protected void onResume()
   {
     super.onResume();
+    initTunnelPlayerWorkaround();
     init();
   }
 
@@ -82,6 +85,30 @@ public class MainActivity extends Activity {
       mPlayer.release();
       mPlayer = null;
     }
+    
+    if (mSilentPlayer != null)
+    {
+      mSilentPlayer.release();
+      mSilentPlayer = null;
+    }
+  }
+  
+  // Workaround (for Galaxy S4)
+  //
+  // "Visualization does not work on the new Galaxy devices"
+  //    https://github.com/felixpalmer/android-visualizer/issues/5
+  //
+  // NOTE: 
+  //   This code is not required for visualizing default "test.mp3" file,
+  //   because tunnel player is used when duration is longer than 1 minute.
+  //   (default "test.mp3" file: 8 seconds)
+  //
+  private void initTunnelPlayerWorkaround() {
+    // Read "tunnel.decode" system property to determine
+    // the workaround is needed
+    if (TunnelPlayerWorkaround.isTunnelDecodeEnabled(this)) {
+      mSilentPlayer = TunnelPlayerWorkaround.createSilentMediaPlayer(this);
+    }
   }
 
   // Methods for adding renderers to visualizer