Commit 2645cdbd authored by Erwan Croze's avatar Erwan Croze 👋🏻

Fix: windows 10 ring back and toon

parent bd075a7d
......@@ -17,6 +17,8 @@ video_jitt_comp=60
nortp_timeout=30
[sound]
remote_ring=Assets/Sounds/ringback.wav
local_ring=Assets/Sounds/rings/notes_of_the_optimistic.mkv
dtmf_player_amp=0.1
[misc]
......
......@@ -93,11 +93,15 @@
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<Content Include="Assets\images\nowebcamCIF.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\linphonerc" />
<Content Include="Assets\linphonerc-factory" />
<Content Include="Assets\avatar.png" />
<Content Include="Assets\avatar2.png" />
<Content Include="Assets\linphone_user.png" />
<Content Include="Assets\Sounds\rings\notes_of_the_optimistic.mkv" />
<Content Include="Assets\rootca.pem" />
<None Include="project.json" />
</ItemGroup>
......@@ -226,6 +230,15 @@
<Content Include="Assets\led_disconnected.png" />
<Content Include="Assets\led_error.png" />
<Content Include="Assets\led_inprogress.png" />
<Content Include="Assets\Sounds\incoming_chat.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Sounds\ringback.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Sounds\toy-mono.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
......@@ -369,10 +382,19 @@
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
<ItemGroup />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
XCopy /I /Y $(ProjectDir)..\submodules\linphone\mediastreamer2\src\voip\nowebcamCIF.jpg $(ProjectDir)Assets\images\
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\incoming_chat.wav $(ProjectDir)Assets\Sounds\
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\toy-mono.wav $(ProjectDir)Assets\Sounds\
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\ringback.wav $(ProjectDir)Assets\Sounds\
XCopy /I /Y $(ProjectDir)..\submodules\linphone\share\rings\notes_of_the_optimistic.mkv $(ProjectDir)Assets\Sounds\rings\</PreBuildEvent>
</PropertyGroup>
<!-- 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">
......
......@@ -1484,7 +1484,6 @@ void Core::Init()
RefToPtrProxy<Core^> *proxy = new RefToPtrProxy<Core^>(this);
this->lc = linphone_core_new_with_config(vtable, config ? config->config : NULL, proxy);
linphone_core_set_ring(this->lc, nullptr);
linphone_core_use_preview_window(this->lc, TRUE);
}
......
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