diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 53f1224fe..a22eab247 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1566,7 +1566,7 @@ Buraya tıklayın: <a href="%1">%1</a> missingConferenceURI 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missong in its configuration. - + Toplantı tabanlı konuşma odası oluşturmak için hesap ayarlarınızda toplantı URI'si belirlemelisiniz. newConferenceTitle @@ -1607,7 +1607,7 @@ Buraya tıklayın: <a href="%1">%1</a> adminStatus 'Admin' : Admin(istrator) - + Yönetici word for admin status diff --git a/linphone-app/src/components/conference/ConferenceModel.cpp b/linphone-app/src/components/conference/ConferenceModel.cpp index 096256e40..ba4e85a45 100644 --- a/linphone-app/src/components/conference/ConferenceModel.cpp +++ b/linphone-app/src/components/conference/ConferenceModel.cpp @@ -88,9 +88,9 @@ void ConferenceModel::onParticipantDeviceJoined(const std::shared_ptrgetMe()->getDevices().size(); emit participantDeviceJoined(participantDevice); } -void ConferenceModel::onParticipantDeviceMediaChanged(const std::shared_ptr & conference, const std::shared_ptr & participantDevice){ - qWarning() << "ConferenceModel::onParticipantDeviceMediaChanged: " << (int)participantDevice->getStreamAvailability(linphone::StreamType::Video) << ". Me devices : " << conference->getMe()->getDevices().size(); - emit participantDeviceMediaChanged(participantDevice); +void ConferenceModel::onParticipantDeviceMediaAvailabilityChanged(const std::shared_ptr & conference, const std::shared_ptr & participantDevice){ + qWarning() << "ConferenceModel::onParticipantDeviceMediaAvailabilityChanged: " << (int)participantDevice->getStreamAvailability(linphone::StreamType::Video) << ". Me devices : " << conference->getMe()->getDevices().size(); + emit participantDeviceMediaAvailabilityChanged(participantDevice); } void ConferenceModel::onStateChanged(const std::shared_ptr & conference, linphone::Conference::State newState){ emit conferenceStateChanged(newState); diff --git a/linphone-app/src/components/conference/ConferenceModel.hpp b/linphone-app/src/components/conference/ConferenceModel.hpp index 9ce75fc53..ec36557bf 100644 --- a/linphone-app/src/components/conference/ConferenceModel.hpp +++ b/linphone-app/src/components/conference/ConferenceModel.hpp @@ -45,7 +45,7 @@ public: virtual void onParticipantAdminStatusChanged(const std::shared_ptr & conference, const std::shared_ptr & participant) override; virtual void onParticipantDeviceLeft(const std::shared_ptr & conference, const std::shared_ptr & device) override; virtual void onParticipantDeviceJoined(const std::shared_ptr & conference, const std::shared_ptr & device) override; - virtual void onParticipantDeviceMediaChanged(const std::shared_ptr & conference, const std::shared_ptr & device) override; + virtual void onParticipantDeviceMediaAvailabilityChanged(const std::shared_ptr & conference, const std::shared_ptr & device) override; virtual void onStateChanged(const std::shared_ptr & conference, linphone::Conference::State newState) override; virtual void onSubjectChanged(const std::shared_ptr & conference, const std::string & subject) override; virtual void onAudioDeviceChanged(const std::shared_ptr & conference, const std::shared_ptr & audioDevice) override; @@ -56,7 +56,7 @@ signals: void participantDeviceRemoved(const std::shared_ptr & participantDevice); void participantDeviceLeft(const std::shared_ptr & participantDevice); void participantDeviceJoined(const std::shared_ptr & participantDevice); - void participantDeviceMediaChanged(const std::shared_ptr & participantDevice); + void participantDeviceMediaAvailabilityChanged(const std::shared_ptr & participantDevice); void conferenceStateChanged(linphone::Conference::State newState); private: diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp index 1710d484e..ff7b92baf 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp @@ -208,7 +208,7 @@ void ConferenceInfoModel::createConference(const int& securityLevel, const int& mConferenceSchedulerModel->getConferenceScheduler()->setInfo(mConferenceInfo); }else{ - auto conferenceParameters = core->createConferenceParams(); + auto conferenceParameters = core->createConferenceParams(nullptr); conferenceParameters->enableAudio(true); conferenceParameters->enableVideo(true); conferenceParameters->setDescription(mConferenceInfo->getDescription()); diff --git a/linphone-app/src/components/participant/ParticipantDeviceListModel.cpp b/linphone-app/src/components/participant/ParticipantDeviceListModel.cpp index f5183fd50..8757bd6f9 100644 --- a/linphone-app/src/components/participant/ParticipantDeviceListModel.cpp +++ b/linphone-app/src/components/participant/ParticipantDeviceListModel.cpp @@ -35,7 +35,7 @@ ParticipantDeviceListModel::ParticipantDeviceListModel (std::shared_ptr(device, false); connect(this, &ParticipantDeviceListModel::securityLevelChanged, deviceModel.get(), &ParticipantDeviceModel::onSecurityLevelChanged); - connect(this, &ParticipantDeviceListModel::participantDeviceMediaChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); + connect(this, &ParticipantDeviceListModel::participantDeviceMediaAvailabilityChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); mList << deviceModel; } } @@ -56,7 +56,7 @@ ParticipantDeviceListModel::ParticipantDeviceListModel (CallModel * callModel, Q */ connect(conferenceModel.get(), &ConferenceModel::participantDeviceAdded, this, &ParticipantDeviceListModel::onParticipantDeviceAdded); connect(conferenceModel.get(), &ConferenceModel::participantDeviceRemoved, this, &ParticipantDeviceListModel::onParticipantDeviceRemoved); - connect(conferenceModel.get(), &ConferenceModel::participantDeviceMediaChanged, this, &ParticipantDeviceListModel::onParticipantDeviceMediaChanged); + connect(conferenceModel.get(), &ConferenceModel::participantDeviceMediaAvailabilityChanged, this, &ParticipantDeviceListModel::onParticipantDeviceMediaAvailabilityChanged); connect(conferenceModel.get(), &ConferenceModel::conferenceStateChanged, this, &ParticipantDeviceListModel::onConferenceStateChanged); } } @@ -74,11 +74,12 @@ int ParticipantDeviceListModel::count(){ void ParticipantDeviceListModel::updateDevices(std::shared_ptr participant){ std::list> devices = participant->getDevices() ; beginResetModel(); + qWarning() << "Update devices from participant"; mList.clear(); for(auto device : devices){ auto deviceModel = std::make_shared(device, false); connect(this, &ParticipantDeviceListModel::securityLevelChanged, deviceModel.get(), &ParticipantDeviceModel::onSecurityLevelChanged); - connect(this, &ParticipantDeviceListModel::participantDeviceMediaChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); + connect(this, &ParticipantDeviceListModel::participantDeviceMediaAvailabilityChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); mList << deviceModel; } endResetModel(); @@ -101,11 +102,12 @@ void ParticipantDeviceListModel::updateDevices(const std::list(device, isMe); connect(this, &ParticipantDeviceListModel::securityLevelChanged, deviceModel.get(), &ParticipantDeviceModel::onSecurityLevelChanged); - connect(this, &ParticipantDeviceListModel::participantDeviceMediaChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); + connect(this, &ParticipantDeviceListModel::participantDeviceMediaAvailabilityChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); devicesToAdd << deviceModel; } //} } + qWarning() << "Update devices from devices : " << devicesToAdd.size(); if(devicesToAdd.size() > 0){ int row = mList.count(); beginInsertRows(QModelIndex(), row, row+devicesToAdd.size()-1); @@ -161,7 +163,6 @@ void ParticipantDeviceListModel::onSecurityLevelChanged(std::shared_ptr & participantDevice){ - qWarning() << "Adding participant"; auto conferenceModel = mCallModel->getConferenceModel(); std::list> devices = conferenceModel->getConference()->getParticipantDeviceList(); for(auto realParticipantDevice : devices){ @@ -170,7 +171,7 @@ void ParticipantDeviceListModel::onParticipantDeviceAdded(const std::shared_ptr< beginInsertRows(QModelIndex(), row, row); auto deviceModel = std::make_shared(realParticipantDevice, false); connect(this, &ParticipantDeviceListModel::securityLevelChanged, deviceModel.get(), &ParticipantDeviceModel::onSecurityLevelChanged); - connect(this, &ParticipantDeviceListModel::participantDeviceMediaChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); + connect(this, &ParticipantDeviceListModel::participantDeviceMediaAvailabilityChanged, deviceModel.get(), &ParticipantDeviceModel::videoEnabledChanged); mList << deviceModel; endInsertRows(); emit countChanged(); @@ -204,8 +205,8 @@ void ParticipantDeviceListModel::onParticipantDeviceLeft(const std::shared_ptr & participantDevice) { - emit participantDeviceMediaChanged(); +void ParticipantDeviceListModel::onParticipantDeviceMediaAvailabilityChanged(const std::shared_ptr & participantDevice) { + emit participantDeviceMediaAvailabilityChanged(); } void ParticipantDeviceListModel::onConferenceStateChanged(linphone::Conference::State newState){ if(newState == linphone::Conference::State::Created){ diff --git a/linphone-app/src/components/participant/ParticipantDeviceListModel.hpp b/linphone-app/src/components/participant/ParticipantDeviceListModel.hpp index 99d31650e..57340dae3 100644 --- a/linphone-app/src/components/participant/ParticipantDeviceListModel.hpp +++ b/linphone-app/src/components/participant/ParticipantDeviceListModel.hpp @@ -55,13 +55,13 @@ public slots: void onParticipantDeviceRemoved(const std::shared_ptr & participantDevice); void onParticipantDeviceJoined(const std::shared_ptr & participantDevice); void onParticipantDeviceLeft(const std::shared_ptr & participantDevice); - void onParticipantDeviceMediaChanged(const std::shared_ptr & participantDevice); + void onParticipantDeviceMediaAvailabilityChanged(const std::shared_ptr & participantDevice); void onConferenceStateChanged(linphone::Conference::State newState); signals: void securityLevelChanged(std::shared_ptr device); void countChanged(); - void participantDeviceMediaChanged(); + void participantDeviceMediaAvailabilityChanged(); private: bool removeRow (int row, const QModelIndex &parent = QModelIndex()); diff --git a/linphone-app/src/utils/LinphoneEnums.hpp b/linphone-app/src/utils/LinphoneEnums.hpp index eba461b8c..715a3b04b 100644 --- a/linphone-app/src/utils/LinphoneEnums.hpp +++ b/linphone-app/src/utils/LinphoneEnums.hpp @@ -69,7 +69,7 @@ enum EventLogType { EventLogTypeConferenceParticipantUnsetAdmin = int(linphone::EventLog::Type::ConferenceParticipantUnsetAdmin), EventLogTypeConferenceParticipantDeviceAdded = int(linphone::EventLog::Type::ConferenceParticipantDeviceAdded), EventLogTypeConferenceParticipantDeviceRemoved = int(linphone::EventLog::Type::ConferenceParticipantDeviceRemoved), - //EventLogTypeConferenceParticipantDeviceMediaChanged = int(linphone::EventLog::Type::ConferenceParticipantDeviceMediaChanged), + EventLogTypeConferenceParticipantDeviceMediaAvailabilityChanged = int(linphone::EventLog::Type::ConferenceParticipantDeviceMediaAvailabilityChanged), EventLogTypeConferenceSubjectChanged= int(linphone::EventLog::Type::ConferenceSubjectChanged), EventLogTypeConferenceAvailableMediaChanged = int(linphone::EventLog::Type::ConferenceAvailableMediaChanged), EventLogTypeConferenceSecurityEvent = int(linphone::EventLog::Type::ConferenceSecurityEvent),