From e834b879f94bd6c2683ae4b913f0c1c5cfd3a718 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 18 Sep 2017 10:59:42 +0200 Subject: [PATCH] Prepared audio mute button in incall view --- src/components/call/CallModel.cpp | 12 ++++++++++++ src/components/call/CallModel.hpp | 5 +++++ ui/views/App/Calls/Incall.qml | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/components/call/CallModel.cpp b/src/components/call/CallModel.cpp index c05b808c2..4998138c3 100644 --- a/src/components/call/CallModel.cpp +++ b/src/components/call/CallModel.cpp @@ -444,6 +444,18 @@ void CallModel::setMicroMuted (bool status) { // ----------------------------------------------------------------------------- +bool CallModel::getAudioMuted () const { + // TODO + return false; +} + +void CallModel::setAudioMuted (bool status) { + // TODO + emit audioMutedChanged(status); +} + +// ----------------------------------------------------------------------------- + bool CallModel::getPausedByUser () const { return mPausedByUser; } diff --git a/src/components/call/CallModel.hpp b/src/components/call/CallModel.hpp index b585f3d84..e98b5b574 100644 --- a/src/components/call/CallModel.hpp +++ b/src/components/call/CallModel.hpp @@ -45,6 +45,7 @@ class CallModel : public QObject { Q_PROPERTY(float speakerVu READ getSpeakerVu CONSTANT); Q_PROPERTY(bool microMuted READ getMicroMuted WRITE setMicroMuted NOTIFY microMutedChanged); + Q_PROPERTY(bool audioMuted READ getAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged); Q_PROPERTY(bool pausedByUser READ getPausedByUser WRITE setPausedByUser NOTIFY statusChanged); Q_PROPERTY(bool videoEnabled READ getVideoEnabled WRITE setVideoEnabled NOTIFY statusChanged); @@ -126,6 +127,7 @@ signals: void callErrorChanged (const QString &callError); void isInConferenceChanged (bool status); void microMutedChanged (bool status); + void audioMutedChanged (bool status); void recordingChanged (bool status); void statsUpdated (); void statusChanged (CallStatus status); @@ -161,6 +163,9 @@ private: bool getMicroMuted () const; void setMicroMuted (bool status); + + bool getAudioMuted () const; + void setAudioMuted (bool status); bool getPausedByUser () const; void setPausedByUser (bool status); diff --git a/ui/views/App/Calls/Incall.qml b/ui/views/App/Calls/Incall.qml index cd4909e99..f60bd94ca 100644 --- a/ui/views/App/Calls/Incall.qml +++ b/ui/views/App/Calls/Incall.qml @@ -328,11 +328,11 @@ Rectangle { ActionSwitch { id: speaker - enabled: true + enabled: !call.audioMuted icon: 'speaker' iconSize: CallStyle.actionArea.iconSize - onClicked: console.log('TODO') + onClicked: incall.call.audioMuted = enabled } }