Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linphone
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
7
Issues
7
List
Board
Labels
Milestones
Merge Requests
10
Merge Requests
10
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
linphone
Commits
d43eb378
Commit
d43eb378
authored
Jan 03, 2014
by
Sylvain Berfini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix liblinphone wp8 build
parent
d57e2b3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
LibLinphone.vcxproj
build/vsx/LibLinphone/LibLinphone.vcxproj
+3
-2
linphonecall.c
coreapi/linphonecall.c
+8
-1
linphonecore.h
coreapi/linphonecore.h
+4
-1
No files found.
build/vsx/LibLinphone/LibLinphone.vcxproj
View file @
d43eb378
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
<ClCompile>
<ClCompile>
<WarningLevel>
Level4
</WarningLevel>
<WarningLevel>
Level4
</WarningLevel>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDIr)..\..\..\..\tunnel\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDIr)..\..\..\..\tunnel\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LINPHONE_VERSION="Devel";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="";UNICODE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LINPHONE_VERSION="Devel";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="";UNICODE;
_XKEYCHECK_H;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
false
</MinimalRebuild>
<MinimalRebuild>
false
</MinimalRebuild>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
<PrecompiledHeader>
NotUsing
</PrecompiledHeader>
<PrecompiledHeader>
NotUsing
</PrecompiledHeader>
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
<ClCompile>
<ClCompile>
<WarningLevel>
Level4
</WarningLevel>
<WarningLevel>
Level4
</WarningLevel>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDIr)..\..\..\..\tunnel\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDIr)..\..\..\..\tunnel\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LINPHONE_VERSION="Devel";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="";UNICODE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINDOW_NATIVE;_TRUE_TIME;IN_LINPHONE;USE_BELLESIP;TUNNEL_ENABLED;VIDEO_ENABLED;LINPHONE_PACKAGE_NAME="linphone";LINPHONE_VERSION="Devel";LIBLINPHONE_EXPORTS;LINPHONE_PLUGINS_DIR="";UNICODE;
_XKEYCHECK_H;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<StringPooling>
true
</StringPooling>
<FunctionLevelLinking>
true
</FunctionLevelLinking>
<FunctionLevelLinking>
true
</FunctionLevelLinking>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
...
@@ -207,6 +207,7 @@
...
@@ -207,6 +207,7 @@
<ClCompile
Include=
"..\..\..\coreapi\siplogin.c"
/>
<ClCompile
Include=
"..\..\..\coreapi\siplogin.c"
/>
<ClCompile
Include=
"..\..\..\coreapi\sipsetup.c"
/>
<ClCompile
Include=
"..\..\..\coreapi\sipsetup.c"
/>
<ClCompile
Include=
"..\..\..\coreapi\TunnelManager.cc"
/>
<ClCompile
Include=
"..\..\..\coreapi\TunnelManager.cc"
/>
<ClCompile
Include=
"..\..\..\coreapi\xml.c"
/>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\..\..\coreapi\bellesip_sal\sal_impl.h"
/>
<ClInclude
Include=
"..\..\..\coreapi\bellesip_sal\sal_impl.h"
/>
...
...
coreapi/linphonecall.c
View file @
d43eb378
...
@@ -2572,6 +2572,13 @@ bool_t linphone_call_is_in_conference(const LinphoneCall *call) {
...
@@ -2572,6 +2572,13 @@ bool_t linphone_call_is_in_conference(const LinphoneCall *call) {
return
call
->
params
.
in_conference
;
return
call
->
params
.
in_conference
;
}
}
AudioStream
*
linphone_call_get_audiostream
(
LinphoneCall
*
call
)
{
return
call
->
audiostream
;
}
VideoStream
*
linphone_call_get_videostream
(
LinphoneCall
*
call
)
{
return
call
->
videostream
;
}
/**
/**
* Perform a zoom of the video displayed during a call.
* Perform a zoom of the video displayed during a call.
...
@@ -2688,4 +2695,4 @@ void linphone_call_set_contact_op(LinphoneCall* call) {
...
@@ -2688,4 +2695,4 @@ void linphone_call_set_contact_op(LinphoneCall* call) {
sal_op_set_contact
(
call
->
op
,
contact
);
sal_op_set_contact
(
call
->
op
,
contact
);
linphone_address_destroy
(
contact
);
linphone_address_destroy
(
contact
);
}
}
}
}
\ No newline at end of file
coreapi/linphonecore.h
View file @
d43eb378
...
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
...
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ortp/payloadtype.h"
#include "ortp/payloadtype.h"
#include "mediastreamer2/mscommon.h"
#include "mediastreamer2/mscommon.h"
#include "mediastreamer2/msvideo.h"
#include "mediastreamer2/msvideo.h"
#include "mediastreamer2/mediastream.h"
#ifdef IN_LINPHONE
#ifdef IN_LINPHONE
#include "sipsetup.h"
#include "sipsetup.h"
...
@@ -580,7 +581,6 @@ struct _LinphoneCallStats {
...
@@ -580,7 +581,6 @@ struct _LinphoneCallStats {
LINPHONE_PUBLIC
const
LinphoneCallStats
*
linphone_call_get_audio_stats
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
const
LinphoneCallStats
*
linphone_call_get_audio_stats
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
const
LinphoneCallStats
*
linphone_call_get_video_stats
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
const
LinphoneCallStats
*
linphone_call_get_video_stats
(
LinphoneCall
*
call
);
/** Callback prototype */
/** Callback prototype */
typedef
void
(
*
LinphoneCallCbFunc
)(
LinphoneCall
*
call
,
void
*
user_data
);
typedef
void
(
*
LinphoneCallCbFunc
)(
LinphoneCall
*
call
,
void
*
user_data
);
...
@@ -652,6 +652,9 @@ LINPHONE_PUBLIC LinphoneCallState linphone_call_get_transfer_state(LinphoneCall
...
@@ -652,6 +652,9 @@ LINPHONE_PUBLIC LinphoneCallState linphone_call_get_transfer_state(LinphoneCall
LINPHONE_PUBLIC
void
linphone_call_zoom_video
(
LinphoneCall
*
call
,
float
zoom_factor
,
float
*
cx
,
float
*
cy
);
LINPHONE_PUBLIC
void
linphone_call_zoom_video
(
LinphoneCall
*
call
,
float
zoom_factor
,
float
*
cx
,
float
*
cy
);
LINPHONE_PUBLIC
void
linphone_call_start_recording
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_call_start_recording
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_call_stop_recording
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_call_stop_recording
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
AudioStream
*
linphone_call_get_audiostream
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
VideoStream
*
linphone_call_get_videostream
(
LinphoneCall
*
call
);
/**
/**
* Return TRUE if this call is currently part of a conference
* Return TRUE if this call is currently part of a conference
* @param call #LinphoneCall
* @param call #LinphoneCall
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment