Commit 13000110 authored by Ronan Abhamon's avatar Ronan Abhamon

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

parent 06ff2410
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linphone++/linphone.hh> #include <linphone++/linphone.hh>
#include <QObject> #include <QObject>
#include <QDebug>
// ============================================================================= // =============================================================================
class CallModel : public QObject { class CallModel : public QObject {
...@@ -76,6 +76,10 @@ public: ...@@ -76,6 +76,10 @@ public:
QString getSipAddress () const; QString getSipAddress () const;
bool isInConference () const {
return mIsInConference;
}
static void setRecordFile (std::shared_ptr<linphone::CallParams> &callParams); static void setRecordFile (std::shared_ptr<linphone::CallParams> &callParams);
void updateStats (const std::shared_ptr<const linphone::CallStats> &callStats); void updateStats (const std::shared_ptr<const linphone::CallStats> &callStats);
...@@ -114,11 +118,6 @@ private: ...@@ -114,11 +118,6 @@ private:
return mCall->getDir() == linphone::CallDirOutgoing; return mCall->getDir() == linphone::CallDirOutgoing;
} }
bool isInConference () const {
qDebug() << "toto" << mIsInConference;
return mIsInConference;
}
void updateIsInConference (); void updateIsInConference ();
void acceptWithAutoAnswerDelay (); void acceptWithAutoAnswerDelay ();
......
...@@ -43,7 +43,5 @@ CallsListProxyModel::CallsListProxyModel (QObject *parent) : QSortFilterProxyMod ...@@ -43,7 +43,5 @@ CallsListProxyModel::CallsListProxyModel (QObject *parent) : QSortFilterProxyMod
bool CallsListProxyModel::filterAcceptsRow (int sourceRow, const QModelIndex &sourceParent) const { bool CallsListProxyModel::filterAcceptsRow (int sourceRow, const QModelIndex &sourceParent) const {
const QModelIndex &index = sourceModel()->index(sourceRow, 0, sourceParent); const QModelIndex &index = sourceModel()->index(sourceRow, 0, sourceParent);
shared_ptr<linphone::Call> call = index.data().value<CallModel *>()->getCall(); return !index.data().value<CallModel *>()->isInConference();
return call->getConference() == nullptr;
} }
...@@ -24,7 +24,10 @@ function attachVirtualWindow (component, properties, exitStatusHandler) { ...@@ -24,7 +24,10 @@ function attachVirtualWindow (component, properties, exitStatusHandler) {
object.exitStatus.connect(exitStatusHandler) object.exitStatus.connect(exitStatusHandler)
} }
object.exitStatus.connect(function () { object.exitStatus.connect(function () {
virtualWindow.unsetContent().destroy() var content = virtualWindow.unsetContent()
if (content) {
content.destroy()
}
}) })
virtualWindow.setContent(object) virtualWindow.setContent(object)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment