Commit 89fe75ac authored by Erwan Croze's avatar Erwan Croze 👋🏻

Finish modification for new C# wrapper

parent ed74636e
......@@ -26,6 +26,8 @@
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\CsWrapper.XML</DocumentationFile>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
......@@ -105,25 +107,29 @@
<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>
<PreBuildEvent>
XCopy /C /Y $(SolutionDir)OUTPUT\win10-x64\share\linphonecs\LinphoneWrapper.cs $(SolutionDir)CsWrapper\
XCopy /C /Y $(SolutionDir)OUTPUT\win10-ARM\share\linphonecs\LinphoneWrapper.cs $(SolutionDir)CsWrapper\
XCopy /C /Y $(SolutionDir)OUTPUT\win10-x86\share\linphonecs\LinphoneWrapper.cs $(SolutionDir)CsWrapper\
</PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Compile Include="LinphoneWrapper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Properties\CsWrapper.rd.xml" />
</ItemGroup>
<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.
<!-- 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
</Project>
This diff is collapsed.
......@@ -13,8 +13,6 @@ 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
......@@ -77,22 +75,6 @@ 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
......
Linphone/Assets/StoreLogo.scale-200.png

2.82 KB | W: | H:

Linphone/Assets/StoreLogo.scale-200.png

8.02 KB | W: | H:

Linphone/Assets/StoreLogo.scale-200.png
Linphone/Assets/StoreLogo.scale-200.png
Linphone/Assets/StoreLogo.scale-200.png
Linphone/Assets/StoreLogo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -94,8 +94,6 @@
</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>
......@@ -106,43 +104,6 @@
<Content Include="Assets\linphone_user.png" />
<Content Include="Assets\notes_of_the_optimistic.mkv" />
<Content Include="Assets\rootca.pem" />
<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">
......@@ -282,13 +243,6 @@
<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>
......@@ -414,10 +368,6 @@
<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>
......@@ -446,6 +396,7 @@
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
<ItemGroup />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
......
......@@ -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 != null) {
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 != null || Messages.Last().Appdata != null) {
return Visibility.Visible;
} else {
return Visibility.Collapsed;
......
This diff is collapsed.
......@@ -161,7 +161,7 @@ namespace Linphone.Model {
public async void Save() {
if (ValueChanged(LogLevelKeyName)) {
try {
Config.SetInt(ApplicationSection, LogLevelKeyName, Convert.ToInt32(GetNew(LogLevelKeyName)));
//Config.SetInt(ApplicationSection, LogLevelKeyName, Convert.ToInt32(GetNew(LogLevelKeyName)));
//LinphoneManager.Instance.ConfigureLog(LogLevel);
} catch {
// Core.LogLevel.Warn("Failed setting the log level name {0}", Get(LogLevelKeyName));
......@@ -247,6 +247,7 @@ namespace Linphone.Model {
private const string TransportKeyName = "Transport";
private const string ExpireKeyName = "Expire";
private const string AVPFKeyName = "AVPF";
private const string Ice = "ICE";
private Dictionary<TransportType, string> EnumToTransport;
private Dictionary<string, TransportType> TransportToEnum;
......@@ -283,6 +284,7 @@ namespace Linphone.Model {
dict[TransportKeyName] = "UDP";
dict[ExpireKeyName] = "";
dict[AVPFKeyName] = false.ToString();
dict[Ice] = false.ToString();
ProxyConfig cfg = LinphoneManager.Instance.Core.DefaultProxyConfig;
if (cfg != null) {
......@@ -300,6 +302,8 @@ namespace Linphone.Model {
dict[PasswordKeyName] = authInfo.Passwd;
dict[UserIdKeyName] = authInfo.Userid;
}
if (cfg.NatPolicy == null) cfg.NatPolicy = LinphoneManager.Instance.Core.CreateNatPolicy();
dict[Ice] = cfg.NatPolicy.IceEnabled.ToString();
dict[DisplayNameKeyName] = address.DisplayName;
dict[AVPFKeyName] = cfg.AvpfEnabled.ToString();
}
......@@ -341,6 +345,7 @@ namespace Linphone.Model {
String transport = GetNew(TransportKeyName);
String expires = GetNew(ExpireKeyName);
bool avpf = Convert.ToBoolean(GetNew(AVPFKeyName));
bool ice = Convert.ToBoolean(GetNew(Ice));
bool outboundProxy = Convert.ToBoolean(GetNew(OutboundProxyKeyName));
lc.ClearAllAuthInfo();
......@@ -377,6 +382,10 @@ namespace Linphone.Model {
cfg.Route = cfg.ServerAddr;
}
if (cfg.NatPolicy != null) {
cfg.NatPolicy.IceEnabled = ice;
}
int result = 0;
int.TryParse(expires, out result);
if (result != 0) {
......@@ -525,6 +534,18 @@ namespace Linphone.Model {
Set(AVPFKeyName, value.ToString());
}
}
/// <summary>
/// Ice activated for SIP account (Boolean).
/// </summary>
public bool? ICE {
get {
return Convert.ToBoolean(Get(Ice));
}
set {
Set(Ice, value.ToString());
}
}
#endregion
}
......@@ -582,9 +603,7 @@ namespace Linphone.Model {
foreach (PayloadType pt in ptlist) {
String keyname = GetKeyNameForCodec(pt.MimeType, pt.ClockRate);
if (keyname != null) {
dict[keyname] = LinphoneManager.Instance.Core.AudioPayloadTypes.ToString();
dict[keyname] += LinphoneManager.Instance.Core.VideoPayloadTypes.ToString();
dict[keyname] += LinphoneManager.Instance.Core.TextPayloadTypes.ToString();
dict[keyname] = Convert.ToString(pt.Enabled());
} else {
//Logger.Warn("Codec {0}/{1} supported by core is not shown in the settings view, disable it", pt.MimeType, pt.ClockRate);
pt.Enable(false);
......@@ -989,6 +1008,7 @@ namespace Linphone.Model {
private Dictionary<string, MediaEncryption> MediaEncryptionToEnum;
private Dictionary<string, string> StringToTunnelMode;
private Boolean IPV6Enabled;
private Boolean Ice;
public Dictionary<MediaEncryption, string> EnumToMediaEncryption;
#region Constants settings names
......@@ -1077,10 +1097,6 @@ namespace Linphone.Model {
/// Save the network settings.
/// </summary>
public void Save() {
if (ValueChanged(FirewallPolicyKeyName)) {
string firewallPolicy = GetNew(FirewallPolicyKeyName);
}
if (ValueChanged(StunServerKeyName))
LinphoneManager.Instance.Core.StunServer = GetNew(StunServerKeyName);
......@@ -1090,6 +1106,8 @@ namespace Linphone.Model {
}
LinphoneManager.Instance.Core.Ipv6Enabled = IPV6Enabled;
if (LinphoneManager.Instance.Core.NatPolicy != null)
LinphoneManager.Instance.Core.NatPolicy.IceEnabled = Ice;
// Save tunnel configuration
/* if (LinphoneManager.Instance.Core.TunnelAvailable && Customs.IsTunnelEnabled)
......@@ -1141,14 +1159,14 @@ namespace Linphone.Model {
}
/// <summary>
/// Firewall policy setting (String).
/// Firewall policy setting (Boolean).
/// </summary>
public string FWPolicy {
public Boolean FWPolicy {
get {
return Get(FirewallPolicyKeyName);
return Ice;
}
set {
Set(FirewallPolicyKeyName, value);
Ice = value;
}
}
......
......@@ -116,6 +116,12 @@
</ToggleSwitch>
</StackPanel>
<!--<StackPanel Orientation="Vertical" Grid.Row="7" Margin="0,10,0,0">
<ToggleSwitch
x:Name="IceSwitch" x:Uid="ICESwitch" Header="Ice">
</ToggleSwitch>
</StackPanel>-->
<StackPanel Orientation="Vertical" Grid.Row="7" Margin="0,10,0,0">
<ToggleSwitch
x:Name="AVPF" x:Uid="AVPF" Header="AVPF">
......
......@@ -58,6 +58,7 @@ namespace Linphone.Views {
Transport.SelectedItem = (_settings.Transports != null) ? _settings.Transports : transports[0];
AVPF.IsOn = (_settings.AVPF != null) ? (bool)_settings.AVPF : false;
//IceSwitch.IsOn = (_settings.ICE != null) ? (bool)_settings.ICE : false;
}
private void Save() {
......@@ -78,6 +79,7 @@ namespace Linphone.Views {
_settings.Transports = Transport.SelectedItem.ToString();
_settings.Expires = Expires.Text;
_settings.AVPF = AVPF.IsOn;
//_settings.ICE = IceSwitch.IsOn;
_settings.Save();
......@@ -85,6 +87,7 @@ namespace Linphone.Views {
NetworkSettingsManager networkSettings = new NetworkSettingsManager();
networkSettings.Load();
networkSettings.MEncryption = "SRTP";
//networkSettings.FWPolicy = networkSettings.EnumToFirewallPolicy[FirewallPolicy.UseIce];
networkSettings.StunServer = "stun.linphone.org";
networkSettings.Save();
......
......@@ -19,12 +19,12 @@
Header="MediaEncryptionSetting">
</ComboBox>
<ComboBox
<ToggleSwitch
Margin="0,10,0,0"
x:Name="firewallPolicy"
x:Name="ICE"
x:Uid="FirewallPolicySetting"
Header="FirewallPolicySetting">
</ComboBox>
Header="ICE">
</ToggleSwitch>
<ToggleSwitch
Margin="0,10,0,0"
......
......@@ -57,14 +57,7 @@ namespace Linphone.Views {
mediaEncryption.ItemsSource = mediaEncryptions;
mediaEncryption.SelectedItem = _networkSettings.MEncryption;
List<string> firewallPolicies = new List<string>
{
ResourceLoader.GetForCurrentView().GetString("FirewallPolicyNone"),
ResourceLoader.GetForCurrentView().GetString("FirewallPolicyStun"),
ResourceLoader.GetForCurrentView().GetString("FirewallPolicyIce")
};
firewallPolicy.ItemsSource = firewallPolicies;
firewallPolicy.SelectedItem = _networkSettings.FWPolicy;
ICE.IsOn = LinphoneManager.Instance.Core.NatPolicy.IceEnabled;
Stun.Text = _networkSettings.StunServer;
......@@ -84,8 +77,8 @@ namespace Linphone.Views {
TunnelPanel.Visibility = LinphoneManager.Instance.Core.Tunnel != null ? Visibility.Visible : Visibility.Collapsed; //Hidden properties for now
Debug.IsOn = _settings.DebugEnabled;
SendLogs.IsEnabled = _settings.DebugEnabled;
ResetLogs.IsEnabled = _settings.DebugEnabled;
SendLogs.IsEnabled = true;//_settings.DebugEnabled;
ResetLogs.IsEnabled = true;//_settings.DebugEnabled;
}
private void Save() {
......@@ -95,8 +88,7 @@ namespace Linphone.Views {
if (mediaEncryption.SelectedItem != null)
_networkSettings.MEncryption = mediaEncryption.SelectedItem.ToString();
if (firewallPolicy.SelectedItem != null)
_networkSettings.FWPolicy = firewallPolicy.SelectedItem.ToString();
_networkSettings.FWPolicy = ICE.IsOn;
_networkSettings.StunServer = Stun.Text;
_networkSettings.IPV6 = IPV6.IsOn;
......@@ -129,7 +121,8 @@ namespace Linphone.Views {
/// </summary>
protected override void OnNavigatedFrom(NavigationEventArgs nee) {
base.OnNavigatedFrom(nee);
LinphoneManager.Instance.LogUploadProgressIndicationEH -= LogUploadProgressIndication;
LinphoneManager.Instance.getCoreListener().OnLogCollectionUploadProgressIndication -= LogUploadProgressIndication;
LinphoneManager.Instance.getCoreListener().OnLogCollectionUploadStateChanged -= LogUploadStateChanged;
BugReportUploadPopup.Visibility = Visibility.Collapsed;
}
......@@ -143,7 +136,7 @@ namespace Linphone.Views {
base.OnNavigatingFrom(e);
}
private void LogUploadProgressIndication(int offset, int total) {
private void LogUploadProgressIndication(Core lc, long offset, long total) {
BugReportUploadProgressBar.Maximum = total;
if (offset < total) {
BugReportUploadProgressBar.Value = offset;
......@@ -152,10 +145,17 @@ namespace Linphone.Views {
}
}
private void LogUploadStateChanged(Core lc, CoreLogCollectionUploadState state, string info) {
if (state.Equals(CoreLogCollectionUploadState.NotDelivered)) {
BugReportUploadPopup.Visibility = Visibility.Collapsed;
}
}
private void SendLogs_Click(object sender, RoutedEventArgs e) {
saveSettingsOnLeave = false;
BugReportUploadPopup.Visibility = Visibility.Visible;
LinphoneManager.Instance.LogUploadProgressIndicationEH += LogUploadProgressIndication;
LinphoneManager.Instance.getCoreListener().OnLogCollectionUploadProgressIndication += LogUploadProgressIndication;
LinphoneManager.Instance.getCoreListener().OnLogCollectionUploadStateChanged += LogUploadStateChanged;
LinphoneManager.Instance.Core.UploadLogCollection();
}
......
......@@ -38,17 +38,17 @@ namespace Linphone.Views {
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
_settings.Load();
Speex16.Visibility = Visibility.Collapsed;//.IsOn = _settings.Speex16;
Speex8.Visibility = Visibility.Collapsed;//.IsOn = _settings.Speex8;
PCMU.Visibility = Visibility.Collapsed;//.IsOn = _settings.PCMU;
PCMA.Visibility = Visibility.Collapsed;//.IsOn = _settings.PCMA;
Speex16.IsOn = _settings.Speex16;
Speex8.IsOn = _settings.Speex8;
PCMU.IsOn = _settings.PCMU;
PCMA.IsOn = _settings.PCMA;
//G722.IsOn = _settings.G722;
G729.IsOn = _settings.G729;
//G729.IsEnabled = Customs.EnableG729;
ILBC.IsOn = _settings.ILBC;
SILK16.IsOn = _settings.SILK16;
GSM.Visibility = Visibility.Collapsed;//.IsOn = _settings.GSM;
OPUS.Visibility = Visibility.Collapsed;//.IsOn = _settings.OPUS;
GSM.IsOn = _settings.GSM;
OPUS.IsOn = _settings.OPUS;
ISAC.IsOn = _settings.Isac;
}
......@@ -71,16 +71,16 @@ namespace Linphone.Views {
}
private void Save() {
//_settings.Speex16 = ToBool(Speex16.IsOn);
//_settings.Speex8 = ToBool(Speex8.IsOn);
//_settings.PCMU = ToBool(PCMU.IsOn);
//_settings.PCMA = ToBool(PCMA.IsOn);
_settings.Speex16 = ToBool(Speex16.IsOn);
_settings.Speex8 = ToBool(Speex8.IsOn);
_settings.PCMU = ToBool(PCMU.IsOn);
_settings.PCMA = ToBool(PCMA.IsOn);
//_settings.G722 = ToBool(G722.IsOn);
_settings.G729 = ToBool(G729.IsEnabled);
_settings.ILBC = ToBool(ILBC.IsOn);
_settings.SILK16 = ToBool(SILK16.IsOn);
//_settings.GSM = ToBool(GSM.IsOn);
//_settings.OPUS = ToBool(OPUS.IsOn);
_settings.GSM = ToBool(GSM.IsOn);
_settings.OPUS = ToBool(OPUS.IsOn);
_settings.Isac = ToBool(ISAC.IsOn);
_settings.Save();
}
......
......@@ -131,6 +131,7 @@ namespace Linphone.Views {
private void SendMessage(string message) {
if (chatRoom != null) {
ChatMessage chatMessage = chatRoom.CreateMessage(message);
chatMessage.Listener.OnMsgStateChanged = MessageStateChanged;
chatRoom.SendChatMessage(chatMessage);
}
}
......
......@@ -59,10 +59,7 @@ namespace Linphone.Views {
protected override void OnNavigatedTo(NavigationEventArgs e) {
/*ContactManager cm = ContactManager.Instance;
cm.ContactFound += cm_ContactFound;
*/
cm.ContactFound += cm_ContactFound;*/
LinphoneManager.Instance.MessageReceived += MessageReceived;
GetMessagesAndDisplayConversationsList();
......@@ -82,8 +79,6 @@ namespace Linphone.Views {
GetMessagesAndDisplayConversationsList();
}
/// <summary>
/// Callback called when the search on a phone number or an email for a contact has a match
/// </summary>
......@@ -150,7 +145,7 @@ namespace Linphone.Views {
foreach (var i in _conversations.OrderByDescending(g => g.Messages.Last().Time).ToList()) {
_sortedConversations.Add(i);
}
// ((ChatsModel)ViewModel).Conversations = _sortedConversations;*/
//((ChatsModel)ViewModel).Conversations = _sortedConversations;*/
SetCommandsVisibility(Conversations);
}
......
......@@ -19,6 +19,7 @@ using Linphone.Model;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading;
using Windows.ApplicationModel.Resources;
using Windows.Devices.Sensors;
......@@ -327,8 +328,8 @@ namespace Linphone.Views {
_previewSource = new MSWinRTVideo.SwapChainPanelSource();
_previewSource.Start(PreviewSwapChainPanel);
/*LinphoneManager.Instance.Core.NativeVideoWindowId = VideoSwapChainPanel.Name; TODO
LinphoneManager.Instance.Core.NativePreviewWindowId = PreviewSwapChainPanel.Name;*/
LinphoneManager.Instance.Core.NativeVideoWindowId = VideoSwapChainPanel.Name;
LinphoneManager.Instance.Core.NativePreviewWindowId = PreviewSwapChainPanel.Name;
} catch (Exception e) {
Debug.WriteLine(String.Format("StartVideoStream: Exception {0}", e.Message));
}
......
......@@ -52,7 +52,7 @@ namespace Linphone.Views {
"qvga"
};
PreferredVideoSize.ItemsSource = videoSizes;
PreferredVideoSize.SelectedItem = _callSettings.PreferredVideoSize;
PreferredVideoSize.SelectedItem = (_callSettings.PreferredVideoSize != null) ? _callSettings.PreferredVideoSize : "vga";
_codecsSettings.Load();
foreach (PayloadType p in LinphoneManager.Instance.Core.VideoPayloadTypes) {
......@@ -61,7 +61,7 @@ namespace Linphone.Views {
}
}
H264.IsOn = _codecsSettings.H264;
//VP8.IsOn = _codecsSettings.VP8;
VP8.IsOn = _codecsSettings.VP8;
}
/// <summary>
......@@ -76,15 +76,15 @@ namespace Linphone.Views {
private void Save() {
_codecsSettings.H264 = ToBool(H264.IsOn);
//_codecsSettings.VP8 = ToBool(VP8.IsOn);
_codecsSettings.VP8 = ToBool(VP8.IsOn);
_codecsSettings.Save();
_callSettings.VideoEnabled = ToBool(VideoEnabled.IsOn);
_callSettings.AutomaticallyInitiateVideo = ToBool(AutomaticallyInitiateVideo.IsOn);
_callSettings.AutomaticallyAcceptVideo = ToBool(AutomaticallyAcceptVideo.IsOn);
_callSettings.SelfViewEnabled = ToBool(SelfViewEnabled.IsOn);
_callSettings.PreferredVideoSize = PreferredVideoSize.SelectedItem.ToString();
if (PreferredVideoSize.SelectedItem.ToString() == "vga") {
_callSettings.PreferredVideoSize = (PreferredVideoSize.SelectedItem != null) ? PreferredVideoSize.SelectedItem.ToString() : "vga";
if (_callSettings.PreferredVideoSize == "vga") {
_callSettings.DownloadBandwidth = _callSettings.UploadBandwidth = 512;
} else {
_callSettings.DownloadBandwidth = _callSettings.UploadBandwidth = 380;
......
......@@ -48,7 +48,7 @@ class Win10Target(prepare.Target):
prepare.Target.__init__(self, 'win10-' + arch)
current_path = os.path.dirname(os.path.realpath(__file__))
current_path = current_path.replace('\\', '/')
self.generator = 'Visual Studio 14 2015'
self.generator = 'Visual Studio 15 2017'
self.platform_name = generator_platform
self.config_file = 'configs/config-win10.cmake'
self.output = 'OUTPUT/win10-' + arch
......@@ -345,7 +345,7 @@ cd {current_path}
if %errorlevel% neq 0 goto :cmEnd
C:
if %errorlevel% neq 0 goto :cmEnd
python.exe submodules/build/nuget.py -s OUTPUT -w WORK/NuGet{target} -v {version} -t {target} {platforms}
python.exe submodules/build/nuget.py -s OUTPUT -w WORK/NuGet{target} -cs CsWrapper -v {version} -t {target} {platforms}
if %errorlevel% neq 0 goto :cmEnd
cd {current_path}/OUTPUT
if %errorlevel% neq 0 goto :cmEnd
......@@ -375,6 +375,8 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
for platform in self.args.target:
project_dependencies += """\t\t{project_guid} = {project_guid}
""".format(project_guid=guids[platform])
project_dependencies += """\t\t{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} = {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
"""
for sdk in other_sdks:
project_dependencies += """\t\t{project_guid} = {project_guid}
""".format(project_guid=guids[sdk])
......@@ -390,11 +392,17 @@ EndProject
"""\t\t{project_guid}.{build_type}|Win32.ActiveCfg = {build_type}|Win32
\t\t{project_guid}.{build_type}|Win32.Build.0 = {build_type}|Win32
""".format(project_guid=guid, build_type=build_type)
sln_confs += \
"""\t\t{project_guid}.{build_type}|Win32.ActiveCfg = {build_type}|Any CPU
\t\t{project_guid}.{build_type}|Win32.Build.0 = {build_type}|Any CPU
""".format(project_guid="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", build_type=build_type)
# Generate Visual Studio solution to build the SDK
sln = """Microsoft Visual Studio Solution File, Format Version 12.00
MinimumVisualStudioVersion = 10.0.40219.1
{sln_projects}Global
{sln_projects}Project("{{E8FB6309-B31E-4380-992C-BB1609B3EA00}}") = "CsWrapper", "CsWrapper\CsWrapper.csproj", "{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}"
EndProject
Global
\tGlobalSection(SolutionConfigurationPlatforms) = preSolution
\t\t{build_type}|Win32 = {build_type}|Win32
\tEndGlobalSection
......
bctoolbox @ a37f4186
Subproject commit 763599eb53eeac2e337ca4045af4e5c43d5bdfac
Subproject commit a37f4186b528d4e9b40e61b933dcf8df15735f64
......@@ -112,9 +112,12 @@ def main(argv=None):
pdbs = glob.glob(os.path.join(sdk_dir, platform_dir, 'bin', '*.pdb'))
pdbs += glob.glob(os.path.join(sdk_dir, platform_dir, 'lib', '*.pdb'))
pdbs += glob.glob(os.path.join(sdk_dir, platform_dir, 'lib', 'mediastreamer', 'plugins', '*.pdb'))
wrappers = []
if target_id == "LinphoneSDK":
dlls += glob.glob(os.path.join(args.cswrapper_dir, 'bin', platform.lower(), '*', 'CsWrapper.dll'))
pdbs += glob.glob(os.path.join(args.cswrapper_dir, 'bin', platform.lower(), '*', 'CsWrapper.pdb'))
wrappers += glob.glob(os.path.join(args.cswrapper_dir, 'bin', '*', 'CsWrapper.dll'))
wrappers += glob.glob(os.path.join(args.cswrapper_dir, 'bin', '*', 'CsWrapper.pdb'))
wrappers += glob.glob(os.path.join(args.cswrapper_dir, 'bin', '*', 'CsWrapper.XML'))
if not winmds_installed:
for winmd in winmds:
......@@ -144,6 +147,10 @@ def main(argv=None):
shutil.copy(pdb, os.path.join(work_dir, 'runtimes', platform_dir, 'native'))
elif not basename_noext in ignored_winmds:
shutil.copy(pdb, os.path.join(work_dir, 'build', 'uap10.0', platform))
for wrap in wrappers:
if not os.path.exists(os.path.join(work_dir, 'lib', 'uap10.0')):
os.makedirs(os.path.join(work_dir, 'lib', 'uap10.0'))
shutil.copy(wrap, os.path.join(work_dir, 'lib', 'uap10.0'))
# Write targets file
targets = """<?xml version="1.0" encoding="utf-8"?>
......
cmake-builder @ 0773a40c
Subproject commit c48f48ee3b03d35d43430cae46283f044de29025
Subproject commit 0773a40cfd475fa357fd1ffcf825e5e5b6e0b9d5
linphone @ 1fe9f6d4
Subproject commit e4415e9b16aea8b93f37ced117d16b402e9401c5
Subproject commit 1fe9f6d4c65eef9db2d8378a58b029c0c27c71ae
mswebrtc @ 01401122
Subproject commit 7e159188f502b02b2411eb5a54fc7fd575641f52
Subproject commit 0140112290aa4f2b216155d28d8f70425042709d
mswinrtvid @ c65322b5
Subproject commit 5431c9c5282dd913c6611cbe61ded772c3cdd9f5
Subproject commit c65322b52225b2c42dac2cfa8859405d080c3016
ortp @ 8c8a83bc
Subproject commit 6e05a7f50f9f3acfbf634cddf8a0a1b4e95c378c
Subproject commit 8c8a83bc74c3547138eb48c27877ac90ab4a360b
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