Commit 5872dddc authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Updated ms2 to use new logger for Android

parent 04f704aa
......@@ -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) {
......
mediastreamer2 @ 2076bcda
Subproject commit 2a369a62137dc19e89b6d8c3db1e3171f36cddd3
Subproject commit 2076bcda91d98388f475727ea3234505679caa38
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment