Commit 8e94cf9b authored by atraczyk's avatar atraczyk Committed by Nicolas Jager

solution: add natpmp

- adds libnatpmp to solution as dependency

Change-Id: Iad3bc6abea375f6c48fb96899b8b0e43248ff2fc
Tuleap: #1236
parent 44bedef9
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.0.0" />
<Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.5.0" />
<mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>GNU Ring</DisplayName>
......
......@@ -573,7 +573,6 @@ RingClientUWP::RingD::startDaemon()
}),
DRing::exportable_callback<DRing::VideoSignal::DecodingStarted>
([this](const std::string &id, const std::string &shmPath, int width, int height, bool isMixer) {
MSG_("<DecodingStarted>");
Video::VideoManager::instance->rendererManager()->startedDecoding(
Utils::toPlatformString(id),
width,
......@@ -581,8 +580,6 @@ RingClientUWP::RingD::startDaemon()
}),
DRing::exportable_callback<DRing::VideoSignal::DecodingStopped>
([this](const std::string &id, const std::string &shmPath, bool isMixer) {
MSG_("<DecodingStopped>");
MSG_("Removing renderer id:" + id);
Video::VideoManager::instance->rendererManager()->removeRenderer(Utils::toPlatformString(id));
})
};
......@@ -596,7 +593,6 @@ RingClientUWP::RingD::startDaemon()
std::vector<std::string> *formats,
std::vector<unsigned> *sizes,
std::vector<unsigned> *rates) {
MSG_("\n<GetCameraInfo>\n");
auto device_list = VideoManager::instance->captureManager()->deviceList;
for (unsigned int i = 0; i < device_list->Size; i++) {
......@@ -619,13 +615,11 @@ RingClientUWP::RingD::startDaemon()
const int width,
const int height,
const int rate) {
MSG_("\n<SetParameters>\n");
VideoManager::instance->captureManager()->activeDevice->SetDeviceProperties(
Utils::toPlatformString(format),width,height,rate);
}),
DRing::exportable_callback<DRing::VideoSignal::StartCapture>
([&](const std::string& device) {
MSG_("\n<StartCapture>\n");
dispatcher->RunAsync(CoreDispatcherPriority::High,
ref new DispatchedHandler([=]() {
VideoManager::instance->captureManager()->InitializeCameraAsync();
......@@ -634,7 +628,6 @@ RingClientUWP::RingD::startDaemon()
}),
DRing::exportable_callback<DRing::VideoSignal::StopCapture>
([&]() {
MSG_("\n<StopCapture>\n");
dispatcher->RunAsync(CoreDispatcherPriority::High,
ref new DispatchedHandler([=]() {
VideoManager::instance->captureManager()->StopPreviewAsync();
......@@ -646,6 +639,19 @@ RingClientUWP::RingD::startDaemon()
};
registerVideoHandlers(outgoingVideoHandlers);
std::map<std::string, SharedCallback> nameRegistrationHandlers =
{
/*}),
DRing::exportable_callback<ConfigurationSignal::NameRegistrationEnded>(
[this](const std::string &accountId, int status, const std::string &name) {
MSG_("\n<NameRegistrationEnded>\n");
}),
DRing::exportable_callback<ConfigurationSignal::RegisteredNameFound>(
[this](const std::string &accountId, int status, const std::string &address, const std::string &name) {
MSG_("\n<RegisteredNameFound>\n");*/
};
DRing::init(static_cast<DRing::InitFlag>(DRing::DRING_FLAG_CONSOLE_LOG |
DRing::DRING_FLAG_DEBUG));
......
......@@ -202,6 +202,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpjproject", "..\ring-dae
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "..\ring-daemon\contrib\pjproject\third_party\build\yuv\libyuv.vcxproj", "{6AC9B65F-0862-4A5C-8A9D-141516993130}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libnatpmp", "libnatpmp", "{A63F4502-E0B5-46C7-AC43-5EFB5361E1DE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnatpmp", "..\ring-daemon\contrib\libnatpmp\msvc\libnatpmp.vcxproj", "{D59B6527-F3DE-4D26-A08D-52F1EE989301}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
......@@ -5972,6 +5976,118 @@ Global
{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.Build.0 = Release-Static|x64
{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x86.ActiveCfg = Release-Static|Win32
{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x86.Build.0 = Release-Static|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug|ARM.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLL|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dll|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Dynamic|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DebugLib|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Lib|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Debug-Static|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|x64.Build.0 = Debug|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Debug|x86.Build.0 = Debug|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.DLL-Import Release|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release|ARM.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLL|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dll|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Dynamic|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLib|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Lib|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.ReleaseLTO|x86.Build.0 = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|ARM.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|ARM.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|x64.ActiveCfg = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|x64.Build.0 = Release|x64
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|x86.ActiveCfg = Release|Win32
{D59B6527-F3DE-4D26-A08D-52F1EE989301}.Release-Static|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -6041,5 +6157,7 @@ Global
{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F6875B41-FE04-419C-B591-0301263BEA45}
{23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {F6875B41-FE04-419C-B591-0301263BEA45}
{6AC9B65F-0862-4A5C-8A9D-141516993130} = {F6875B41-FE04-419C-B591-0301263BEA45}
{A63F4502-E0B5-46C7-AC43-5EFB5361E1DE} = {96846C59-E0A1-4132-B779-065C2EAE3E51}
{D59B6527-F3DE-4D26-A08D-52F1EE989301} = {A63F4502-E0B5-46C7-AC43-5EFB5361E1DE}
EndGlobalSection
EndGlobal
......@@ -142,7 +142,7 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4267;4129;4973;4018;</DisableSpecificWarnings>
<AdditionalIncludeDirectories>contrib\qrencode-win32;..\ring-daemon\MSVC;..\ring-daemon\src\media;..\ring-daemon\src;..\ring-daemon\src\dring;..\ring-daemon\contrib\include;..\ring-daemon\contrib\include\pjlib;..\ring-daemon\contrib\pjproject\third_party\speex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32_NATIVE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>STATICLIB;WIN32_NATIVE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CompileAsWinRT>true</CompileAsWinRT>
</ClCompile>
......@@ -258,6 +258,12 @@
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\libeay32.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DeploymentContent>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\ssleay32.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</DeploymentContent>
</None>
<None Include="ring-client-uwp_StoreKey.pfx" />
<None Include="ring-client-uwp_TemporaryKey.pfx" />
</ItemGroup>
......
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