basic recording working good

1 files changed, 32 insertions, 2 deletions

diff --git a/src/com/example/rotorm/CameraActivity.java b/src/com/example/rotorm/CameraActivity.java
index fec1dd0..9427a88 100644
--- a/src/com/example/rotorm/CameraActivity.java
+++ b/src/com/example/rotorm/CameraActivity.java
@@ -12,8 +12,11 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
+import android.hardware.Camera.PreviewCallback;
 import android.media.CamcorderProfile;
+import android.media.MediaPlayer;
 import android.media.MediaRecorder;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
@@ -39,7 +42,10 @@ private MediaRecorder mMediaRecorder;
 private Button captureButton;
 private boolean isRecording = false;
 
+private MediaPlayer mp; 
+
 private String filename="";
+private String audiofilename;
 
 /** Called when the activity is first created. */
 @Override
@@ -54,9 +60,15 @@ public void onCreate(Bundle savedInstanceState) {
     
 }
 
+public void mCallback() {
+    
+}
+
 public void onActivityResult(int requestCode, int resultCode, Intent data){
-	String success=data.getExtras().containsKey("dat")?"YES":"NO";
-	Log.i("returned data from intent: "+success, "SUCCESS");
+	Uri audioUri = data.getData();
+	audiofilename=audioUri.toString();
+	
+	Log.i("returned data from intent: "+audiofilename, "SUCCESS");
 	
     // Create an instance of Camera.
     mCamera = getCameraInstance();
@@ -80,6 +92,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data){
             @Override
             public void onClick(View v) {
                 if (isRecording) {
+                	mp.stop();
                     // stop recording and release camera
                     mMediaRecorder.stop();  // stop the recording
                     releaseMediaRecorder(); // release the MediaRecorder object
@@ -93,6 +106,22 @@ public void onActivityResult(int requestCode, int resultCode, Intent data){
                     if (prepareVideoRecorder()) {
                         // Camera is available and unlocked, MediaRecorder is prepared,
                         // now you can start recording
+                    	
+                    	//prepare to play audio
+                    	mp = new MediaPlayer();
+                    	
+                    	try {
+                            mp.setDataSource(audiofilename);
+                            mp.prepare();
+                            mp.start();
+                        } catch (IllegalArgumentException e) {
+                            e.printStackTrace();
+                        } catch (IllegalStateException e) {
+                            e.printStackTrace();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    	
                     	Log.i("starting to record", "BEGIN");
                         mMediaRecorder.start();
 
@@ -110,6 +139,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data){
     );
 }
 
+
 public void setCaptureButtonText(String s) {
     captureButton.setText(s);
 }