Merge branch 'devel' into turbo

Conflicts: src/cz/gug/hackathon/mantattan/MainActivity.java src/cz/gug/hackathon/mantattan/MusicService.java
GADCPrague · Feb 19, 2012 · 20231d2 · 20231d2
2 parents 98b20e5 + 789d65f
commit 20231d2
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 103 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -33,7 +33,7 @@
 
         </activity>
 
-        <service android:name=".MusicService"></service>
+
     </application>
 
 </manifest>
diff --git a/assets/theme.ogg b/assets/theme.ogg
diff --git a/src/cz/gug/hackathon/mantattan/MainActivity.java b/src/cz/gug/hackathon/mantattan/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
@@ -13,13 +13,18 @@ public class MainActivity extends Activity {
 
 	//private static final String TAG = MainActivity.class.getSimpleName();
 	//private DataTable dataTable;
-
+	private MediaPlayer mp ;
+
 	@Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.main);
-        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+        mp = MediaPlayer.create(getApplicationContext(), R.raw.theme);
+        mp.start();
+
+
 //        dataTable = new DataTable(3, 2);
 //        Log.d(TAG, "====================================================");
 //        dataTable.shuffle(0);
@@ -47,4 +52,46 @@ public void onClick(View v) {
 
 
     }
+
+	@Override
+	protected void onResume() {
+		mp = MediaPlayer.create(getApplicationContext(), R.raw.theme);
+	    if (!mp.isPlaying()){
+	    	mp.start();
+	    }
+
+		super.onResume();
+	}
+
+	@Override
+	protected void onStart() {
+
+	    if (!mp.isPlaying()){
+	    	mp.start();
+	    }
+
+		super.onStart();
+	}
+
+	@Override
+	protected void onPause() {
+
+		if (mp.isPlaying()){
+	    	mp.stop();
+	    }
+
+		super.onPause();
+	}
+
+	@Override
+	protected void onStop() {
+
+		if (mp.isPlaying()){
+	    	mp.stop();
+	    }
+
+		super.onStop();
+	}
+
+
 }
diff --git a/src/cz/gug/hackathon/mantattan/MusicService.java b/src/cz/gug/hackathon/mantattan/MusicService.java
diff --git a/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java b/src/cz/gug/hackathon/mantattan/WeedCrusherApp.java
@@ -32,14 +32,14 @@ public void onCreate() { //
 //		this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
 //		this.prefs.registerOnSharedPreferenceChangeListener(this);
 		dataTable = new DataTable(numRows, numCols);
-		startService(new Intent(this, MusicService.class));
+
 		Log.i(TAG, "onCreated");
 	}
 
 	@Override
 	public void onTerminate() { //
 		super.onTerminate();
-		stopService(new Intent(this, MusicService.class));
+
 		Log.i(TAG, "onTerminated");
 	}