From dc514c8cc6bac49c2dcc821ad0d6612e5802d53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 5 Oct 2021 14:24:22 -0400
Subject: [PATCH] api: remove switchToCamera()
Change-Id: I5e328cc2d0e38aa26bf62cb3a5bd083d499b9a02
---
bin/jni/videomanager.i | 1 -
bin/nodejs/videomanager.i | 1 -
src/client/videomanager.cpp | 10 ++--------
src/jami/videomanager_interface.h | 1 -
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/bin/jni/videomanager.i b/bin/jni/videomanager.i
index 352b0f9585..cacee0bee7 100644
--- a/bin/jni/videomanager.i
+++ b/bin/jni/videomanager.i
@@ -400,7 +400,6 @@ void stopCamera();
void startAudioDevice();
void stopAudioDevice();
bool switchInput(const std::string& resource);
-bool switchToCamera();
std::map<std::string, std::string> getSettings(const std::string& name);
void applySettings(const std::string& name, const std::map<std::string, std::string>& settings);
diff --git a/bin/nodejs/videomanager.i b/bin/nodejs/videomanager.i
index 5bc0dcb58f..7cce141216 100644
--- a/bin/nodejs/videomanager.i
+++ b/bin/nodejs/videomanager.i
@@ -51,7 +51,6 @@ void stopCamera();
void startAudioDevice();
void stopAudioDevice();
bool switchInput(const std::string& resource);
-bool switchToCamera();
std::map<std::string, std::string> getSettings(const std::string& name);
void applySettings(const std::string& name, const std::map<std::string, std::string>& settings);
diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp
index be35b1be6e..3e230ebb3a 100644
--- a/src/client/videomanager.cpp
+++ b/src/client/videomanager.cpp
@@ -449,7 +449,8 @@ void
startCamera()
{
jami::Manager::instance().getVideoManager().videoPreview = jami::getVideoCamera();
- jami::Manager::instance().getVideoManager().started = switchToCamera();
+ jami::Manager::instance().getVideoManager().started = switchInput(
+ jami::Manager::instance().getVideoManager().videoDeviceMonitor.getMRLForDefaultDevice());
}
void
@@ -529,13 +530,6 @@ switchInput(const std::string& resource)
return ret;
}
-bool
-switchToCamera()
-{
- return switchInput(
- jami::Manager::instance().getVideoManager().videoDeviceMonitor.getMRLForDefaultDevice());
-}
-
void
registerSinkTarget(const std::string& sinkId, const SinkTarget& target)
{
diff --git a/src/jami/videomanager_interface.h b/src/jami/videomanager_interface.h
index d4c0d54d63..ff82e011e0 100644
--- a/src/jami/videomanager_interface.h
+++ b/src/jami/videomanager_interface.h
@@ -204,7 +204,6 @@ DRING_PUBLIC bool playerSeekToTime(const std::string& id, int time);
int64_t getPlayerPosition(const std::string& id);
DRING_PUBLIC bool switchInput(const std::string& resource);
-DRING_PUBLIC bool switchToCamera();
DRING_PUBLIC void registerSinkTarget(const std::string& sinkId, const SinkTarget& target);
DRING_PUBLIC void registerAVSinkTarget(const std::string& sinkId, const AVSinkTarget& target);
DRING_PUBLIC std::map<std::string, std::string> getRenderer(const std::string& callId);
--
GitLab