Skip to content
Snippets Groups Projects
Commit 8cefda6e authored by Sébastien Blin's avatar Sébastien Blin
Browse files

calloverlay: fix record status

We can directly use the info from the calloverlay and refresh when
updating the UI

Change-Id: I7bc2b17ebfba251e26bd5d0328d2b981722cb727
GitLab: #594
parent 3380a267
No related branches found
No related tags found
No related merge requests found
...@@ -651,7 +651,6 @@ CallAdapter::updateCallOverlay(const lrc::api::conversation::Info& convInfo) ...@@ -651,7 +651,6 @@ CallAdapter::updateCallOverlay(const lrc::api::conversation::Info& convInfo)
bool isAudioOnly = call->isAudioOnly && !isPaused; bool isAudioOnly = call->isAudioOnly && !isPaused;
bool isAudioMuted = call->audioMuted && (call->status != lrc::api::call::Status::PAUSED); bool isAudioMuted = call->audioMuted && (call->status != lrc::api::call::Status::PAUSED);
bool isVideoMuted = call->isAudioOnly || (call->videoMuted && !isPaused); bool isVideoMuted = call->isAudioOnly || (call->videoMuted && !isPaused);
bool isRecording = isRecordingThisCall();
bool isConferenceCall = !convInfo.confId.isEmpty() bool isConferenceCall = !convInfo.confId.isEmpty()
|| (convInfo.confId.isEmpty() && call->participantsInfos.size() != 0); || (convInfo.confId.isEmpty() && call->participantsInfos.size() != 0);
bool isGrid = call->layout == lrc::api::call::Layout::GRID; bool isGrid = call->layout == lrc::api::call::Layout::GRID;
...@@ -660,7 +659,6 @@ CallAdapter::updateCallOverlay(const lrc::api::conversation::Info& convInfo) ...@@ -660,7 +659,6 @@ CallAdapter::updateCallOverlay(const lrc::api::conversation::Info& convInfo)
isAudioOnly, isAudioOnly,
isAudioMuted, isAudioMuted,
isVideoMuted, isVideoMuted,
isRecording,
accInfo.profileInfo.type == lrc::api::profile::Type::SIP, accInfo.profileInfo.type == lrc::api::profile::Type::SIP,
isConferenceCall, isConferenceCall,
isGrid); isGrid);
......
...@@ -99,7 +99,6 @@ Q_SIGNALS: ...@@ -99,7 +99,6 @@ Q_SIGNALS:
bool isAudioOnly, bool isAudioOnly,
bool isAudioMuted, bool isAudioMuted,
bool isVideoMuted, bool isVideoMuted,
bool isRecording,
bool isSIP, bool isSIP,
bool isConferenceCall, bool isConferenceCall,
bool isGrid); bool isGrid);
......
...@@ -353,6 +353,7 @@ Control { ...@@ -353,6 +353,7 @@ Control {
overflowItemCount = CallOverlayModel.secondaryModel().rowCount() overflowItemCount = CallOverlayModel.secondaryModel().rowCount()
muteAudioAction.checked = isAudioMuted muteAudioAction.checked = isAudioMuted
recordAction.checked = CallAdapter.isRecordingThisCall()
muteVideoAction.checked = isAudioOnly ? true : isVideoMuted muteVideoAction.checked = isAudioOnly ? true : isVideoMuted
} }
......
...@@ -62,7 +62,7 @@ Item { ...@@ -62,7 +62,7 @@ Item {
} }
function updateUI(isPaused, isAudioOnly, isAudioMuted, function updateUI(isPaused, isAudioOnly, isAudioMuted,
isVideoMuted, isRecording, isSIP, isVideoMuted, isSIP,
isConferenceCall, isGrid) { isConferenceCall, isGrid) {
if (isPaused !== undefined) { if (isPaused !== undefined) {
root.isPaused = isPaused root.isPaused = isPaused
...@@ -70,13 +70,13 @@ Item { ...@@ -70,13 +70,13 @@ Item {
root.isAudioMuted = isAudioMuted root.isAudioMuted = isAudioMuted
root.isVideoMuted = isVideoMuted root.isVideoMuted = isVideoMuted
callViewContextMenu.isVideoMuted = root.isVideoMuted callViewContextMenu.isVideoMuted = root.isVideoMuted
root.isRecording = isRecording
root.isSIP = isSIP root.isSIP = isSIP
root.isConferenceCall = isConferenceCall root.isConferenceCall = isConferenceCall
root.isGrid = isGrid root.isGrid = isGrid
mainOverlay.recordingVisible = isRecording mainOverlay.recordingVisible = isRecording
root.localHandRaised = CallAdapter.isHandRaised() root.localHandRaised = CallAdapter.isHandRaised()
} }
root.isRecording = CallAdapter.isRecordingThisCall()
root.isModerator = CallAdapter.isCurrentModerator() root.isModerator = CallAdapter.isCurrentModerator()
} }
......
...@@ -273,13 +273,13 @@ Rectangle { ...@@ -273,13 +273,13 @@ Rectangle {
target: CallAdapter target: CallAdapter
function onUpdateOverlay(isPaused, isAudioOnly, isAudioMuted, isVideoMuted, function onUpdateOverlay(isPaused, isAudioOnly, isAudioMuted, isVideoMuted,
isRecording, isSIP, isConferenceCall, isGrid) { isSIP, isConferenceCall, isGrid, previewId) {
callOverlay.showOnHoldImage(isPaused) callOverlay.showOnHoldImage(isPaused)
root.isAudioOnly = isAudioOnly root.isAudioOnly = isAudioOnly
audioCallPageRectCentralRect.visible = !isPaused && root.isAudioOnly audioCallPageRectCentralRect.visible = !isPaused && root.isAudioOnly
callOverlay.updateUI(isPaused, isAudioOnly, callOverlay.updateUI(isPaused, isAudioOnly,
isAudioMuted, isVideoMuted, isAudioMuted, isVideoMuted,
isRecording, isSIP, isSIP,
isConferenceCall, isGrid) isConferenceCall, isGrid)
callOverlay.participantsLayer.update(CallAdapter.getConferencesInfos()) callOverlay.participantsLayer.update(CallAdapter.getConferencesInfos())
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment