Commit 3e009ed2 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Few changes but still error when trying to use server

parent 2bc03527
......@@ -53,6 +53,7 @@ namespace Linphone.Agents
if (keepAliveTask != null)
{
this.isIncomingCallAgent = false;
Debug.WriteLine("[LinphoneSchedulerAgent] Calling NotifyComplete");
base.NotifyComplete();
}
......
......@@ -76,30 +76,28 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<AdditionalDependencies>windowsphonecore.lib;runtimeobject.lib;PhoneAudioSes.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>ole32.lib</IgnoreSpecificDefaultLibraries>
<IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</GenerateWindowsMetadata>
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</GenerateWindowsMetadata>
</Link>
<CustomBuildStep>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
pushd "$(OutDir)"
WinMdIdl.exe "$(OutDir)$(RootNamespace).winmd"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).idl"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).OutOfProcess.idl"
"$(ProjectDir)OopServerRegistrationHelper.exe" /winmd:"$(OutDir)$(RootNamespace).winmd" /dll_name:$(TargetName) /namespace:$(RootNamespace).OutOfProcess /app_manifest:"$(SolutionDir)Linphone\Properties\WMAppManifest.xml" /helper_dir:"$(SolutionDir)Agents"
popd</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">pushd "$(OutDir)"
WinMdIdl.exe "$(OutDir)$(RootNamespace).winmd"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).idl"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).OutOfProcess.idl"
"$(ProjectDir)OopServerRegistrationHelper.exe" /winmd:"$(OutDir)$(RootNamespace).winmd" /dll_name:$(TargetName) /namespace:$(RootNamespace).OutOfProcess /app_manifest:"$(SolutionDir)Linphone\Properties\WMAppManifest.xml" /helper_dir:"$(SolutionDir)Agents"
popd</Command>
</CustomBuildStep>
<CustomBuildStep>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(OutDir)$(RootNamespace).idl;$(OutDir)$(RootNamespace).OutOfProcess.idl;$(SolutionDir)$(ProjectName)ProxyStub\dlldata.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace)_i.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace)_p.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).h;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess.h;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess_i.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess_p.c;$(SolutionDir)Agents\RegistrationHelper.cs;%(Outputs)</Outputs>
</CustomBuildStep>
<CustomBuildStep>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
pushd "$(OutDir)"
WinMdIdl.exe "$(OutDir)$(RootNamespace).winmd"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).idl"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).OutOfProcess.idl"
"$(ProjectDir)OopServerRegistrationHelper.exe" /winmd:"$(OutDir)$(RootNamespace).winmd" /dll_name:$(TargetName) /namespace:$(RootNamespace).OutOfProcess /app_manifest:"$(SolutionDir)Linphone\Properties\WMAppManifest.xml" /helper_dir:"$(SolutionDir)Agents"
popd</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">pushd "$(OutDir)"
WinMdIdl.exe "$(OutDir)$(RootNamespace).winmd"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).idl"
MIdl.exe /env $(MidlEnv) /winrt /ns_prefix /metadata_dir "$(FrameworkSdkDir)Windows Metadata" /out "$(SolutionDir)$(ProjectName)ProxyStub" "$(OutDir)$(RootNamespace).OutOfProcess.idl"
"$(ProjectDir)OopServerRegistrationHelper.exe" /winmd:"$(OutDir)$(RootNamespace).winmd" /dll_name:$(TargetName) /namespace:$(RootNamespace).OutOfProcess /app_manifest:"$(SolutionDir)Linphone\Properties\WMAppManifest.xml" /helper_dir:"$(SolutionDir)Agents"
popd</Command>
</CustomBuildStep>
<CustomBuildStep>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(OutDir)$(RootNamespace).idl;$(OutDir)$(RootNamespace).OutOfProcess.idl;$(SolutionDir)$(ProjectName)ProxyStub\dlldata.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace)_i.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace)_p.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).h;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess.h;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess_i.c;$(SolutionDir)$(ProjectName)ProxyStub\$(RootNamespace).OutOfProcess_p.c;$(SolutionDir)Agents\RegistrationHelper.cs;%(Outputs)</Outputs>
......
......@@ -6,6 +6,8 @@
#include "Globals.h"
#include "ApiLock.h"
#include "CallController.h"
#include "LinphoneCoreFactory.h"
#include "LinphoneCore.h"
using namespace Linphone::BackEnd;
using namespace Windows::Foundation;
......
#pragma once
#include <roapi.h>
#include "LinphoneCoreFactory.h"
namespace Linphone
{
......
#include "LinphoneCore.h"
#include "Server.h"
using namespace Linphone::BackEnd;
......
......@@ -7,10 +7,11 @@ namespace Linphone
{
namespace BackEnd
{
ref class LinphoneCoreFactory;
public ref class LinphoneCore sealed
{
public:
LinphoneCore();
Platform::String^ ToString();
/*void ClearProxyConfigs();
......@@ -22,6 +23,8 @@ namespace Linphone
void AddAuthInfo(LinphoneAuthInfo^ info);*/
private:
friend ref class Linphone::BackEnd::LinphoneCoreFactory;
LinphoneCore();
~LinphoneCore();
};
}
......
#include "LinphoneCoreFactory.h"
#include "Server.h"
using namespace Linphone::BackEnd;
......
#pragma once
#include "LinphoneCore.h";
#include "LinphoneCore.h"
#include "Server.h"
namespace Linphone
{
namespace BackEnd
{
ref class Globals;
ref class LinphoneCore;
public ref class LinphoneCoreFactory sealed
{
public:
......@@ -15,13 +17,13 @@ namespace Linphone
{
Linphone::BackEnd::LinphoneCore^ get();
}
LinphoneCoreFactory();
void CreateLinphoneCore();
private:
friend ref class Linphone::BackEnd::Globals;
Linphone::BackEnd::LinphoneCore^ linphoneCore;
LinphoneCoreFactory();
~LinphoneCoreFactory();
};
}
......
......@@ -2,8 +2,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Phone
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linphone", "Linphone\Linphone.csproj", "{BB0B8F3F-8638-49CF-B968-E097A2E6CBBE}"
ProjectSection(ProjectDependencies) = postProject
{BBABEEA1-494C-4618-96E3-399873A5558B} = {BBABEEA1-494C-4618-96E3-399873A5558B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackEndProxyStub", "BackEndProxyStub\BackEndProxyStub.vcxproj", "{BBABEEA1-494C-4618-96E3-399873A5558B}"
ProjectSection(ProjectDependencies) = postProject
{C8D75245-FFCF-4932-A228-C9CC8BB60B03} = {C8D75245-FFCF-4932-A228-C9CC8BB60B03}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackEnd", "BackEnd\BackEnd.vcxproj", "{C8D75245-FFCF-4932-A228-C9CC8BB60B03}"
EndProject
......
No preview for this file type
......@@ -85,6 +85,7 @@ namespace Linphone.Model
// Create an instance of the server in the background process.
server = (Server)WindowsRuntimeMarshal.GetActivationFactory(typeof(Server)).ActivateInstance();
server.CallController.ToString();
// Un-set an event that indicates that the UI process is disconnected from the background process.
// The VoIP background process waits for this event to get set before shutting down.
......
......@@ -49,9 +49,9 @@
<Path>Linphone.BackEnd.DLL</Path>
<ActivatableClass ActivatableClassId="Linphone.BackEnd.IncomingCallDialogDismissedCallback" ThreadingModel="MTA" />
<ActivatableClass ActivatableClassId="Linphone.BackEnd.CallController" ThreadingModel="MTA" />
<ActivatableClass ActivatableClassId="Linphone.BackEnd.Globals" ThreadingModel="MTA" />
<ActivatableClass ActivatableClassId="Linphone.BackEnd.LinphoneCore" ThreadingModel="MTA" />
<ActivatableClass ActivatableClassId="Linphone.BackEnd.LinphoneCoreFactory" ThreadingModel="MTA" />
<ActivatableClass ActivatableClassId="Linphone.BackEnd.Globals" ThreadingModel="MTA" />
</InProcessServer>
<OutOfProcessServer ServerName="Linphone.BackEnd">
<Path>Linphone.BackEnd.DLL</Path>
......@@ -61,11 +61,11 @@
<ProxyStub ClassId="{C140594A-6BD4-3151-944E-28C955632D15}">
<Path>Linphone.BackEndProxyStub.DLL</Path>
<Interface Name="Linphone.BackEnd.__ICallControllerPublicNonVirtuals" InterfaceId="{C140594A-6BD4-3151-944E-28C955632D15}" />
<Interface Name="Linphone.BackEnd.__ILinphoneCorePublicNonVirtuals" InterfaceId="{AD1665A5-4674-381B-8F09-A529144A2E95}" />
<Interface Name="Linphone.BackEnd.__ILinphoneCoreFactoryPublicNonVirtuals" InterfaceId="{3597B0A3-1ABD-3226-88B2-7E1A95D0182D}" />
<Interface Name="Linphone.BackEnd.__IGlobalsPublicNonVirtuals" InterfaceId="{74C65E76-06C7-38A6-9E0A-61E3739B7E1E}" />
<Interface Name="Linphone.BackEnd.__IGlobalsStatics" InterfaceId="{CE34112C-C406-3477-BBB4-7E1F99EE776C}" />
<Interface Name="Linphone.BackEnd.OutOfProcess.__IServerPublicNonVirtuals" InterfaceId="{EBDEF036-447F-3D47-B33F-715068ACD4CC}" />
<Interface Name="Linphone.BackEnd.__ILinphoneCorePublicNonVirtuals" InterfaceId="{AD1665A5-4674-381B-8F09-A529144A2E95}" />
<Interface Name="Linphone.BackEnd.__ILinphoneCoreFactoryPublicNonVirtuals" InterfaceId="{3597B0A3-1ABD-3226-88B2-7E1A95D0182D}" />
</ProxyStub>
</ActivatableClasses>
<ScreenResolutions>
......
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