sounds can now be paused when the component is in "inactive" state.

version strings changed to v1.7
14v · May 9, 2013 · e270179 · e270179
1 parent 2c6a4cd
commit e270179
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -38,8 +38,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.blockinger.game"
-    android:versionCode="10"
-    android:versionName="1.6" >
+    android:versionCode="11"
+    android:versionName="1.7" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -38,8 +38,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.blockinger.game"
-    android:versionCode="10"
-    android:versionName="1.6" >
+    android:versionCode="11"
+    android:versionName="1.7" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -145,7 +145,7 @@
     <string name="pref_accelerationV_title">Soft Drop Acceleration</string>
 
 
-    <string name="pref_version_summary">1.6\nTouch here to view the public repository of this project</string>
+    <string name="pref_version_summary">1.7\nTouch here to view the public repository of this project</string>
     <string name="pref_version_title">Version</string>
     <string name="repository_url">https://github.com/vocollapse/Blockinger</string>
 

diff --git a/src/org/blockinger/game/components/Sound.java b/src/org/blockinger/game/components/Sound.java
@@ -308,9 +308,6 @@ public void resume() {
 	}
 
 	public void pauseMusic() {
-		if(isInactive)
-			return;
-
 		isMusicReady = false;
 		if(musicPlayer != null) {
 			try{
@@ -323,9 +320,6 @@ public void pauseMusic() {
 	}
 
 	public void pause() {
-		if(isInactive)
-			return;
-
 		soundPool.autoPause();
 		pauseMusic();
 	}