Commit 3ca5292f authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Improved metadata for Liblinphone project + fixed issue with video in Android project

parent 35848de4
Pipeline #212 failed with stage
in 0 seconds
......@@ -6,5 +6,51 @@
This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-->
<remove-node path="/api/package[@name='org.linphone.core']" />
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='ChatRoomListener']/method[@name='onStateChanged']"
name="argsType">ChatRoomStateChangedEventArgs2</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CallListener']/method[@name='onStateChanged']"
name="argsType">CallStateChangedEventArgs2</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='ChatMessageListener']/method[@name='onStateChanged']"
name="argsType">ChatMessageStateChangedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CoreListener']/method[@name='onStateChanged']"
name="argsType">CoreStateChangedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CoreListener']/method[@name='onTransferStateChanged']"
name="argsType">CoreTransferStateChangedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CallListener']/method[@name='onTransferStateChanged']"
name="argsType">CallTransferStateChangedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CoreListener']/method[@name='onDtmfReceived']"
name="argsType">CoreDtmfReceivedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CallListener']/method[@name='onDtmfReceived']"
name="argsType">CallDtmfReceivedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CoreListener']/method[@name='onMessageReceived']"
name="argsType">CoreMessageReceivedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='ChatRoomListener']/method[@name='onMessageReceived']"
name="argsType">ChatRoomMessageReceivedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='CoreListener']/method[@name='onIsComposingReceived']"
name="argsType">CoreIsComposingReceivedEventArgs</attr>
<attr path="/api/package[@name='org.linphone.core']/
interface[@name='ChatRoomListener']/method[@name='onIsComposingReceived']"
name="argsType">ChatRoomIsComposingReceivedEventArgs</attr>
</metadata>
......@@ -5,13 +5,15 @@ using Android.OS;
using Android.Content.Res;
using System.IO;
using Linphone;
using Org.Linphone.Mediastream.Video;
using Xamarin.Forms.Platform.Android;
namespace Xamarin.Droid
{
[Activity(Label = "Xamarin", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
//GL2JNIView captureCamera;
Org.Linphone.Mediastream.Video.Display.GL2JNIView captureCamera;
protected override void OnCreate(Bundle bundle)
{
......@@ -50,12 +52,12 @@ namespace Xamarin.Droid
App app = new App(); // Do not add an arg to App constructor
app.ConfigFilePath = rc_path;
/*captureCamera = new GL2JNIView(this);
captureCamera = new Org.Linphone.Mediastream.Video.Display.GL2JNIView(this);
captureCamera.Holder.SetFixedSize(1920, 1080);
AndroidVideoWindowImpl androidView = new AndroidVideoWindowImpl(captureCamera, null, null);
app.Core.NativeVideoWindowId = androidView.Handle;
app.Core.VideoDisplayEnabled = true;
app.getLayoutView().Children.Add(captureCamera);*/
app.getLayoutView().Children.Add(captureCamera.ToView());
LoadApplication(app);
}
......
......@@ -32,6 +32,7 @@
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
<AndroidSupportedAbis />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......
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