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
e06f10ed
Commit
e06f10ed
authored
Feb 22, 2018
by
Benjamin REIS
Browse files
fix coding style
parent
2e8f7dad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
19 deletions
+21
-19
src/conference/handlers/local-conference-event-handler.cpp
src/conference/handlers/local-conference-event-handler.cpp
+21
-19
No files found.
src/conference/handlers/local-conference-event-handler.cpp
View file @
e06f10ed
...
@@ -324,9 +324,9 @@ string LocalConferenceEventHandlerPrivate::createNotify (ConferenceType confInfo
...
@@ -324,9 +324,9 @@ string LocalConferenceEventHandlerPrivate::createNotify (ConferenceType confInfo
if
(
notifyId
==
-
1
)
{
if
(
notifyId
==
-
1
)
{
lastNotify
=
lastNotify
+
1
;
lastNotify
=
lastNotify
+
1
;
confInfo
.
setVersion
(
lastNotify
);
confInfo
.
setVersion
(
lastNotify
);
}
else
{
}
else
confInfo
.
setVersion
(
static_cast
<
unsigned
int
>
(
notifyId
));
confInfo
.
setVersion
(
static_cast
<
unsigned
int
>
(
notifyId
));
}
confInfo
.
setState
(
isFullState
?
StateType
::
full
:
StateType
::
partial
);
confInfo
.
setState
(
isFullState
?
StateType
::
full
:
StateType
::
partial
);
if
(
!
confInfo
.
getConferenceDescription
())
{
if
(
!
confInfo
.
getConferenceDescription
())
{
ConferenceDescriptionType
description
=
ConferenceDescriptionType
();
ConferenceDescriptionType
description
=
ConferenceDescriptionType
();
...
@@ -359,23 +359,25 @@ void LocalConferenceEventHandlerPrivate::notifyParticipant (const string ¬ify
...
@@ -359,23 +359,25 @@ void LocalConferenceEventHandlerPrivate::notifyParticipant (const string ¬ify
}
}
void
LocalConferenceEventHandlerPrivate
::
notifyParticipantDevice
(
const
string
&
notify
,
const
shared_ptr
<
ParticipantDevice
>
&
device
,
bool
multipart
)
{
void
LocalConferenceEventHandlerPrivate
::
notifyParticipantDevice
(
const
string
&
notify
,
const
shared_ptr
<
ParticipantDevice
>
&
device
,
bool
multipart
)
{
if
(
device
->
isSubscribedToConferenceEventPackage
()
&&
!
notify
.
empty
())
{
if
(
!
device
->
isSubscribedToConferenceEventPackage
()
||
notify
.
empty
())
LinphoneEvent
*
ev
=
device
->
getConferenceSubscribeEvent
();
return
;
LinphoneEventCbs
*
cbs
=
linphone_event_get_callbacks
(
ev
);
linphone_event_cbs_set_user_data
(
cbs
,
this
);
LinphoneEvent
*
ev
=
device
->
getConferenceSubscribeEvent
();
linphone_event_cbs_set_notify_response
(
cbs
,
notifyResponseCb
);
LinphoneEventCbs
*
cbs
=
linphone_event_get_callbacks
(
ev
);
LinphoneContent
*
content
=
linphone_core_create_content
(
ev
->
lc
);
linphone_event_cbs_set_user_data
(
cbs
,
this
);
linphone_content_set_buffer
(
content
,
(
const
uint8_t
*
)
notify
.
c_str
(),
strlen
(
notify
.
c_str
()));
linphone_event_cbs_set_notify_response
(
cbs
,
notifyResponseCb
);
if
(
multipart
)
{
LinphoneContent
*
content
=
linphone_core_create_content
(
ev
->
lc
);
linphone_content_set_type
(
content
,
"multipart"
);
linphone_content_set_buffer
(
content
,
(
const
uint8_t
*
)
notify
.
c_str
(),
strlen
(
notify
.
c_str
()));
linphone_content_set_subtype
(
content
,
"mixed;boundary=---------------------------14737809831466499882746641449"
);
linphone_content_set_type
(
}
else
{
content
,
linphone_content_set_type
(
content
,
"application"
);
multipart
?
"multipart"
:
"application"
linphone_content_set_subtype
(
content
,
"conference-info"
);
);
}
linphone_content_set_subtype
(
linphone_event_notify
(
ev
,
content
);
content
,
linphone_content_unref
(
content
);
multipart
?
"mixed;boundary=---------------------------14737809831466499882746641449"
:
"conference-info"
}
);
linphone_event_notify
(
ev
,
content
);
linphone_content_unref
(
content
);
}
}
// =============================================================================
// =============================================================================
...
...
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