Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
0102ef79
Commit
0102ef79
authored
Sep 14, 2017
by
Ronan
Browse files
feaf(core): remove useless std...
parent
bd2c2c4c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
src/c-wrapper/api/c-call-params.cpp
src/c-wrapper/api/c-call-params.cpp
+8
-7
src/call/call.cpp
src/call/call.cpp
+4
-4
src/chat/client-group-chat-room.cpp
src/chat/client-group-chat-room.cpp
+3
-3
No files found.
src/c-wrapper/api/c-call-params.cpp
View file @
0102ef79
...
...
@@ -25,15 +25,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "conference/params/call-session-params-p.h"
#include "conference/params/media-session-params-p.h"
#define GET_CALL_CPP_PTR(obj) L_GET_CPP_PTR_FROM_C_STRUCT(obj, CallSessionParams, CallParams)
#define GET_CALL_CPP_PRIVATE_PTR(obj) L_GET_PRIVATE_FROM_C_STRUCT(obj, CallSessionParams, CallParams)
#define GET_MEDIA_CPP_PTR(obj) L_GET_CPP_PTR_FROM_C_STRUCT(obj, MediaSessionParams, CallParams)
#define GET_MEDIA_CPP_PRIVATE_PTR(obj) L_GET_PRIVATE_FROM_C_STRUCT(obj, MediaSessionParams, CallParams)
L_DECLARE_C_CLONABLE_STRUCT_IMPL
(
MediaSessionParams
,
CallParams
,
call_params
)
// =============================================================================
using
namespace
std
;
/*******************************************************************************
* Internal functions *
...
...
@@ -149,17 +150,17 @@ void linphone_call_params_enable_video(LinphoneCallParams *params, bool_t enable
}
const
char
*
linphone_call_params_get_custom_header
(
const
LinphoneCallParams
*
params
,
const
char
*
header_name
)
{
std
::
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomHeader
(
header_name
);
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomHeader
(
header_name
);
return
value
.
empty
()
?
nullptr
:
value
.
c_str
();
}
const
char
*
linphone_call_params_get_custom_sdp_attribute
(
const
LinphoneCallParams
*
params
,
const
char
*
attribute_name
)
{
std
::
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomSdpAttribute
(
attribute_name
);
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomSdpAttribute
(
attribute_name
);
return
value
.
empty
()
?
nullptr
:
value
.
c_str
();
}
const
char
*
linphone_call_params_get_custom_sdp_media_attribute
(
const
LinphoneCallParams
*
params
,
LinphoneStreamType
type
,
const
char
*
attribute_name
)
{
std
::
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomSdpMediaAttribute
(
type
,
attribute_name
);
string
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getCustomSdpMediaAttribute
(
type
,
attribute_name
);
return
value
.
empty
()
?
nullptr
:
value
.
c_str
();
}
...
...
@@ -197,7 +198,7 @@ const LinphoneVideoDefinition * linphone_call_params_get_received_video_definiti
}
const
char
*
linphone_call_params_get_record_file
(
const
LinphoneCallParams
*
params
)
{
const
std
::
string
&
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getRecordFilePath
();
const
string
&
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getRecordFilePath
();
return
value
.
empty
()
?
nullptr
:
value
.
c_str
();
}
...
...
@@ -227,7 +228,7 @@ const LinphoneVideoDefinition * linphone_call_params_get_sent_video_definition(c
}
const
char
*
linphone_call_params_get_session_name
(
const
LinphoneCallParams
*
params
)
{
const
std
::
string
&
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getSessionName
();
const
string
&
value
=
GET_MEDIA_CPP_PTR
(
params
)
->
getSessionName
();
return
value
.
empty
()
?
nullptr
:
value
.
c_str
();
}
...
...
src/call/call.cpp
View file @
0102ef79
...
...
@@ -137,7 +137,7 @@ void CallPrivate::onCallSetTerminated () {
}
}
void
CallPrivate
::
onCallStateChanged
(
LinphoneCallState
state
,
const
std
::
string
&
message
)
{
void
CallPrivate
::
onCallStateChanged
(
LinphoneCallState
state
,
const
string
&
message
)
{
if
(
lcall
)
linphone_call_notify_state_changed
(
lcall
,
state
,
message
.
c_str
());
}
...
...
@@ -152,7 +152,7 @@ void CallPrivate::onIncomingCallToBeAdded () {
linphone_core_add_call
(
core
,
lcall
);
}
void
CallPrivate
::
onEncryptionChanged
(
bool
activated
,
const
std
::
string
&
authToken
)
{
void
CallPrivate
::
onEncryptionChanged
(
bool
activated
,
const
string
&
authToken
)
{
if
(
lcall
)
linphone_call_notify_encryption_changed
(
lcall
,
activated
,
authToken
.
empty
()
?
nullptr
:
authToken
.
c_str
());
}
...
...
@@ -255,12 +255,12 @@ void Call::stopRecording () {
static_cast
<
MediaSession
*>
(
d
->
getActiveSession
().
get
())
->
stopRecording
();
}
LinphoneStatus
Call
::
takePreviewSnapshot
(
const
std
::
string
&
file
)
{
LinphoneStatus
Call
::
takePreviewSnapshot
(
const
string
&
file
)
{
L_D
(
Call
);
return
static_cast
<
MediaSession
*>
(
d
->
getActiveSession
().
get
())
->
takePreviewSnapshot
(
file
);
}
LinphoneStatus
Call
::
takeVideoSnapshot
(
const
std
::
string
&
file
)
{
LinphoneStatus
Call
::
takeVideoSnapshot
(
const
string
&
file
)
{
L_D
(
Call
);
return
static_cast
<
MediaSession
*>
(
d
->
getActiveSession
().
get
())
->
takeVideoSnapshot
(
file
);
}
...
...
src/chat/client-group-chat-room.cpp
View file @
0102ef79
...
...
@@ -20,17 +20,17 @@
#include "conference/participant-p.h"
#include "logger/logger.h"
// =============================================================================
using
namespace
std
;
LINPHONE_BEGIN_NAMESPACE
// =============================================================================
ClientGroupChatRoomPrivate
::
ClientGroupChatRoomPrivate
(
LinphoneCore
*
core
)
:
ChatRoomPrivate
(
core
)
{}
// =============================================================================
ClientGroupChatRoom
::
ClientGroupChatRoom
(
LinphoneCore
*
core
,
const
Address
&
me
,
std
::
list
<
Address
>
&
addresses
)
ClientGroupChatRoom
::
ClientGroupChatRoom
(
LinphoneCore
*
core
,
const
Address
&
me
,
list
<
Address
>
&
addresses
)
:
ChatRoom
(
*
new
ChatRoomPrivate
(
core
)),
RemoteConference
(
core
,
me
,
nullptr
)
{
string
factoryUri
=
linphone_core_get_chat_conference_factory_uri
(
core
);
focus
=
make_shared
<
Participant
>
(
factoryUri
);
...
...
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