Merge branch 'master' of github.com:bmeike/ProgrammingAndroid2Examples

Author: bmeike

AudioPlayer/AndroidManifest.xml

@@ -3,6 +3,14 @@
       package="com.oreilly.demo.android.pa.audioplayer"
       android:versionCode="1"
       android:versionName="1.0">
+      
+	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+	<uses-permission android:name="android.permission.RECORD_VIDEO"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.CAMERA"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-sdk android:targetSdkVersion="14"></uses-sdk>
+	
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".MultiMedia"
                   android:label="@string/app_name">
@@ -19,14 +27,7 @@
         <activity android:name=".AudioRecorderViaIntent" android:label="Audio Recorder By Intent"/>
         <activity android:name=".VideoRecorder" android:label="Video Recorder"/>
         <activity android:name=".AudioRecorder" android:label="Audio Recorder"/>
-        <activity android:name="com.oreilly.demo.android.pa.audioplayer.AudioRecorderWAudioRecord" android:label="Audio Recorder W AudioRecord"/>
+        <activity android:name=".AudioRecorderWAudioRecord" android:label="Audio Recorder W AudioRecord"/>
     </application>
-        
-	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
-	<uses-permission android:name="android.permission.RECORD_VIDEO"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.CAMERA"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-sdk android:targetSdkVersion="14"></uses-sdk>
 
 </manifest> 

AudioPlayer/README.txt

@@ -2,4 +2,4 @@ This example must be run on actual hardware (not an emulator)
 as this contains hardware specific code.  
 
 
-(This was tested on a Nexus One and Nexus S phones)
+(This was tested on a Nexus One, Nexus S, Galaxy Nexus phones)

AudioPlayer/TODO

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15

AudioPlayer/project.properties

@@ -203,8 +203,8 @@ private void playPlayer(int previousState) {
 	}
 
 	private void stopPlayer() {
-		mediaplayer.stop();
-		mediaplayer.reset();
+		try { mediaplayer.stop(); } catch (Throwable t) {}
+		try { mediaplayer.reset(); } catch (Throwable t) {}
 		initializeMediaPlayer();
 	}
 

AudioPlayer/src/com/oreilly/demo/android/pa/audioplayer/AudioPlayer.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>