changed audio playback method to SoundPool

14v · May 3, 2013 · e6e01da · e6e01da
1 parent fba9e2a
commit e6e01da
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 85 deletions.
diff --git a/bin/classes/org/blockinger/game/R$integer.class b/bin/classes/org/blockinger/game/R$integer.class
diff --git a/bin/classes/org/blockinger/game/R$layout.class b/bin/classes/org/blockinger/game/R$layout.class
diff --git a/bin/classes/org/blockinger/game/R$menu.class b/bin/classes/org/blockinger/game/R$menu.class
diff --git a/bin/classes/org/blockinger/game/R$raw.class b/bin/classes/org/blockinger/game/R$raw.class
diff --git a/bin/classes/org/blockinger/game/R$string.class b/bin/classes/org/blockinger/game/R$string.class
diff --git a/bin/classes/org/blockinger/game/R$style.class b/bin/classes/org/blockinger/game/R$style.class
diff --git a/bin/classes/org/blockinger/game/R$styleable.class b/bin/classes/org/blockinger/game/R$styleable.class
diff --git a/bin/classes/org/blockinger/game/R$xml.class b/bin/classes/org/blockinger/game/R$xml.class
diff --git a/gen/org/blockinger/game/R.java b/gen/org/blockinger/game/R.java
@@ -152,22 +152,23 @@ public static final class id {
         public static final int view2=0x7f0d0015;
     }
     public static final class integer {
-        public static final int clearAnimation_burstDuration=0x7f070017;
-        public static final int clearAnimation_enableBurst=0x7f070016;
-        public static final int clearAnimation_enableFlash=0x7f070013;
-        public static final int clearAnimation_flashCount=0x7f070014;
-        public static final int clearAnimation_flashInterval=0x7f070015;
+        public static final int audio_streams=0x7f070010;
+        public static final int clearAnimation_burstDuration=0x7f070018;
+        public static final int clearAnimation_enableBurst=0x7f070017;
+        public static final int clearAnimation_enableFlash=0x7f070014;
+        public static final int clearAnimation_flashCount=0x7f070015;
+        public static final int clearAnimation_flashInterval=0x7f070016;
         public static final int doubleLineScore=0x7f07000a;
         public static final int hardDropBonusFactor=0x7f07000e;
-        public static final int levels=0x7f070018;
-        public static final int levelsplusone=0x7f070019;
+        public static final int levels=0x7f070019;
+        public static final int levelsplusone=0x7f07001a;
         public static final int multiTetrisScore=0x7f07000d;
         public static final int padding_columns=0x7f070004;
         public static final int phantom_alpha=0x7f070005;
         public static final int piece_start_x=0x7f070007;
-        public static final int popup_attack=0x7f070010;
-        public static final int popup_decay=0x7f070012;
-        public static final int popup_sustain=0x7f070011;
+        public static final int popup_attack=0x7f070011;
+        public static final int popup_decay=0x7f070013;
+        public static final int popup_sustain=0x7f070012;
         public static final int quadLineScore=0x7f07000c;
         /**  number of lines necessary to double the score 
          */

diff --git a/res/values/Constants.xml b/res/values/Constants.xml
@@ -70,6 +70,8 @@
 
     <integer name="shortVibeInterval">100</integer>
 
+    <integer name="audio_streams">10</integer>
+
     <integer name="popup_attack">125</integer>
     <integer name="popup_sustain">1050</integer>
     <integer name="popup_decay">300</integer>

diff --git a/src/org/blockinger/game/activities/GameActivity.java b/src/org/blockinger/game/activities/GameActivity.java
@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		/* Create Components */
 		game = (GameState)getLastCustomNonConfigurationInstance();
 		if(game == null) {
-			/* Check for Resuming */
+			/* Check for Resuming (or Resumption?) */
 			if(b!=null)
 				value = b.getInt("mode");
 

diff --git a/src/org/blockinger/game/components/GameState.java b/src/org/blockinger/game/components/GameState.java
@@ -438,6 +438,7 @@ public long getNextPlayerMoveTime() {
 	}
 
 	public static void destroy() {
+		instance.disconnect();
 		instance = null;
 	}
 

diff --git a/src/org/blockinger/game/components/Sound.java b/src/org/blockinger/game/components/Sound.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -438,6 +438,7 @@ public long getNextPlayerMoveTime() { @@
     	}
     	public static void destroy() {
+    		instance.disconnect();
     		instance = null;
     	}
@@ Expand Down @@