--- a/src/org/sipdroid/media/RtpStreamReceiver.java	Fri Jan 15 12:02:29 2010 +0100
+++ b/src/org/sipdroid/media/RtpStreamReceiver.java	Sat Jan 16 21:05:08 2010 +0100
@@ -219,12 +219,12 @@
 		android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
 		am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
 		cr = mContext.getContentResolver();
-		saveSettings();
+		//saveSettings();
 
 		Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY,Settings.System.WIFI_SLEEP_POLICY_NEVER);
-		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,AudioManager.VIBRATE_SETTING_OFF);
-		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,AudioManager.VIBRATE_SETTING_OFF);
-		oldvol = am.getStreamVolume(AudioManager.STREAM_MUSIC);
+		//am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,AudioManager.VIBRATE_SETTING_OFF);
+		//am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,AudioManager.VIBRATE_SETTING_OFF);
+		//oldvol = am.getStreamVolume(AudioManager.STREAM_MUSIC);
 		restoreVolume();
 
 		track = new AudioTrack(AudioManager.STREAM_MUSIC, sampling_rate, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT,
@@ -311,23 +311,23 @@
 				DataFramePool.getInstance().returnFrame(frame);
 				//println("headroom " + headroom + " user " + user + " server " + server + " luser " + luser + " lserver " + lserver);
 				if (user >= luser + sampling_rate) {
-					if (am.getMode() != speakermode) {
+					/*if (am.getMode() != speakermode) {
 						am.setMode(speakermode);
 						switch (speakermode) {
 						case AudioManager.MODE_IN_CALL:
-							/*am.setStreamVolume(AudioManager.STREAM_RING,(int)(
+							am.setStreamVolume(AudioManager.STREAM_RING,(int)(
 									am.getStreamMaxVolume(AudioManager.STREAM_RING)*
 									com.mbdsys.sfrdroid.ui.Settings.getEarGain()), 0);
 							track.setStereoVolume(AudioTrack.getMaxVolume()*
 									com.mbdsys.sfrdroid.ui.Settings.getEarGain()
 									,AudioTrack.getMaxVolume()*
-									com.mbdsys.sfrdroid.ui.Settings.getEarGain());*/
+									com.mbdsys.sfrdroid.ui.Settings.getEarGain());
 							//running = false;
 						case AudioManager.MODE_NORMAL:
 							track.setStereoVolume(AudioTrack.getMaxVolume(),AudioTrack.getMaxVolume());
 							//running = false;
 						}
-					}
+					}*/
 					luser = user;
 				}
 				lserver = server;
@@ -338,30 +338,9 @@
 		track.stop();
 		//if (Receiver.pstn_state == null || Receiver.pstn_state.equals("IDLE"))
 		//	am.setMode(AudioManager.MODE_NORMAL);
-		saveVolume();
-		am.setStreamVolume(AudioManager.STREAM_MUSIC,oldvol,0);
-		restoreSettings();
-		ToneGenerator tg = new ToneGenerator(AudioManager.STREAM_RING,ToneGenerator.MAX_VOLUME/4*3);
-		tg.startTone(ToneGenerator.TONE_PROP_PROMPT);
-		try {
-			Thread.sleep(500);
-		} catch (InterruptedException e) {
-		}
-		tg.stopTone();
-		rtpSession = null;
-		track = null;
-		codec.cleanDecoder(codecCtx);
-		codec = null;
-		println("rtp receiver terminated");
-	}
-
-	public void endReceiver() {
-		track.stop();
-		//if (Receiver.pstn_state == null || Receiver.pstn_state.equals("IDLE"))
-		//	am.setMode(AudioManager.MODE_NORMAL);
-		saveVolume();
-		am.setStreamVolume(AudioManager.STREAM_MUSIC,oldvol,0);
-		restoreSettings();
+		//saveVolume();
+		//am.setStreamVolume(AudioManager.STREAM_MUSIC,oldvol,0);
+		//restoreSettings();
 		ToneGenerator tg = new ToneGenerator(AudioManager.STREAM_RING,ToneGenerator.MAX_VOLUME/4*3);
 		tg.startTone(ToneGenerator.TONE_PROP_PROMPT);
 		try {