mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 20:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix coding style

Browse source
This commit is contained in:
Benjamin Reis 2018-02-22 10:32:21 +01:00
parent 2e8f7dade9
commit e06f10ed23
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/conference/handlers/local-conference-event-handler.cpp
View file

@ -324,9 +324,9 @@ string LocalConferenceEventHandlerPrivate::createNotify (ConferenceType confInfo
if (notifyId == -1) {
lastNotify = lastNotify + 1;
confInfo.setVersion(lastNotify);
} else {
} else
confInfo.setVersion(static_cast<unsigned int>(notifyId));
}
confInfo.setState(isFullState ? StateType::full : StateType::partial);
if (!confInfo.getConferenceDescription()) {
ConferenceDescriptionType description = ConferenceDescriptionType();
@ -359,23 +359,25 @@ void LocalConferenceEventHandlerPrivate::notifyParticipant (const string &notify
}
void LocalConferenceEventHandlerPrivate::notifyParticipantDevice (const string &notify, const shared_ptr<ParticipantDevice> &device, bool multipart) {
if (device->isSubscribedToConferenceEventPackage() && !notify.empty()) {
LinphoneEvent *ev = device->getConferenceSubscribeEvent();
LinphoneEventCbs *cbs = linphone_event_get_callbacks(ev);
linphone_event_cbs_set_user_data(cbs, this);
linphone_event_cbs_set_notify_response(cbs, notifyResponseCb);
LinphoneContent *content = linphone_core_create_content(ev->lc);
linphone_content_set_buffer(content, (const uint8_t *)notify.c_str(), strlen(notify.c_str()));
if (multipart) {
linphone_content_set_type(content, "multipart");
linphone_content_set_subtype(content, "mixed;boundary=---------------------------14737809831466499882746641449");
} else {
linphone_content_set_type(content, "application");
linphone_content_set_subtype(content, "conference-info");
}
linphone_event_notify(ev, content);
linphone_content_unref(content);
}
if (!device->isSubscribedToConferenceEventPackage() || notify.empty())
return;
LinphoneEvent *ev = device->getConferenceSubscribeEvent();
LinphoneEventCbs *cbs = linphone_event_get_callbacks(ev);
linphone_event_cbs_set_user_data(cbs, this);
linphone_event_cbs_set_notify_response(cbs, notifyResponseCb);
LinphoneContent *content = linphone_core_create_content(ev->lc);
linphone_content_set_buffer(content, (const uint8_t *)notify.c_str(), strlen(notify.c_str()));
linphone_content_set_type(
content,
multipart ? "multipart" : "application"
);
linphone_content_set_subtype(
content,
multipart ? "mixed;boundary=---------------------------14737809831466499882746641449" : "conference-info"
);
linphone_event_notify(ev, content);
linphone_content_unref(content);
}
// =============================================================================