danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-12-11 16:49:52 +01:00
Code Issues Projects Releases Wiki Activity

Updated UWP wrapper

Browse Source
This commit is contained in:
Fela Ameghino 2018-11-09 17:51:29 +01:00
parent 0f06289d42
commit d6cf1b73d3
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtgvoip.UWP.vcxproj
View File

@ -247,9 +247,12 @@
<ClInclude Include="os\windows\AudioOutputWASAPI.h" /> <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
<ClInclude Include="os\windows\NetworkSocketWinsock.h" /> <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
<ClInclude Include="os\windows\WindowsSandboxUtils.h" /> <ClInclude Include="os\windows\WindowsSandboxUtils.h" />
<ClInclude Include="os\windows\WindowsSpecific.h" />
<ClInclude Include="PacketReassembler.h" /> <ClInclude Include="PacketReassembler.h" />
<ClInclude Include="threading.h" /> <ClInclude Include="threading.h" />
<ClInclude Include="utils.h" /> <ClInclude Include="utils.h" />
<ClInclude Include="video\VideoRenderer.h" />
<ClInclude Include="video\VideoSource.h" />
<ClInclude Include="VoIPController.h" /> <ClInclude Include="VoIPController.h" />
<ClInclude Include="os\windows\CXWrapper.h" /> <ClInclude Include="os\windows\CXWrapper.h" />
<ClInclude Include="VoIPServerConfig.h" /> <ClInclude Include="VoIPServerConfig.h" />
@ -332,7 +335,10 @@
<ClCompile Include="os\windows\AudioOutputWASAPI.cpp" /> <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
<ClCompile Include="os\windows\NetworkSocketWinsock.cpp" /> <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
<ClCompile Include="os\windows\WindowsSandboxUtils.cpp" /> <ClCompile Include="os\windows\WindowsSandboxUtils.cpp" />
<ClCompile Include="os\windows\WindowsSpecific.cpp" />
<ClCompile Include="PacketReassembler.cpp" /> <ClCompile Include="PacketReassembler.cpp" />
<ClCompile Include="video\VideoRenderer.cpp" />
<ClCompile Include="video\VideoSource.cpp" />
<ClCompile Include="VoIPController.cpp" /> <ClCompile Include="VoIPController.cpp" />
<ClCompile Include="os\windows\CXWrapper.cpp" /> <ClCompile Include="os\windows\CXWrapper.cpp" />
<ClCompile Include="VoIPGroupController.cpp" /> <ClCompile Include="VoIPGroupController.cpp" />

21
libtgvoip.UWP.vcxproj.filters
View File

@ -14,6 +14,9 @@
<Filter Include="webrtc_dsp"> <Filter Include="webrtc_dsp">
<UniqueIdentifier>{3b15701a-65dd-4d52-92d4-a7b64a73b293}</UniqueIdentifier> <UniqueIdentifier>{3b15701a-65dd-4d52-92d4-a7b64a73b293}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="video">
<UniqueIdentifier>{e4d2de92-03ad-43d9-8861-d69f64610ba5}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="VoIPController.cpp" /> <ClCompile Include="VoIPController.cpp" />
@ -277,6 +280,15 @@
<ClCompile Include="audio\AudioIO.cpp"> <ClCompile Include="audio\AudioIO.cpp">
<Filter>audio</Filter> <Filter>audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="os\windows\WindowsSpecific.cpp">
<Filter>windows</Filter>
</ClCompile>
<ClCompile Include="video\VideoRenderer.cpp">
<Filter>video</Filter>
</ClCompile>
<ClCompile Include="video\VideoSource.cpp">
<Filter>video</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="VoIPController.h" /> <ClInclude Include="VoIPController.h" />
@ -496,5 +508,14 @@
<Filter>audio</Filter> <Filter>audio</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="utils.h" /> <ClInclude Include="utils.h" />
<ClInclude Include="os\windows\WindowsSpecific.h">
<Filter>windows</Filter>
</ClInclude>
<ClInclude Include="video\VideoRenderer.h">
<Filter>video</Filter>
</ClInclude>
<ClInclude Include="video\VideoSource.h">
<Filter>video</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
os/windows/CXWrapper.cpp
View File

@ -65,7 +65,7 @@ void VoIPControllerWrapper::SetPublicEndpoints(const Platform::Array<libtgvoip::
libtgvoip::Endpoint^ _ep = endpoints[i]; libtgvoip::Endpoint^ _ep = endpoints[i];
tgvoip::Endpoint ep; tgvoip::Endpoint ep;
ep.id = _ep->id; ep.id = _ep->id;
ep.type = tgvoip::Endpoint::TYPE_UDP_RELAY; ep.type = tgvoip::Endpoint::Type::UDP_RELAY;
char buf[128]; char buf[128];
if (_ep->ipv4){ if (_ep->ipv4){
WideCharToMultiByte(CP_UTF8, 0, _ep->ipv4->Data(), -1, buf, sizeof(buf), NULL, NULL); WideCharToMultiByte(CP_UTF8, 0, _ep->ipv4->Data(), -1, buf, sizeof(buf), NULL, NULL);