# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1263553084 -3600
# Node ID f1f0b29f4bd84a426dfe7116ecf7e3a5e73e841f
# Parent  2036ebfaccda4c1800d79c38af85c00c56ade6da
premerge

diff -r 2036ebfaccda -r f1f0b29f4bd8 src/com/beem/project/beem/jingle/JingleService.java
--- a/src/com/beem/project/beem/jingle/JingleService.java	Fri Nov 20 19:29:42 2009 +0100
+++ b/src/com/beem/project/beem/jingle/JingleService.java	Fri Jan 15 11:58:04 2010 +0100
@@ -41,7 +41,7 @@
 		BasicTransportManager bt = new BasicTransportManager();
 		mMediaManagers = new ArrayList<JingleMediaManager>();
 		mMediaManagers.add(new MicrophoneRTPManager(bt, ctx));
-		CodecManager.load();
+		//CodecManager.load();
 	}
 
 	/**
diff -r 2036ebfaccda -r f1f0b29f4bd8 src/com/beem/project/beem/jingle/RTPReceiver.java
--- a/src/com/beem/project/beem/jingle/RTPReceiver.java	Fri Nov 20 19:29:42 2009 +0100
+++ b/src/com/beem/project/beem/jingle/RTPReceiver.java	Fri Jan 15 11:58:04 2010 +0100
@@ -3,9 +3,9 @@
 import java.net.DatagramSocket;
 import java.net.SocketException;
 
-import org.jlibrtp.jlibrtp.Participant;
-import org.jlibrtp.jlibrtp.RTPAppIntf;
-import org.jlibrtp.jlibrtp.RTPSession;
+import jlibrtp.Participant;
+import jlibrtp.RTPAppIntf;
+import jlibrtp.RTPSession;
 
 /**
  * abstract RTP receiver class.
diff -r 2036ebfaccda -r f1f0b29f4bd8 src/com/beem/project/beem/jingle/RTPTransmitter.java
--- a/src/com/beem/project/beem/jingle/RTPTransmitter.java	Fri Nov 20 19:29:42 2009 +0100
+++ b/src/com/beem/project/beem/jingle/RTPTransmitter.java	Fri Jan 15 11:58:04 2010 +0100
@@ -3,10 +3,10 @@
 import java.net.DatagramSocket;
 import java.net.SocketException;
 
-import org.jlibrtp.jlibrtp.DataFrame;
-import org.jlibrtp.jlibrtp.Participant;
-import org.jlibrtp.jlibrtp.RTPAppIntf;
-import org.jlibrtp.jlibrtp.RTPSession;
+import jlibrtp.DataFrame;
+import jlibrtp.Participant;
+import jlibrtp.RTPAppIntf;
+import jlibrtp.RTPSession;
 
 import com.beem.project.beem.utils.FreePort;
 
diff -r 2036ebfaccda -r f1f0b29f4bd8 src/com/beem/project/beem/jingle/demo/JingleCallActivity.java
--- a/src/com/beem/project/beem/jingle/demo/JingleCallActivity.java	Fri Nov 20 19:29:42 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-package com.beem.project.beem.jingle.demo;
-
-import org.jivesoftware.smack.ConnectionConfiguration;
-import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
-import org.jivesoftware.smack.util.StringUtils;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.beem.project.beem.R;
-import com.beem.project.beem.jingle.JingleService;
-
-/**
- * Activity used to test Jingle call.
- * @author darisk
- */
-public class JingleCallActivity extends Activity {
-
-    private static final int SLP_DURATION = 3000;
-    private static final int DEFAULT_XMPP_PORT = 5222;
-
-    private XMPPConnection mConnection;
-    private ConnectionConfiguration mConf;
-    private JingleService mJingle;
-
-    private Button mBtconnect;
-    private Button mBtcall;
-    private EditText mEdJID;
-    private EditText mEdPassword;
-    private EditText mEdReceiver;
-
-    /**
-     * Constructor.
-     */
-    public JingleCallActivity() {
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-	java.security.Security.addProvider(new com.sun.security.sasl.Provider());
-	super.onCreate(savedInstanceState);
-	setContentView(R.layout.jingle_call_activity);
-	mConf = new ConnectionConfiguration("10.0.2.2", DEFAULT_XMPP_PORT);
-	// mConf = new ConnectionConfiguration("elyzion.net",
-	// DEFAULT_XMPP_PORT);
-	mConf.setSecurityMode(SecurityMode.required);
-	mEdJID = (EditText) findViewById(R.id.jingledemocalljid);
-	mEdPassword = (EditText) findViewById(R.id.jingledemocallpassword);
-	mEdReceiver = (EditText) findViewById(R.id.jingledemocallreceiver);
-	mBtconnect = (Button) findViewById(R.id.jingledemocallconnectbutton);
-	mBtconnect.setOnClickListener(new OnClickListener() {
-
-	    @Override
-	    public void onClick(View arg0) {
-		String jid = mEdJID.getText().toString();
-		String login = StringUtils.parseName(jid);
-		mConnection = new XMPPConnection(mConf);
-		String password = mEdPassword.getText().toString();
-		try {
-		    mConnection.connect();
-		    Thread.sleep(SLP_DURATION);
-		    mConnection.login(login, password);
-		    mJingle = new JingleService(mConnection);
-		    mJingle.initWhenConntected(mConnection);
-		    mBtcall.setEnabled(true);
-		    Toast.makeText(JingleCallActivity.this, "Connected", Toast.LENGTH_SHORT);
-		} catch (XMPPException e) {
-		    // TODO Auto-generated catch block
-		    e.printStackTrace();
-		} catch (InterruptedException e) {
-		    // TODO Auto-generated catch block
-		    e.printStackTrace();
-		}
-	    }
-
-	});
-	mBtcall = (Button) findViewById(R.id.jingledemocallbutton);
-	mBtcall.setOnClickListener(new OnClickListener() {
-	    @Override
-	    public void onClick(View arg0) {
-		String jid = mEdReceiver.getText().toString();
-		if (!"".equals(jid)) {
-		    mJingle.call(jid);
-		    Toast.makeText(JingleCallActivity.this, "Appel en cours", Toast.LENGTH_SHORT);
-		} else
-		    Toast.makeText(JingleCallActivity.this, "Remplir le champ (JID complet en  toto@tutu.com/truc)",
-			Toast.LENGTH_SHORT);
-	    }
-	});
-
-    }
-
-}
diff -r 2036ebfaccda -r f1f0b29f4bd8 src/com/beem/project/beem/jingle/demo/package-info.java
--- a/src/com/beem/project/beem/jingle/demo/package-info.java	Fri Nov 20 19:29:42 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-/**
- * Package for testing the Jingle classes.
- */
-package com.beem.project.beem.jingle.demo;
-