diff --git a/Linphone.sln b/Linphone.sln
index e2be3b8ecb76b0d3c0254184631b45655550778d..d159d34208d93000218b0348daa4a6c80f016a4f 100644
--- a/Linphone.sln
+++ b/Linphone.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1321
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31424.327
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linphone", "Linphone\Linphone.csproj", "{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}"
ProjectSection(ProjectDependencies) = postProject
@@ -28,8 +28,8 @@ Global
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x64.ActiveCfg = Debug|x64
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x64.Build.0 = Debug|x64
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x64.Deploy.0 = Debug|x64
- {6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x86.ActiveCfg = Release|x64
- {6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x86.Build.0 = Release|x64
+ {6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x86.ActiveCfg = Debug|x86
+ {6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Debug|x86.Build.0 = Debug|x86
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Release|Any CPU.ActiveCfg = Release|x64
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Release|ARM.ActiveCfg = Release|x64
{6122CCBD-FB37-48CE-9C50-0C8A35003AE6}.Release|x64.ActiveCfg = Release|x64
diff --git a/Linphone/App.xaml b/Linphone/App.xaml
index 6cdcd4cb5a516dad42cbded8074ad8967294669b..6927371779f483ec6253a1b686f0cd57365348ce 100644
--- a/Linphone/App.xaml
+++ b/Linphone/App.xaml
@@ -8,10 +8,10 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="Styles/Styles.xaml"></ResourceDictionary>
+ <ResourceDictionary Source="ms-appx:///Styles/Styles.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
<ResourceDictionary.ThemeDictionaries>
- <ResourceDictionary x:Key="Light" Source="Styles/Light.xaml"></ResourceDictionary>
+ <ResourceDictionary x:Key="Light" Source="ms-appx:///Styles/Light.xaml"></ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</Application.Resources>
diff --git a/Linphone/Linphone.csproj b/Linphone/Linphone.csproj
index 948e5671716533af9ac0afaf6ed8762bd12a079c..bfc8a5046a3cf81b94b451f219a118fd7d973b48 100644
--- a/Linphone/Linphone.csproj
+++ b/Linphone/Linphone.csproj
@@ -84,7 +84,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS;CODE_ANALYSIS</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NETFX_CORE;CODE_ANALYSIS;CODE_ANALYSIS;CODE_ANALYSIS;CODE_ANALYSIS;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -386,7 +386,7 @@
<Version>2.1.13</Version>
</PackageReference>
<PackageReference Include="LinphoneSDK">
- <Version>4.5.0-alpha.316</Version>
+ <Version>*</Version>
</PackageReference>
<PackageReference Include="Microsoft.ApplicationInsights">
<Version>2.16.0</Version>
diff --git a/Linphone/Model/LinphoneManager.cs b/Linphone/Model/LinphoneManager.cs
index b146fdca62c1b46216175da5db03d99398c94a9a..9392f3be43a83d3810cd450eaf0ff68d02fbe41c 100644
--- a/Linphone/Model/LinphoneManager.cs
+++ b/Linphone/Model/LinphoneManager.cs
@@ -61,6 +61,8 @@ namespace Linphone.Model {
}
public static void StopVideoStream()
{
+ LinphoneManager.Instance.Core.NativePreviewWindowId = null;
+ LinphoneManager.Instance.Core.NativeVideoWindowId = null;
}
private PushNotificationChannel channel;
@@ -550,8 +552,9 @@ namespace Linphone.Model {
CreateAudioDeviceInputNodeResult resultNode = await audioGraph.CreateDeviceInputNodeAsync(Windows.Media.Capture.MediaCategory.Media);
AudioDeviceInputNode deviceInputNode = resultNode.DeviceInputNode;
-
- deviceInputNode.Dispose();
+ if(deviceInputNode != null)
+ deviceInputNode.Dispose();
+ if(audioGraph != null)
audioGraph.Dispose();
}
diff --git a/Linphone/Views/AudioSettings.xaml b/Linphone/Views/AudioSettings.xaml
index 98119490e132847d0fe3f373b814959bad5f1b26..028cc92b14f4eeb8eeb1af8c59d232e3bac6c7b8 100644
--- a/Linphone/Views/AudioSettings.xaml
+++ b/Linphone/Views/AudioSettings.xaml
@@ -73,6 +73,19 @@
x:Name="GSM"
x:Uid="GSMCodec">
</ToggleSwitch>
+
+ <ToggleSwitch
+ Grid.Row="8"
+ x:Name="AMRWB"
+ x:Uid="AMRWBCodec">
+ </ToggleSwitch>
+
+ <ToggleSwitch
+ Grid.Row="9"
+ x:Name="AMRNB"
+ x:Uid="AMRNBCodec">
+ </ToggleSwitch>
+
</Grid>
</ScrollViewer.Content>
</ScrollViewer>
diff --git a/Linphone/Views/AudioSettings.xaml.cs b/Linphone/Views/AudioSettings.xaml.cs
index 8eb319040514cf3b1e3d3c11e4cc0b4ae7769a62..a25466aef0a974e26519d1a60281d5ee148c9189 100644
--- a/Linphone/Views/AudioSettings.xaml.cs
+++ b/Linphone/Views/AudioSettings.xaml.cs
@@ -48,6 +48,9 @@ namespace Linphone.Views {
//G729.IsEnabled = Customs.EnableG729;
GSM.IsOn = _settings.GSM;
OPUS.IsOn = _settings.OPUS;
+ AMRWB.IsOn = _settings.AMRWB;
+ AMRNB.IsOn = _settings.AMRNB;
+
}
/// <summary>
@@ -77,6 +80,8 @@ namespace Linphone.Views {
_settings.G729 = ToBool(G729.IsOn);
_settings.GSM = ToBool(GSM.IsOn);
_settings.OPUS = ToBool(OPUS.IsOn);
+ _settings.AMRWB = ToBool(AMRWB.IsOn);
+ _settings.AMRNB = ToBool(AMRNB.IsOn);
_settings.Save();
}
diff --git a/Linphone/Views/InCall.xaml.cs b/Linphone/Views/InCall.xaml.cs
index 71f87adb9818200015e4f0ccf8fe7e8d282c3455..ea04281723194c08348517896108a6de1ca0fbe7 100644
--- a/Linphone/Views/InCall.xaml.cs
+++ b/Linphone/Views/InCall.xaml.cs
@@ -60,7 +60,10 @@ namespace Linphone.Views {
Loaded += OnPageLoaded;
if (LinphoneManager.Instance.IsVideoAvailable) {
VideoGrid.Visibility = Visibility.Collapsed;
+ StartVideoStream();// Initialize to avoid create new windows.
}
+ else
+ StopVideoStream();
if (LinphoneManager.Instance.Core.CurrentCall.State == CallState.StreamsRunning)
Status.Text = "00:00:00";
@@ -120,6 +123,7 @@ private async void buttons_VideoClick(object sender, bool isVideoOn) {
return;
CallParams param = LinphoneManager.Instance.Core.CreateCallParams(call);
param.VideoEnabled = isVideoOn;
+ param.VideoDirection = MediaDirection.SendRecv;
call.Update(param);
if(isVideoOn)
StartVideoStream();