Commit f15a1224 authored by atraczyk's avatar atraczyk Committed by Andreas Traczyk

solution: updates to accomodate changes in the daemon project

Change-Id: Id77ea6f7575ebcacef67a8dee9eb2399195d6622
Tuleap: #790
parent c77b8dee
......@@ -666,7 +666,7 @@ RingD::registerCallbacks()
}*/
}));
}),
DRing::exportable_callback<DRing::Debug::MessageSend>([&](const std::string& msg)
DRing::exportable_callback<DRing::DebugSignal::MessageSend>([&](const std::string& msg)
{
if (debugModeOn_) {
dispatcher->RunAsync(CoreDispatcherPriority::High,
......@@ -689,7 +689,7 @@ RingD::registerCallbacks()
};
registerCallHandlers(getAppPathHandler);
getAppUserNameHandler =
/*getAppUserNameHandler =
{
DRing::exportable_callback<DRing::ConfigurationSignal::GetAppUserName>
([this](std::vector<std::string>* unames) {
......@@ -699,7 +699,7 @@ RingD::registerCallbacks()
UserModel::instance->lastName));
})
};
registerCallHandlers(getAppUserNameHandler);
registerCallHandlers(getAppUserNameHandler);*/
incomingVideoHandlers =
{
......
This diff is collapsed.
......@@ -141,13 +141,13 @@
<ClCompile>
<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>
<AdditionalIncludeDirectories>contrib\qrencode-win32;..\ring-daemon\MSVC;..\ring-daemon\src\media;..\ring-daemon\src;..\ring-daemon\src\dring;..\ring-daemon\contrib\build\include;..\ring-daemon\contrib\build\include\pjlib;..\ring-daemon\contrib\build\pjproject\third_party\speex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATICLIB;RING_UWP;WIN32_NATIVE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CompileAsWinRT>true</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\bin\x64;$(SolutionDir)..\ring-daemon\contrib\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;$(SolutionDir)x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\build\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\build\bin\x64;$(SolutionDir)..\ring-daemon\contrib\build\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;$(SolutionDir)x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
......@@ -252,31 +252,31 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avcodec-57.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avcodec-57.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avdevice-57.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avdevice-57.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avfilter-6.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avfilter-6.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avformat-57.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avformat-57.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avutil-55.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avutil-55.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\libeay32.dll">
<None Include="..\ring-daemon\contrib\build\restbed\dependency\openssl\out32dll\libeay32.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\ssleay32.dll">
<None Include="..\ring-daemon\contrib\build\restbed\dependency\openssl\out32dll\ssleay32.dll">
<DeploymentContent>true</DeploymentContent>
</None>
<None Include="ring-client-uwp_StoreKey.pfx" />
......
......@@ -227,35 +227,35 @@
<None Include="ring-client-uwp_StoreKey.pfx" />
<None Include="ring-client-uwp_TemporaryKey.pfx" />
<None Include="Package.StoreAssociation.xml" />
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avcodec-57.dll">
<None Include="Package.StoreAssociation.xml" />
<None Include="ring-client-uwp_StoreKey.pfx" />
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avcodec-57.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avdevice-57.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avdevice-57.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avfilter-6.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avfilter-6.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avformat-57.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avformat-57.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avutil-55.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avutil-55.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">
<None Include="..\ring-daemon\contrib\build\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\libeay32.dll">
<None Include="..\ring-daemon\contrib\build\restbed\dependency\openssl\out32dll\libeay32.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="..\restbed\dependency\openssl\out32dll\ssleay32.dll">
<None Include="..\ring-daemon\contrib\build\restbed\dependency\openssl\out32dll\ssleay32.dll">
<Filter>Assets\Dlls</Filter>
</None>
<None Include="Package.StoreAssociation.xml" />
<None Include="ring-client-uwp_StoreKey.pfx" />
</ItemGroup>
<ItemGroup>
<Page Include="MainPage.xaml" />
......
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