diff --git a/bin/jni/videomanager.i b/bin/jni/videomanager.i index 352b0f958..cacee0bee 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 getSettings(const std::string& name); void applySettings(const std::string& name, const std::map& settings); diff --git a/bin/nodejs/videomanager.i b/bin/nodejs/videomanager.i index 5bc0dcb58..7cce14121 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 getSettings(const std::string& name); void applySettings(const std::string& name, const std::map& settings); diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp index be35b1be6..3e230ebb3 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 d4c0d54d6..ff82e011e 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 getRenderer(const std::string& callId);