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

Updated ms2 to use new logger for Android

Browse source
This commit is contained in:
Sylvain Berfini 2016-05-11 14:15:42 +02:00
parent 04f704aa93
commit 5872dddc3c
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -25,8 +25,6 @@ import java.util.List;
import org.linphone.mediastream.MediastreamerAndroidContext;
import org.linphone.mediastream.Version;
import android.util.Log;
public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
private static boolean loadOptionalLibrary(String s) {
@ -34,18 +32,17 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
System.loadLibrary(s);
return true;
} catch (Throwable e) {
Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library lib" + s);
//android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library lib" + s);
}
return false;
}
static {
List<String> cpuabis=Version.getCpuAbis();
String ffmpegAbi;
boolean libLoaded=false;
Throwable firstException=null;
for (String abi : cpuabis){
Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
//android.util.Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
loadOptionalLibrary("ffmpeg-linphone-" + abi);
//Main library
try {
@ -54,7 +51,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
System.loadLibrary("mediastreamer_base-" + abi);
System.loadLibrary("mediastreamer_voip-" + abi);
System.loadLibrary("linphone-" + abi);
Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
org.linphone.mediastream.Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
libLoaded=true;
break;
}catch(Throwable e) {

2
mediastreamer2

@ -1 +1 @@
Subproject commit 2a369a62137dc19e89b6d8c3db1e3171f36cddd3
Subproject commit 2076bcda91d98388f475727ea3234505679caa38