diff --git a/src/callaudioonlyavataroverlay.cpp b/src/callaudioonlyavataroverlay.cpp index 2beee6b7445ee2a2bd872797e50731303c882c5f..b16541e5399395262ff604e91d01fdd8ff2c7f67 100644 --- a/src/callaudioonlyavataroverlay.cpp +++ b/src/callaudioonlyavataroverlay.cpp @@ -56,7 +56,7 @@ CallAudioOnlyAvatarOverlay::writeAvatarOverlay(const lrc::api::conversation::Inf } void -CallAudioOnlyAvatarOverlay::respondToPauseLabel(bool pauseButtonDisplayed) +CallAudioOnlyAvatarOverlay::respondToPauseLabel(bool isPaused) { - setAvatarVisible(!pauseButtonDisplayed); + setAvatarVisible(!isPaused); } diff --git a/src/callaudioonlyavataroverlay.h b/src/callaudioonlyavataroverlay.h index 7d2e224a530de2be797b06b428a598e475973023..5e178a3fa640d116a4a025ebdf89ce49d0901ecf 100644 --- a/src/callaudioonlyavataroverlay.h +++ b/src/callaudioonlyavataroverlay.h @@ -38,7 +38,7 @@ public: ~CallAudioOnlyAvatarOverlay(); void setAvatarVisible(bool visible); void writeAvatarOverlay(const lrc::api::conversation::Info& convInfo); - void respondToPauseLabel(bool pauseButtonDisplayed); + void respondToPauseLabel(bool isPaused); private: Ui::CallAudioOnlyAvatarOverlay *ui; diff --git a/src/videooverlay.cpp b/src/videooverlay.cpp index 1b32ff93f650e87350689cf11d7551f419b43009..5d8d4dc18eb8aa93403d0e3259b6cf27d5cd8cb5 100644 --- a/src/videooverlay.cpp +++ b/src/videooverlay.cpp @@ -191,19 +191,15 @@ VideoOverlay::on_chatButton_toggled(bool checked) void VideoOverlay::on_holdButton_toggled(bool checked) { - // why is 'checked' unused? Q_UNUSED(checked); auto callId = LRCInstance::getCallIdForConversationUid(convUid_, accountId_); if (callId.isEmpty() || !LRCInstance::getCurrentCallModel()->hasCall(callId)) { return; } auto callModel = LRCInstance::getCurrentCallModel(); - bool onHold { false }; if (callModel->hasCall(callId)) { callModel->togglePause(callId); - onHold = callModel->getCall(callId).status == lrc::api::call::Status::PAUSED; } - ui->onHoldLabel->setVisible(onHold); } void diff --git a/src/videooverlay.h b/src/videooverlay.h index 7e4c65201654b063e42ebfc86da4a315e3d1f3b6..d2a6c2edc6dab2da2fbd6f3f43bceb1912b2d9a0 100644 --- a/src/videooverlay.h +++ b/src/videooverlay.h @@ -55,7 +55,6 @@ public: signals: void setChatVisibility(bool visible); - void holdStateChanged(bool state); void videoMuteStateChanged(bool state); private: diff --git a/src/videoview.cpp b/src/videoview.cpp index 6df2f6aaeb3ed322f0f4d6520682664b28be055b..b7c997aa30b064811bd92cd0efe8dff2cff86748 100644 --- a/src/videoview.cpp +++ b/src/videoview.cpp @@ -304,8 +304,9 @@ VideoView::updateCall(const QString& convUid, } overlay_->updateCall(convInfo); + auto isPaused = call->status == lrc::api::call::Status::PAUSED; // TODO(atraczyk): this should be part of the overlay - audioOnlyAvatar_->setAvatarVisible(call->isAudioOnly); + audioOnlyAvatar_->setAvatarVisible(call->isAudioOnly && !isPaused); if (call->isAudioOnly) { audioOnlyAvatar_->writeAvatarOverlay(convInfo); } @@ -315,7 +316,6 @@ VideoView::updateCall(const QString& convUid, // distant ui->distantWidget->setRendererId(call->id); - auto isPaused = call->status == lrc::api::call::Status::PAUSED; ui->distantWidget->setVisible(!isPaused); }