lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-08 16:55:39 +02:00
Code Activity

fix: do not open camera after closing sharing

Browse source 
While in an audio only call, if a sharing is started and then stopped,
the camera was open.

Change-Id: I5af5f7c106c2c53a97ee6b754b0344c7ecb35526
This commit is contained in:
Aline Gondim Santos 2022-09-21 12:04:24 -03:00
parent 87acb931b9
commit 43ab7e29d4
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/app/avadapter.cpp
View file

@ -96,8 +96,7 @@ AvAdapter::shareEntireScreen(int screenNumber)
rect.width() * screen->devicePixelRatio(), rect.width() * screen->devicePixelRatio(),
rect.height() * screen->devicePixelRatio()); rect.height() * screen->devicePixelRatio());
auto callId = lrcInstance_->getCurrentCallId(); auto callId = lrcInstance_->getCurrentCallId();
if (hasCamera()) muteCamera_ = !isCapturing();
muteCamera_ = !isCapturing();
lrcInstance_->getCurrentCallModel() lrcInstance_->getCurrentCallModel()
->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING); ->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING);
} }
@ -113,8 +112,7 @@ AvAdapter::shareAllScreens()
arrangementRect.width(), arrangementRect.width(),
arrangementRect.height()); arrangementRect.height());
auto callId = lrcInstance_->getCurrentCallId(); auto callId = lrcInstance_->getCurrentCallId();
if (hasCamera()) muteCamera_ = !isCapturing();
muteCamera_ = !isCapturing();
lrcInstance_->getCurrentCallModel() lrcInstance_->getCurrentCallModel()
->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING); ->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING);
} }
@ -178,8 +176,7 @@ AvAdapter::shareFile(const QString& filePath)
{ {
auto callId = lrcInstance_->getCurrentCallId(); auto callId = lrcInstance_->getCurrentCallId();
if (!callId.isEmpty()) { if (!callId.isEmpty()) {
if (hasCamera()) muteCamera_ = !isCapturing();
muteCamera_ = !isCapturing();
lrcInstance_->getCurrentCallModel() lrcInstance_->getCurrentCallModel()
->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING); ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING);
} }
@ -188,8 +185,7 @@ AvAdapter::shareFile(const QString& filePath)
void void
AvAdapter::shareScreenArea(unsigned x, unsigned y, unsigned width, unsigned height) AvAdapter::shareScreenArea(unsigned x, unsigned y, unsigned width, unsigned height)
{ {
if (hasCamera()) muteCamera_ = !isCapturing();
muteCamera_ = !isCapturing();
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
// xrectsel will freeze all displays too fast so that the call // xrectsel will freeze all displays too fast so that the call
// context menu will not be closed even closed signal is emitted // context menu will not be closed even closed signal is emitted
@ -224,8 +220,7 @@ AvAdapter::shareWindow(const QString& windowId)
auto resource = lrcInstance_->getCurrentCallModel()->getDisplay(windowId); auto resource = lrcInstance_->getCurrentCallModel()->getDisplay(windowId);
auto callId = lrcInstance_->getCurrentCallId(); auto callId = lrcInstance_->getCurrentCallId();
if (hasCamera()) muteCamera_ = !isCapturing();
muteCamera_ = !isCapturing();
lrcInstance_->getCurrentCallModel() lrcInstance_->getCurrentCallModel()
->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING); ->addMedia(callId, resource, lrc::api::CallModel::MediaRequestType::SCREENSHARING);
} }