jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

videomanager: don't start audio preview in switchInput

Browse Source 
Change-Id: I820d008b9f437e4396f076fade34f3f9d9f8d053
This commit is contained in:
Adrien Béraud
2020-10-31 16:27:08 -04:00
parent e7b3b5e4cb
commit 7eb1e7373d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/videomanager.cpp
View File

@ -457,8 +457,7 @@ startCamera()
void
stopCamera()
{
if (switchInput(""))
jami::Manager::instance().getVideoManager().started = false;
jami::Manager::instance().getVideoManager().started = false;
jami::Manager::instance().getVideoManager().videoPreview.reset();
}
@ -467,6 +466,7 @@ startAudioDevice()
{
jami::Manager::instance().getVideoManager().audioPreview = jami::getAudioInput(
jami::RingBufferPool::DEFAULT_ID);
jami::Manager::instance().getVideoManager().audioPreview->switchInput("");
}
void
@ -520,20 +520,13 @@ stopLocalRecorder(const std::string& filepath)
bool
switchInput(const std::string& resource)
{
if (auto call = jami::Manager::instance().getCurrentCall()) {
if (call->hasVideo()) {
// TODO remove this part when clients are updated to use Calljami::Manager::switchInput
call->switchInput(resource);
return true;
}
}
bool ret = true;
if (auto input = jami::Manager::instance().getVideoManager().videoInput.lock())
ret = input->switchInput(resource).valid();
else
JAMI_WARN("Video input not initialized");
if (auto input = jami::getAudioInput(jami::RingBufferPool::DEFAULT_ID))
if (auto input = jami::Manager::instance().getVideoManager().audioPreview)
ret &= input->switchInput(resource).valid();
return ret;
}