mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 04:28:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'video' of git.linphone.org:linphone-android-private into video

Browse source 
Conflicts:
	src/org/linphone/core/LinphoneCoreImpl.java
This commit is contained in:
Guillaume Beraudo 2010-11-26 15:11:17 +01:00
commit 3b23c971ec
6 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LinphoneCoreImpl.java
View file

@ -85,6 +85,9 @@ class LinphoneCoreImpl implements LinphoneCore {
private native void setDownloadBandwidth(long nativePtr, int bw);
private native void setPreferredVideoSize(long nativePtr, int width, int heigth);
private native int[] getPreferredVideoSize(long nativePtr);
private native void setRing(long nativePtr, String path);
private native String getRing(long nativePtr);
private static String TAG = "LinphoneCore";
@ -382,6 +385,7 @@ class LinphoneCoreImpl implements LinphoneCore {
return updateCall(nativePtr, ptrCall, ptrParams);
}
<<<<<<< HEAD
public void setUploadBandwidth(int bw) {
@ -404,5 +408,12 @@ class LinphoneCoreImpl implements LinphoneCore {
vSize.setHeight(nativeSize[1]);
return vSize;
=======
public void setRing(String path) {
setRing(nativePtr, path);
}
public String getRing() {
return getRing(nativePtr);
>>>>>>> c95431295dc09c5558d38c6de49fa071c957d926
}
}

4
LinphoneProxyConfigImpl.java
View file

@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.linphone.core;
import org.linphone.LinphoneService;
import android.util.Log;
@ -35,7 +32,6 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
setProxy(proxy);
enableRegister(enableRegister);
ownPtr=true;
Log.w(LinphoneService.TAG, "route ["+route+"] not used yet");
}
protected LinphoneProxyConfigImpl(long aNativePtr) {
nativePtr = aNativePtr;

2
tutorials/TutorialBuddyStatusActivity.java
View file

@ -36,7 +36,7 @@ import android.widget.TextView;
*/
public class TutorialBuddyStatusActivity extends Activity {
private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
private static final String defaultSipAddress = "sip:";
private TextView sipAddressWidget;
private TutorialBuddyStatus tutorial;
private Handler mHandler = new Handler() ;

2
tutorials/TutorialChatRoomActivity.java
View file

@ -36,7 +36,7 @@ import android.widget.TextView;
*/
public class TutorialChatRoomActivity extends Activity {
private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
private static final String defaultSipAddress = "sip:";
private TextView sipAddressWidget;
private TutorialChatRoom tutorial;
private Handler mHandler = new Handler() ;

2
tutorials/TutorialHelloWorldActivity.java
View file

@ -36,7 +36,7 @@ import android.widget.TextView;
*/
public class TutorialHelloWorldActivity extends Activity {
private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
private static final String defaultSipAddress = "sip:";
private TextView sipAddressWidget;
private TutorialHelloWorld tutorial;
private Handler mHandler = new Handler() ;

4
tutorials/TutorialRegistrationActivity.java
View file

@ -35,8 +35,8 @@ import android.widget.TextView;
*/
public class TutorialRegistrationActivity extends TutorialHelloWorldActivity {
private static final String defaultSipAddress = "sip:8182449901ip@mty11.axtel.net";
private static final String defaultSipPassword = "49901";
private static final String defaultSipAddress = "sip:";
private static final String defaultSipPassword = "";
private TextView sipAddressWidget;
private TextView sipPasswordWidget;
private TutorialRegistration tutorial;