# HG changeset patch
# User nikita@localhost.localdomain
# Date 1252243392 -7200
# Node ID 6ebfc44182ab02ad9f38fea6f318c3a85e390e85
# Parent  e46f634c629ca36cb604037997a88dc49050e2a7
des petis oublies au niveau du rtp lors du portage.

diff -r e46f634c629c -r 6ebfc44182ab default.properties
--- a/default.properties	Thu Aug 27 01:21:14 2009 +0200
+++ b/default.properties	Sun Sep 06 15:23:12 2009 +0200
@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-3
+target=Google Inc.:Google APIs:3
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
diff -r e46f634c629c -r 6ebfc44182ab src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Thu Aug 27 01:21:14 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Sun Sep 06 15:23:12 2009 +0200
@@ -25,6 +25,7 @@
 import android.util.Log;
 import android.widget.ArrayAdapter;
 
+import com.beem.project.beem.jingle.JingleService;
 import com.beem.project.beem.service.XmppConnectionAdapter;
 import com.beem.project.beem.service.XmppFacade;
 import com.beem.project.beem.service.aidl.IBeemConnectionListener;
@@ -45,6 +46,7 @@
 
     private NotificationManager mNotificationManager;
     private XmppConnectionAdapter mConnection;
+    private JingleService mJingle;
     private SharedPreferences mSettings;
     private String mLogin;
     private String mPassword;
@@ -136,7 +138,7 @@
 
 		@Override
 		public void onConnect() throws RemoteException {
-
+		    mJingle.initWhenConntected(mConnection.getAdaptee());
 		    PacketFilter filter = new PacketFilter() {
 
 			@Override
@@ -251,8 +253,9 @@
 	initConnectionConfig();
 	mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 	mConnection = new XmppConnectionAdapter(mConnectionConfiguration, mLogin, mPassword, this);
+	mJingle = new JingleService(mConnection.getAdaptee());
 	initRosterRequestListener();
-	mBind = new XmppFacade(mConnection, this);
+	mBind = new XmppFacade(mConnection, this, mJingle);
     }
 
     /**
diff -r e46f634c629c -r 6ebfc44182ab src/com/beem/project/beem/jingle/JingleService.java
--- a/src/com/beem/project/beem/jingle/JingleService.java	Thu Aug 27 01:21:14 2009 +0200
+++ b/src/com/beem/project/beem/jingle/JingleService.java	Sun Sep 06 15:23:12 2009 +0200
@@ -108,7 +108,7 @@
 	    //System.out.println("Session established");
 	    //System.out.println("Je recois sur " + remoteCandidate.getIp() + ":" + remoteCandidate.getPort());
 	    // TODO choose the right RTPReceiver depending on the payload type
-	    //RTPReceiver rtpReceiver = new MicroRTPReceiver(remoteCandidate.getPort());
+	    //RTPReceiver rtpReceiver = new RTPReceiver(remoteCandidate.getPort());
 	}
 
 	@Override
diff -r e46f634c629c -r 6ebfc44182ab src/com/beem/project/beem/jingle/MicrophoneRTPManager.java
--- a/src/com/beem/project/beem/jingle/MicrophoneRTPManager.java	Thu Aug 27 01:21:14 2009 +0200
+++ b/src/com/beem/project/beem/jingle/MicrophoneRTPManager.java	Sun Sep 06 15:23:12 2009 +0200
@@ -55,8 +55,7 @@
      */
     private void setupPayloads() {
 	mPayloads = new ArrayList<PayloadType>();
-	mPayloads.add(new PayloadType.Audio(51, "BIDON1"));
-	mPayloads.add(new PayloadType.Audio(52, "BIDON2"));
-	mPayloads.add(new PayloadType.Audio(53, "BIDON3"));
+	mPayloads.add(new PayloadType.Audio(0, "PCMU"));
+	mPayloads.add(new PayloadType.Audio(8, "PCMA"));
     }
 }
diff -r e46f634c629c -r 6ebfc44182ab src/com/beem/project/beem/jingle/RTPTransmitter.java
--- a/src/com/beem/project/beem/jingle/RTPTransmitter.java	Thu Aug 27 01:21:14 2009 +0200
+++ b/src/com/beem/project/beem/jingle/RTPTransmitter.java	Sun Sep 06 15:23:12 2009 +0200
@@ -17,8 +17,9 @@
     public RTPTransmitter(String remoteIP, int port) {
 	DatagramSocket rtpSocket = null;
 	int rtpPort = 0;
-	rtpPort = getFreePort();
+	
 	try {
+	    rtpPort = getFreePort();
 	    rtpSocket = new DatagramSocket(rtpPort);
 	} catch (SocketException e) {
 	    e.printStackTrace();
diff -r e46f634c629c -r 6ebfc44182ab src/com/beem/project/beem/service/XmppFacade.java
--- a/src/com/beem/project/beem/service/XmppFacade.java	Thu Aug 27 01:21:14 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppFacade.java	Sun Sep 06 15:23:12 2009 +0200
@@ -35,9 +35,10 @@
      * @param service
      *            the service which holds the facade
      */
-    public XmppFacade(final XmppConnectionAdapter connection, final BeemService service) {
+    public XmppFacade(final XmppConnectionAdapter connection, final BeemService service, final JingleService jingle) {
 	this.mConnexion = connection;
 	this.mBeemService = service;
+	this.mJingle = jingle;
     }
 
     /**