mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 04:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(ui/views/App/Calls/ConferenceManager): in progress

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-19 10:43:31 +02:00
parent f4d2ca9d01
commit b943d4233e
6 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/components/call/CallModel.cpp
View file

@ -193,7 +193,7 @@ void CallModel::stopRecording () {
// -----------------------------------------------------------------------------
void CallModel::handleCallStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state) {
void CallModel::handleCallStateChanged (const shared_ptr<linphone::Call> &call, linphone::CallState state) {
if (call != mCall)
return;

37
linphone-desktop/src/components/conference/ConferenceAddModel.cpp
View file

@ -33,7 +33,14 @@ ConferenceHelperModel::ConferenceAddModel::ConferenceAddModel (QObject *parent)
mConferenceHelperModel = qobject_cast<ConferenceHelperModel *>(parent);
Q_ASSERT(mConferenceHelperModel != nullptr);
for (auto &participant : CoreManager::getInstance()->getCore()->getConference()->getParticipants())
CoreManager *coreManager = CoreManager::getInstance();
QObject::connect(
coreManager->getSipAddressesModel(), &SipAddressesModel::dataChanged,
this, &ConferenceAddModel::handleDataChanged
);
for (auto &participant : coreManager->getCore()->getConference()->getParticipants())
addToConference(participant);
}
@ -118,9 +125,9 @@ void ConferenceHelperModel::ConferenceAddModel::update () {
// -----------------------------------------------------------------------------
void ConferenceHelperModel::ConferenceAddModel::addToConference (const std::shared_ptr<linphone::Address> &linphoneAddress) {
void ConferenceHelperModel::ConferenceAddModel::addToConference (const shared_ptr<linphone::Address> &linphoneAddress) {
QString sipAddress = ::Utils::linphoneStringToQString(linphoneAddress->asStringUriOnly());
QVariantMap map;
QVariantMap map = CoreManager::getInstance()->getSipAddressesModel()->find(sipAddress);
map["sipAddress"] = sipAddress;
map["__linphoneAddress"] = QVariant::fromValue(linphoneAddress);
@ -128,3 +135,27 @@ void ConferenceHelperModel::ConferenceAddModel::addToConference (const std::shar
mSipAddresses[sipAddress] = map;
mRefs << &mSipAddresses[sipAddress];
}
// -----------------------------------------------------------------------------
void ConferenceHelperModel::ConferenceAddModel::handleDataChanged (
const QModelIndex &topLeft,
const QModelIndex &bottomRight,
const QVector<int> &
) {
SipAddressesModel *sipAddressesModel = CoreManager::getInstance()->getSipAddressesModel();
int limit = bottomRight.row();
for (int row = topLeft.row(); row <= limit; ++row) {
const QVariantMap &map = sipAddressesModel->data(sipAddressesModel->index(row, 0)).toMap();
auto it = mSipAddresses.find(map["sipAddress"].toString());
if (it != mSipAddresses.end()) {
(*it)["contact"] = map.value("contact");
int row = mRefs.indexOf(&(*it));
Q_ASSERT(row != -1);
emit dataChanged(index(row, 0), index(row, 0));
}
}
}

6
linphone-desktop/src/components/conference/ConferenceAddModel.hpp
View file

@ -57,6 +57,12 @@ public:
private:
void addToConference (const std::shared_ptr<linphone::Address> &linphoneAddress);
void handleDataChanged (
const QModelIndex &topLeft,
const QModelIndex &bottomRight,
const QVector<int> &roles = QVector<int>()
);
QHash<QString, QVariantMap> mSipAddresses;
QList<const QVariantMap *> mRefs;

2
linphone-desktop/src/components/conference/ConferenceHelperModel.hpp
View file

@ -39,7 +39,7 @@ namespace linphone {
class ConferenceHelperModel : public QSortFilterProxyModel {
Q_OBJECT;
Q_PROPERTY(ConferenceAddModel * toAdd READ getConferenceAddModel CONSTANT);
Q_PROPERTY(ConferenceHelperModel::ConferenceAddModel * toAdd READ getConferenceAddModel CONSTANT);
public:
class ConferenceAddModel;

7
linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp
View file

@ -93,6 +93,13 @@ void SipAddressesModel::connectToChatModel (ChatModel *chatModel) {
// -----------------------------------------------------------------------------
QVariantMap SipAddressesModel::find (const QString &sipAddress) const {
auto it = mSipAddresses.find(sipAddress);
return it == mSipAddresses.end() ? QVariantMap() : *it;
}
// -----------------------------------------------------------------------------
ContactModel *SipAddressesModel::mapSipAddressToContact (const QString &sipAddress) const {
auto it = mSipAddresses.find(sipAddress);
if (it == mSipAddresses.end())

1
linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
View file

@ -47,6 +47,7 @@ public:
void connectToChatModel (ChatModel *chatModel);
Q_INVOKABLE QVariantMap find (const QString &sipAddress) const;
Q_INVOKABLE ContactModel *mapSipAddressToContact (const QString &sipAddress) const;
Q_INVOKABLE SipAddressObserver *getSipAddressObserver (const QString &sipAddress);