Commit c35604d7 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Prepared Core for liblinphone

parent 3d43460e
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir> <OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir> <IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<ExtensionsToDeleteOnClean>*.winmd;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean> <ExtensionsToDeleteOnClean>*.winmd;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<TargetName>$(RootNamespace)</TargetName> <TargetName>$(RootNamespace)</TargetName>
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_WINRT_DLL;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_WINRT_DLL;WIN32_LEAN_AND_MEAN;IN_LINPHONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
...@@ -73,14 +74,16 @@ ...@@ -73,14 +74,16 @@
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT> <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT> <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
<GenerateXMLDocumentationFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</GenerateXMLDocumentationFiles> <GenerateXMLDocumentationFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</GenerateXMLDocumentationFiles>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(ProjectDir)../submodules\oRTP\include;$(ProjectDir)../submodules/mediastreamer2/include;$(ProjectDir)../submodules/linphone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalDependencies>windowsphonecore.lib;runtimeobject.lib;PhoneAudioSes.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>windowsphonecore.lib;runtimeobject.lib;PhoneAudioSes.lib;liblinphone_dll.lib;belle-sip_dll.lib;mediastreamer2_dll.lib;ws2_32.lib;ortp_dll.lib;gsm_dll.lib;speex_dll.lib;speexdsp_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</GenerateWindowsMetadata> <GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</GenerateWindowsMetadata>
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</GenerateWindowsMetadata> <GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</GenerateWindowsMetadata>
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">pushd "$(OutDir)" <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">pushd "$(OutDir)"
...@@ -165,6 +168,11 @@ popd</Command> ...@@ -165,6 +168,11 @@ popd</Command>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</DeploymentContent> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</DeploymentContent>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\submodules\linphone\build\vsx\LibLinphone\LibLinphone.vcxproj">
<Project>{08dd0d38-d9b5-4626-b60d-b4d76b571142}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
......
#include "LinphoneAddress.h" #include "LinphoneAddress.h"
#include "Server.h" #include "Server.h"
using namespace Linphone::Core; Platform::String^ Linphone::Core::LinphoneAddress::GetDisplayName()
Platform::String^ LinphoneAddress::GetDisplayName()
{ {
return this->displayName; return this->displayName;
} }
Platform::String^ LinphoneAddress::GetUserName() Platform::String^ Linphone::Core::LinphoneAddress::GetUserName()
{ {
return this->username; return this->username;
} }
Platform::String^ LinphoneAddress::GetDomain() Platform::String^ Linphone::Core::LinphoneAddress::GetDomain()
{ {
return this->domain; return this->domain;
} }
int LinphoneAddress::GetPort() int Linphone::Core::LinphoneAddress::GetPort()
{ {
return -1; return -1;
} }
void LinphoneAddress::SetDisplayName(Platform::String^ name) void Linphone::Core::LinphoneAddress::SetDisplayName(Platform::String^ name)
{ {
this->displayName = name; this->displayName = name;
} }
void LinphoneAddress::SetUserName(Platform::String^ username) void Linphone::Core::LinphoneAddress::SetUserName(Platform::String^ username)
{ {
this->username = username; this->username = username;
} }
void LinphoneAddress::SetDomain(Platform::String^ domain) void Linphone::Core::LinphoneAddress::SetDomain(Platform::String^ domain)
{ {
this->domain = domain; this->domain = domain;
} }
void LinphoneAddress::SetPort(int port) void Linphone::Core::LinphoneAddress::SetPort(int port)
{ {
} }
void LinphoneAddress::Clean() void Linphone::Core::LinphoneAddress::Clean()
{ {
} }
Platform::String^ LinphoneAddress::AsString() Platform::String^ Linphone::Core::LinphoneAddress::AsString()
{ {
return this->address; return this->address;
} }
Platform::String^ LinphoneAddress::AsStringUriOnly() Platform::String^ Linphone::Core::LinphoneAddress::AsStringUriOnly()
{ {
return this->address; return this->address;
} }
Platform::String^ LinphoneAddress::ToString() Platform::String^ Linphone::Core::LinphoneAddress::ToString()
{ {
return this->address; return this->address;
} }
LinphoneAddress::LinphoneAddress(Platform::String^ address) : Linphone::Core::LinphoneAddress::LinphoneAddress(Platform::String^ address) :
address(address) address(address)
{ {
} }
LinphoneAddress::LinphoneAddress(Platform::String^ username, Platform::String^ domain, Platform::String^ displayName) : Linphone::Core::LinphoneAddress::LinphoneAddress(Platform::String^ username, Platform::String^ domain, Platform::String^ displayName) :
address(L"sip:" + username + "@" + domain), address(L"sip:" + username + "@" + domain),
displayName(displayName), displayName(displayName),
username(username), username(username),
...@@ -78,7 +76,7 @@ LinphoneAddress::LinphoneAddress(Platform::String^ username, Platform::String^ d ...@@ -78,7 +76,7 @@ LinphoneAddress::LinphoneAddress(Platform::String^ username, Platform::String^ d
} }
LinphoneAddress::~LinphoneAddress() Linphone::Core::LinphoneAddress::~LinphoneAddress()
{ {
} }
\ No newline at end of file
#include "LinphoneAuthInfo.h" #include "LinphoneAuthInfo.h"
#include "Server.h" #include "Server.h"
using namespace Linphone::Core;
Platform::String^ LinphoneAuthInfo::GetUsername() Platform::String^ Linphone::Core::LinphoneAuthInfo::GetUsername()
{ {
return nullptr; return nullptr;
} }
void LinphoneAuthInfo::SetUsername(Platform::String^ username) void Linphone::Core::LinphoneAuthInfo::SetUsername(Platform::String^ username)
{ {
} }
Platform::String^ LinphoneAuthInfo::GetPassword() Platform::String^ Linphone::Core::LinphoneAuthInfo::GetPassword()
{ {
return nullptr; return nullptr;
} }
void LinphoneAuthInfo::SetPassword(Platform::String^ password) void Linphone::Core::LinphoneAuthInfo::SetPassword(Platform::String^ password)
{ {
} }
Platform::String^ LinphoneAuthInfo::GetRealm() Platform::String^ Linphone::Core::LinphoneAuthInfo::GetRealm()
{ {
return nullptr; return nullptr;
} }
void LinphoneAuthInfo::SetRealm(Platform::String^ realm) void Linphone::Core::LinphoneAuthInfo::SetRealm(Platform::String^ realm)
{ {
} }
...@@ -8,126 +8,125 @@ ...@@ -8,126 +8,125 @@
#include "LinphoneCoreFactory.h" #include "LinphoneCoreFactory.h"
#include "Globals.h" #include "Globals.h"
using namespace Linphone::Core;
using namespace Windows::Phone::Networking::Voip; using namespace Windows::Phone::Networking::Voip;
LinphoneCallState LinphoneCall::GetState() Linphone::Core::LinphoneCallState Linphone::Core::LinphoneCall::GetState()
{ {
return LinphoneCallState::Error; return Linphone::Core::LinphoneCallState::Error;
} }
LinphoneAddress^ LinphoneCall::GetRemoteAddress() Linphone::Core::LinphoneAddress^ Linphone::Core::LinphoneCall::GetRemoteAddress()
{ {
LinphoneCoreFactory^ lcf = Globals::Instance->LinphoneCoreFactory; Linphone::Core::LinphoneCoreFactory^ lcf = Globals::Instance->LinphoneCoreFactory;
return lcf->CreateLinphoneAddress(this->number); return lcf->CreateLinphoneAddress(this->number);
} }
CallDirection LinphoneCall::GetDirection() Linphone::Core::CallDirection Linphone::Core::LinphoneCall::GetDirection()
{ {
return CallDirection::Incoming; return Linphone::Core::CallDirection::Incoming;
} }
LinphoneCallLog^ LinphoneCall::GetCallLog() Linphone::Core::LinphoneCallLog^ Linphone::Core::LinphoneCall::GetCallLog()
{ {
return nullptr; return nullptr;
} }
LinphoneCallStats^ LinphoneCall::GetAudioStats() Linphone::Core::LinphoneCallStats^ Linphone::Core::LinphoneCall::GetAudioStats()
{ {
return nullptr; return nullptr;
} }
LinphoneCallParams^ LinphoneCall::GetRemoteParams() Linphone::Core::LinphoneCallParams^ Linphone::Core::LinphoneCall::GetRemoteParams()
{ {
return nullptr; return nullptr;
} }
LinphoneCallParams^ LinphoneCall::GetCurrentParamsCopy() Linphone::Core::LinphoneCallParams^ Linphone::Core::LinphoneCall::GetCurrentParamsCopy()
{ {
return nullptr; return nullptr;
} }
void LinphoneCall::EnableEchoCancellation(Platform::Boolean enable) void Linphone::Core::LinphoneCall::EnableEchoCancellation(Platform::Boolean enable)
{ {
} }
Platform::Boolean LinphoneCall::IsEchoCancellationEnabled() Platform::Boolean Linphone::Core::LinphoneCall::IsEchoCancellationEnabled()
{ {
return false; return false;
} }
void LinphoneCall::EnableEchoLimiter(Platform::Boolean enable) void Linphone::Core::LinphoneCall::EnableEchoLimiter(Platform::Boolean enable)
{ {
} }
Platform::Boolean LinphoneCall::IsEchoLimiterEnabled() Platform::Boolean Linphone::Core::LinphoneCall::IsEchoLimiterEnabled()
{ {
return false; return false;
} }
int LinphoneCall::GetDuration() int Linphone::Core::LinphoneCall::GetDuration()
{ {
return -1; return -1;
} }
float LinphoneCall::GetCurrentQuality() float Linphone::Core::LinphoneCall::GetCurrentQuality()
{ {
return -1; return -1;
} }
float LinphoneCall::GetAverageQuality() float Linphone::Core::LinphoneCall::GetAverageQuality()
{ {
return -1; return -1;
} }
Platform::String^ LinphoneCall::GetAuthenticationToken() Platform::String^ Linphone::Core::LinphoneCall::GetAuthenticationToken()
{ {
return nullptr; return nullptr;
} }
Platform::Boolean LinphoneCall::IsAuthenticationTokenVerified() Platform::Boolean Linphone::Core::LinphoneCall::IsAuthenticationTokenVerified()
{ {
return false; return false;
} }
void LinphoneCall::SetAuthenticationTokenVerified(Platform::Boolean verified) void Linphone::Core::LinphoneCall::SetAuthenticationTokenVerified(Platform::Boolean verified)
{ {
} }
Platform::Boolean LinphoneCall::IsInConference() Platform::Boolean Linphone::Core::LinphoneCall::IsInConference()
{ {
return false; return false;
} }
float LinphoneCall::GetPlayVolume() float Linphone::Core::LinphoneCall::GetPlayVolume()
{ {
return -1; return -1;
} }
Platform::String^ LinphoneCall::GetRemoteUserAgent() Platform::String^ Linphone::Core::LinphoneCall::GetRemoteUserAgent()
{ {
return nullptr; return nullptr;
} }
Platform::String^ LinphoneCall::GetRemoteContact() Platform::String^ Linphone::Core::LinphoneCall::GetRemoteContact()
{ {
return this->contact; return this->contact;
} }
void LinphoneCall::CallContext::set(Platform::Object^ cc) void Linphone::Core::LinphoneCall::CallContext::set(Platform::Object^ cc)
{ {
this->callContext = cc; this->callContext = cc;
} }
Platform::Object^ LinphoneCall::CallContext::get() Platform::Object^ Linphone::Core::LinphoneCall::CallContext::get()
{ {
return this->callContext; return this->callContext;
} }
LinphoneCall::LinphoneCall(Platform::String^ contact, Platform::String^ number) : Linphone::Core::LinphoneCall::LinphoneCall(Platform::String^ contact, Platform::String^ number) :
contact(contact), contact(contact),
number(number) number(number)
{ {
......
...@@ -5,49 +5,47 @@ ...@@ -5,49 +5,47 @@
#include "Globals.h" #include "Globals.h"
#include "LinphoneCoreFactory.h" #include "LinphoneCoreFactory.h"
using namespace Linphone::Core; Linphone::Core::LinphoneAddress^ Linphone::Core::LinphoneCallLog::GetFrom()
LinphoneAddress^ LinphoneCallLog::GetFrom()
{ {
return this->from; return this->from;
} }
LinphoneAddress^ LinphoneCallLog::GetTo() Linphone::Core::LinphoneAddress^ Linphone::Core::LinphoneCallLog::GetTo()
{ {
return this->to; return this->to;
} }
CallDirection LinphoneCallLog::GetDirection() Linphone::Core::CallDirection Linphone::Core::LinphoneCallLog::GetDirection()
{ {
return this->direction; return this->direction;
} }
LinphoneCallStatus LinphoneCallLog::GetStatus() Linphone::Core::LinphoneCallStatus Linphone::Core::LinphoneCallLog::GetStatus()
{ {
return this->status; return this->status;
} }
Platform::String^ LinphoneCallLog::GetStartDate() Platform::String^ Linphone::Core::LinphoneCallLog::GetStartDate()
{ {
return nullptr; return nullptr;
} }
int64 LinphoneCallLog::GetTimestamp() int64 Linphone::Core::LinphoneCallLog::GetTimestamp()
{ {
return -1; return -1;
} }
int LinphoneCallLog::GetCallDuration() int Linphone::Core::LinphoneCallLog::GetCallDuration()
{ {
return -1; return -1;
} }
int LinphoneCallLog::GetCallId() int Linphone::Core::LinphoneCallLog::GetCallId()
{ {
return -1; return -1;
} }
LinphoneCallLog::LinphoneCallLog(Platform::String^ from, Platform::String^ to, LinphoneCallStatus status, CallDirection direction) : Linphone::Core::LinphoneCallLog::LinphoneCallLog(Platform::String^ from, Platform::String^ to, Linphone::Core::LinphoneCallStatus status, Linphone::Core::CallDirection direction) :
status(status), status(status),
direction(direction) direction(direction)
{ {
...@@ -56,7 +54,7 @@ LinphoneCallLog::LinphoneCallLog(Platform::String^ from, Platform::String^ to, L ...@@ -56,7 +54,7 @@ LinphoneCallLog::LinphoneCallLog(Platform::String^ from, Platform::String^ to, L
this->to = lcf->CreateLinphoneAddress(to); this->to = lcf->CreateLinphoneAddress(to);
} }
LinphoneCallLog::~LinphoneCallLog() Linphone::Core::LinphoneCallLog::~LinphoneCallLog()
{ {
} }
\ No newline at end of file
...@@ -3,34 +3,32 @@ ...@@ -3,34 +3,32 @@
#include "PayloadType.h" #include "PayloadType.h"
#include "Server.h" #include "Server.h"
using namespace Linphone::Core; void Linphone::Core::LinphoneCallParams::SetAudioBandwidth(int value)
void LinphoneCallParams::SetAudioBandwidth(int value)
{ {
} }
MediaEncryption LinphoneCallParams::GetMediaEncryption() Linphone::Core::MediaEncryption Linphone::Core::LinphoneCallParams::GetMediaEncryption()
{ {
return MediaEncryption::None; return Linphone::Core::MediaEncryption::None;
} }
void LinphoneCallParams::SetMediaEncryption(MediaEncryption menc) void Linphone::Core::LinphoneCallParams::SetMediaEncryption(Linphone::Core::MediaEncryption menc)
{ {
} }
PayloadType^ LinphoneCallParams::GetUsedAudioCodec() Linphone::Core::PayloadType^ Linphone::Core::LinphoneCallParams::GetUsedAudioCodec()
{ {
return nullptr; return nullptr;
} }
void LinphoneCallParams::EnableLowBandwidth(Platform::Boolean enable) void Linphone::Core::LinphoneCallParams::EnableLowBandwidth(Platform::Boolean enable)
{ {
} }
Platform::Boolean LinphoneCallParams::IsLowBandwidthEnabled() Platform::Boolean Linphone::Core::LinphoneCallParams::IsLowBandwidthEnabled()
{ {
return false; return false;
} }
#include "LinphoneCallStats.h" #include "LinphoneCallStats.h"
#include "Server.h" #include "Server.h"
using namespace Linphone::Core; Linphone::Core::MediaType Linphone::Core::LinphoneCallStats::GetMediaType()
MediaType LinphoneCallStats::GetMediaType()
{ {
return MediaType::Audio; return Linphone::Core::MediaType::Audio;
} }
IceState LinphoneCallStats::GetIceState() Linphone::Core::IceState Linphone::Core::LinphoneCallStats::GetIceState()
{ {
return IceState::Failed; return Linphone::Core::IceState::Failed;
} }
float LinphoneCallStats::GetDownloadBandwidth() float Linphone::Core::LinphoneCallStats::GetDownloadBandwidth()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetUploadBandwidth() float Linphone::Core::LinphoneCallStats::GetUploadBandwidth()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetSenderLossRate() float Linphone::Core::LinphoneCallStats::GetSenderLossRate()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetReceiverLossRate() float Linphone::Core::LinphoneCallStats::GetReceiverLossRate()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetSenderInterarrivalJitter() float Linphone::Core::LinphoneCallStats::GetSenderInterarrivalJitter()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetReceiverInterarrivalJitter() float Linphone::Core::LinphoneCallStats::GetReceiverInterarrivalJitter()
{ {
return -1; return -1;
} }
float LinphoneCallStats::GetRoundTripDelay() float Linphone::Core::LinphoneCallStats::GetRoundTripDelay()
{