From 3b6810652184d8efbe93a5964aba4a961bccb61e Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 23 Apr 2015 16:43:07 +0200
Subject: Background music

---
 .../com/camilstaps/rushhour/FullscreenActivity.java    |  15 ++++++++-------
 app/src/main/res/raw/tune.wav                          | Bin 0 -> 879488 bytes
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/raw/tune.wav

(limited to 'app/src')

diff --git a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
index 495c996..d3e717d 100644
--- a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
@@ -22,8 +22,7 @@ import com.camilstaps.rushhour.util.SystemUiHider;
 public class FullscreenActivity extends Activity {
 
     private SoundPool soundPool;
-    private boolean soundBackgroundLoaded = false;
-    private int soundBackgroundId;
+    private int soundBackgroundId, soundCarDriveId;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,10 +48,14 @@ public class FullscreenActivity extends Activity {
         soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
             @Override
             public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
-                soundBackgroundLoaded = true;
+                Log.d("FA", "Loaded: " + sampleId);
+                if (sampleId == soundBackgroundId) {
+                    soundPool.play(soundBackgroundId, 1, 1, 2, -1, 1);
+                }
             }
         });
-        soundBackgroundId = soundPool.load(this, R.raw.car_drive, 1);
+        soundCarDriveId = soundPool.load(this, R.raw.car_drive, 1);
+        soundBackgroundId = soundPool.load(this, R.raw.tune, 2);
 
         final RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
         ViewTreeObserver vto = boardLayout.getViewTreeObserver();
@@ -67,9 +70,7 @@ public class FullscreenActivity extends Activity {
         board.setDriveListener(new DriveListener() {
             @Override
             public void onDrive() {
-                if (soundBackgroundLoaded) {
-                    soundPool.play(soundBackgroundId, 1, 1, 1, 0, 1f);
-                }
+                soundPool.play(soundCarDriveId, 1, 1, 1, 0, 1);
             }
         });
     }
diff --git a/app/src/main/res/raw/tune.wav b/app/src/main/res/raw/tune.wav
new file mode 100644
index 0000000..42b5a42
Binary files /dev/null and b/app/src/main/res/raw/tune.wav differ
-- 
cgit v1.2.3