Commit ed74636e authored by Erwan Croze's avatar Erwan Croze 👋🏻

Using new wrapper

parent 40bcfc9e
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E8FB6309-B31E-4380-992C-BB1609B3EA00}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CsWrapper</RootNamespace>
<AssemblyName>CsWrapper</AssemblyName>
<DefaultLanguage>fr-FR</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<PlatformTarget>ARM</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<PlatformTarget>ARM</PlatformTarget>
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<Compile Include="LinphoneWrapper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Properties\CsWrapper.rd.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.2.3</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
\ No newline at end of file

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsWrapper", "CsWrapper.csproj", "{E8FB6309-B31E-4380-992C-BB1609B3EA00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|ARM.ActiveCfg = Debug|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|ARM.Build.0 = Debug|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x64.ActiveCfg = Debug|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x64.Build.0 = Debug|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x86.ActiveCfg = Debug|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x86.Build.0 = Debug|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|Any CPU.Build.0 = Release|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|ARM.ActiveCfg = Release|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|ARM.Build.0 = Release|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x64.ActiveCfg = Release|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x64.Build.0 = Release|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x86.ActiveCfg = Release|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
This diff is collapsed.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CsWrapper")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CsWrapper")]
[assembly: AssemblyCopyright("Belledonne-communications © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: ComVisible(false)]
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
Ce fichier contient des directives runtime, des spécifications relatives aux types auxquels votre application a accès
via la réflexion et d'autres modèles de code dynamique. Les directives runtime permettent de contrôler
l'optimiseur .NET Native et de vérifier qu'il ne supprime pas le code accessible à votre bibliothèque. Si votre
bibliothèque ne fait pas de réflexion, vous n'avez pas à modifier ce fichier en principe. Cependant,
si votre bibliothèque effectue une réflexion des types, en particulier les types qui lui sont passés ou qui dérivent de ses types,
vous devez écrire des directives runtime.
En règle générale, l'usage de la réflexion dans les bibliothèques permet de découvrir les informations relatives aux types passés
à la bibliothèque. Les directives runtime ont trois façons d'exprimer les exigences des types passés à
votre bibliothèque.
1. Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
Utilisez ces directives pour refléter les types passés en tant que paramètres.
2. SubTypes
Utilisez une directive SubTypes pour refléter les types dérivés d'un autre type.
3. AttributeImplies
Utilisez une directive AttributeImplies pour indiquer que votre bibliothèque doit refléter
les types ou les méthodes décorés avec un attribut.
Pour plus d'informations sur l'écriture de directives runtime pour les bibliothèques, visitez
https://go.microsoft.com/fwlink/?LinkID=391919
-->
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Library Name="CsWrapper">
<!-- ajoutez ici les directives pour votre bibliothèque -->
</Library>
</Directives>

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linphone", "Linphone\Linphone.csproj", "{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}"
ProjectSection(ProjectDependencies) = postProject
......@@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSWinRTVideo", "submodules\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinphoneTasks", "Linphone\Tasks\LinphoneTasks.csproj", "{088A6C0F-16FA-4360-93C7-D781244E77FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsWrapper", "CsWrapper\CsWrapper.csproj", "{E8FB6309-B31E-4380-992C-BB1609B3EA00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -75,6 +77,22 @@ Global
{088A6C0F-16FA-4360-93C7-D781244E77FD}.Release|x64.Build.0 = Release|x64
{088A6C0F-16FA-4360-93C7-D781244E77FD}.Release|x86.ActiveCfg = Release|x86
{088A6C0F-16FA-4360-93C7-D781244E77FD}.Release|x86.Build.0 = Release|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|ARM.ActiveCfg = Debug|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|ARM.Build.0 = Debug|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x64.ActiveCfg = Debug|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x64.Build.0 = Debug|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x86.ActiveCfg = Debug|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Debug|x86.Build.0 = Debug|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|Any CPU.Build.0 = Release|Any CPU
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|ARM.ActiveCfg = Release|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|ARM.Build.0 = Release|ARM
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x64.ActiveCfg = Release|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x64.Build.0 = Release|x64
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x86.ActiveCfg = Release|x86
{E8FB6309-B31E-4380-992C-BB1609B3EA00}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -20,7 +20,7 @@ using Windows.ApplicationModel.Activation;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Linphone.Model;
using System.Diagnostics;
using Windows.UI.Core;
......@@ -227,7 +227,7 @@ namespace Linphone
{
if (sipAddress != "")
{
Address addr = LinphoneManager.Instance.Core.InterpretURL(sipAddress);
Address addr = LinphoneManager.Instance.Core.InterpretUrl(sipAddress);
if (addr != null && addr.AsStringUriOnly().Equals(call.RemoteAddress.AsStringUriOnly()))
{
LinphoneManager.Instance.Core.AcceptCall(call);
......
......@@ -50,7 +50,7 @@ namespace Linphone.Controls {
public CallControlsP() {
InitializeComponent();
microphone.IsChecked = LinphoneManager.Instance.Core.IsMicEnabled;
microphone.IsChecked = LinphoneManager.Instance.Core.MicEnabled;
camera.IsEnabled = LinphoneManager.Instance.IsVideoAvailable && LinphoneManager.Instance.NumberOfCameras > 1;
}
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Linphone.Model;
using System;
using Windows.UI.Xaml.Controls;
......
......@@ -16,11 +16,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
using System;
using Linphone.Model;
using BelledonneCommunications.Linphone.Native;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Imaging;
using Windows.UI.Xaml.Input;
using Linphone;
namespace Linphone.Controls {
public partial class IncomingChatBubble : UserControl {
......@@ -45,8 +45,8 @@ namespace Linphone.Controls {
Timestamp.Text = HumanFriendlyTimeStamp;
this.Holding += Bubble_Holding;
string fileName = message.FileTransferName;
string filePath = message.AppData;
string fileName = (message.FileTransferInformation != null) ? message.FileTransferInformation.Name : null;
string filePath = message.FileTransferFilepath;
bool isImageMessage = fileName != null && fileName.Length > 0;
if (isImageMessage) {
Message.Visibility = Visibility.Collapsed;
......@@ -142,7 +142,7 @@ namespace Linphone.Controls {
/// Displays the image in the bubble
/// </summary>
public async void RefreshImage() {
string filePath = ChatMessage.AppData;
string filePath = ChatMessage.FileTransferFilepath;
ProgressBar.Visibility = Visibility.Collapsed;
if (filePath != null && filePath.Length > 0) {
Download.Visibility = Visibility.Collapsed;
......@@ -157,7 +157,7 @@ namespace Linphone.Controls {
}
private void Image_Tap(object sender, TappedRoutedEventArgs e) {
ImageTapped(this, ChatMessage.AppData);
ImageTapped(this, ChatMessage.FileTransferFilepath);
}
}
}
......@@ -34,7 +34,7 @@ namespace Linphone.Controls
{
Button button = sender as Button;
String tag = button.Tag as String;
LinphoneManager.Instance.Core.SendDtmf(Convert.ToChar(tag));
LinphoneManager.Instance.Core.PlayDtmf(Convert.ToSByte(tag), 1000);
}
}
}
......@@ -15,14 +15,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using Linphone.Model;
using BelledonneCommunications.Linphone.Native;
using Windows.UI.Xaml.Media.Imaging;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
using Linphone;
namespace Linphone.Controls {
public partial class OutgoingChatBubble : UserControl, ChatMessageListener {
public partial class OutgoingChatBubble : UserControl {
private ChatMessage _message;
public ChatMessage ChatMessage {
......@@ -39,7 +39,7 @@ namespace Linphone.Controls {
ChatMessage = message;
this.Holding += Bubble_Holding;
string filePath = message.AppData;
string filePath = message.Appdata;
bool isImageMessage = filePath != null && filePath.Length > 0;
if (isImageMessage) {
Message.Visibility = Visibility.Collapsed;
......
......@@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
using Linphone.Model;
using System;
using Windows.UI.Xaml.Controls;
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Windows.UI.Xaml.Media.Imaging;
using Windows.ApplicationModel.Resources;
......
......@@ -11,7 +11,7 @@
<AssemblyName>BelledonneCommunications.Linphone.App</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
......@@ -21,6 +21,7 @@
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
......@@ -93,6 +94,8 @@
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<Content Include="antlr3c.dll" />
<Content Include="antlr3c.pdb" />
<Content Include="Assets\nowebcamCIF.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......@@ -103,7 +106,43 @@
<Content Include="Assets\linphone_user.png" />
<Content Include="Assets\notes_of_the_optimistic.mkv" />
<Content Include="Assets\rootca.pem" />
<None Include="project.json" />
<Content Include="bctoolbox-tester.dll" />
<Content Include="bctoolbox-tester.pdb" />
<Content Include="bctoolbox.dll" />
<Content Include="bctoolbox.pdb" />
<Content Include="bcunit.dll" />
<Content Include="bcunit.pdb" />
<Content Include="belcard.dll" />
<Content Include="belcard.pdb" />
<Content Include="bellesip.dll" />
<Content Include="bellesip.pdb" />
<Content Include="belr.dll" />
<Content Include="belr.pdb" />
<Content Include="bzrtp.dll" />
<Content Include="bzrtp.pdb" />
<Content Include="gsm.dll" />
<Content Include="gsm.pdb" />
<Content Include="libmswasapi.dll" />
<Content Include="libmswasapi.pdb" />
<Content Include="libmswebrtc.dll" />
<Content Include="libmswebrtc.pdb" />
<Content Include="libmswinrtvid.dll" />
<Content Include="libmswinrtvid.pdb" />
<Content Include="linphone.dll" />
<Content Include="linphone.pdb" />
<Content Include="mbedcrypto.dll" />
<Content Include="mbedtls.dll" />
<Content Include="speex.dll" />
<Content Include="speex.pdb" />
<Content Include="speexdsp.dll" />
<Content Include="speexdsp.pdb" />
<Content Include="sqlite3.dll" />
<Content Include="sqlite3.pdb" />
<Content Include="srtp.dll" />
<Content Include="srtp.pdb" />
<Content Include="xml2.dll" />
<Content Include="xml2.pdb" />
<Content Include="zlibd.dll" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
......@@ -243,6 +282,13 @@
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\StoreLogo.scale-200.png" />
<Content Include="mbedx509.dll" />
<Content Include="mediastreamer_base.dll" />
<Content Include="mediastreamer_base.pdb" />
<Content Include="mediastreamer_voip.dll" />
<Content Include="mediastreamer_voip.pdb" />
<Content Include="ortp.dll" />
<Content Include="ortp.pdb" />
<Content Include="Properties\Default.rd.xml" />
</ItemGroup>
<ItemGroup>
......@@ -368,6 +414,10 @@
<PRIResource Include="String\en-US\Resources.resw" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CsWrapper\CsWrapper.csproj">
<Project>{e8fb6309-b31e-4380-992c-bb1609b3ea00}</Project>
<Name>CsWrapper</Name>
</ProjectReference>
<ProjectReference Include="..\submodules\mswinrtvid\MSWinRTVideo.vcxproj">
<Project>{2d0e44c4-e51d-4911-b876-345d1e5e5209}</Project>
<Name>MSWinRTVideo</Name>
......@@ -378,18 +428,31 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsMobile, Version=10.0.10586.0">
<PackageReference Include="Microsoft.ApplicationInsights">
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
<Version>1.2.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
<Version>1.1.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.1.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsMobile, Version=10.0.15063.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
<ItemGroup />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
XCopy /I /Y $(ProjectDir)..\submodules\linphone\mediastreamer2\src\voip\nowebcamCIF.jpg $(ProjectDir)Assets
XCopy /I /Y $(ProjectDir)..\submodules\mediastreamer2\src\voip\nowebcamCIF.jpg $(ProjectDir)Assets
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\incoming_chat.wav $(ProjectDir)Assets
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\dont_wait_too_long.mkv $(ProjectDir)Assets
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\ringback.wav $(ProjectDir)Assets
......@@ -402,4 +465,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
\ No newline at end of file
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Linphone.Model;
using System;
using System.ComponentModel;
......
......@@ -24,7 +24,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
using Windows.Storage;
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Windows.ApplicationModel.Email;
namespace Linphone.Model {
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
namespace Linphone.Model {
/// <summary>
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using System;
using System.Diagnostics;
using Windows.UI.Xaml.Media.Imaging;
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -46,7 +46,7 @@ namespace Linphone.Model {
public string LatestMessage {
get {
string lastText = Messages.Last().Text;
if (lastText == null || lastText.Length <= 0 || Messages.Last().AppData != "") {
if (lastText == null || lastText.Length <= 0 || Messages.Last().Appdata != "") {
return null;
}
return lastText;
......@@ -73,7 +73,7 @@ namespace Linphone.Model {
public Visibility IsLastMessageImage {
get {
if (Messages.Last().FileTransferFilepath != "" || Messages.Last().AppData != "") {
if (Messages.Last().FileTransferFilepath != "" || Messages.Last().Appdata != "") {
return Visibility.Visible;
} else {
return Visibility.Collapsed;
......@@ -92,7 +92,7 @@ namespace Linphone.Model {
/// <summary>
/// Public constructor.
/// </summary>
public Conversation(string sipAddress, string displayName, IList<ChatMessage> messages) {
public Conversation(string sipAddress, string displayName, IEnumerable<ChatMessage> messages) {
SipAddress = sipAddress;
DisplayedName = displayName;
Messages = new List<ChatMessage>();
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using Linphone.Model;
using System;
using System.Diagnostics;
......@@ -63,7 +63,7 @@ namespace Linphone.Views {
Call call = LinphoneManager.Instance.Core.CurrentCall;
if (call == null) {
if (LinphoneManager.Instance.Core.CallsNb > 0) {
call = (Call)LinphoneManager.Instance.Core.Calls[0];
call = (Call)LinphoneManager.Instance.Core.Calls.GetEnumerator();
}
}
return call;
......@@ -168,7 +168,7 @@ namespace Linphone.Views {
public void ShowVideo() {
Debug.WriteLine("[InCall] ShowVideo");
ShowRemoteVideo();
if (LinphoneManager.Instance.Core.IsSelfViewEnabled) {
if (LinphoneManager.Instance.Core.SelfViewEnabled) {
ShowLocalVideo();
}
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using System;
using Windows.UI.Xaml.Data;
......@@ -22,8 +22,8 @@ namespace Linphone.Model {
public class SipUriToUsernameConverter : IValueConverter {
public object Convert(object value, Type targetType, object parameter, string language) {
string sipAddress = (string)value;
Address addr = LinphoneManager.Instance.Core.InterpretURL(sipAddress);
return addr.UserName;
Address addr = LinphoneManager.Instance.Core.InterpretUrl(sipAddress);
return addr.Username;
}
public object ConvertBack(object value, Type targetType, object parameter, string language) {
......
......@@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
using BelledonneCommunications.Linphone.Native;
using Linphone;
using System;
using System.Diagnostics;
using System.IO;
......@@ -120,8 +120,8 @@ namespace Linphone.Model {
if (addr.DisplayName != null && addr.DisplayName.Length > 0) {
return addr.DisplayName;
} else {
if (addr.UserName != null && addr.UserName.Length > 0) {
return addr.UserName;
if (addr.Username != null && addr.Username.Length > 0) {
return addr.Username;
} else {
return addr.AsStringUriOnly();
}
......
......@@ -11,12 +11,13 @@
<AssemblyName>LinphoneTasks</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
......@@ -103,15 +104,16 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
<Compile Include="CurrentOperation.cs" />
<Compile Include="PhoneCallTask.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.0.0</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
......
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"