diff --git a/bin/jni/videomanager.i b/bin/jni/videomanager.i index 352b0f9585c86b8f93f9f62de90f88a378dc3837..cacee0bee798c0e734298f9b2532dbf15cf828e1 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 5bc0dcb58f76b83529b207c9e9560550dd5d8e6b..7cce141216a565748bda37926175d66bd6c37b46 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 be35b1be6ed3b9dbdb0bf1e7175893904d3326b6..3e230ebb3aa27918708f45c9daf193014dd08532 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 d4c0d54d63dad2e2a9b97de71bbb9a4292ee9f41..ff82e011e07b4c8a563768d04d1eb1a2b61eedd7 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);