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>
......@@ -46,4 +46,4 @@
<DeviceCapability Name="proximity" />
<DeviceCapability Name="webcam" />
</Capabilities>
</Package>
</Package>
\ No newline at end of file
......@@ -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));
......
This diff is collapsed.
......@@ -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