diff --git a/bin/dbus/cx.ring.Ring.VideoManager.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml index 6d0d51202be501121144cc02640867c00961c182..99dddaaffdff82c3687a95be2b8d9c31654527ea 100644 --- a/bin/dbus/cx.ring.Ring.VideoManager.xml +++ b/bin/dbus/cx.ring.Ring.VideoManager.xml @@ -98,13 +98,6 @@ </arg> </method> - <method name="hasCameraStarted" tp:name-for-bindings="hasCameraStarted"> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Bool"/> - <arg type="b" name="started" direction="out"> - <tp:docstring>Returns true if the camera has already started, false otherwise</tp:docstring> - </arg> - </method> - <method name="getDecodingAccelerated" tp:name-for-bindings="getDecodingAccelerated"> <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Bool"/> <arg type="b" name="state" direction="out"> diff --git a/bin/dbus/dbusvideomanager.cpp b/bin/dbus/dbusvideomanager.cpp index 7cbe5bfb8e6c985a4789f9ddfed0180d3234ef75..2218ad9cadc265398dbf1bd172c48de94d31efce 100644 --- a/bin/dbus/dbusvideomanager.cpp +++ b/bin/dbus/dbusvideomanager.cpp @@ -91,12 +91,6 @@ DBusVideoManager::switchInput(const std::string& resource) -> decltype(DRing::sw return DRing::switchInput(resource); } -auto -DBusVideoManager::hasCameraStarted() -> decltype(DRing::hasCameraStarted()) -{ - return DRing::hasCameraStarted(); -} - auto DBusVideoManager::getDecodingAccelerated() -> decltype(DRing::getDecodingAccelerated()) { diff --git a/bin/dbus/dbusvideomanager.h b/bin/dbus/dbusvideomanager.h index 2ce8e7362da96c65f656f14828cec391f69b5f2f..3de30452fa156170e69fb7049c32aea575207842 100644 --- a/bin/dbus/dbusvideomanager.h +++ b/bin/dbus/dbusvideomanager.h @@ -62,7 +62,6 @@ class DRING_PUBLIC DBusVideoManager : void startAudioDevice(); void stopAudioDevice(); bool switchInput(const std::string& resource); - bool hasCameraStarted(); bool getDecodingAccelerated(); void setDecodingAccelerated(const bool& state); bool getEncodingAccelerated(); diff --git a/bin/jni/videomanager.i b/bin/jni/videomanager.i index 945d78daab8ca92b11e742dd1343a9de79ee388f..352b0f9585c86b8f93f9f62de90f88a378dc3837 100644 --- a/bin/jni/videomanager.i +++ b/bin/jni/videomanager.i @@ -397,7 +397,6 @@ std::string getDefaultDevice(); void startCamera(); void stopCamera(); -bool hasCameraStarted(); void startAudioDevice(); void stopAudioDevice(); bool switchInput(const std::string& resource); diff --git a/bin/nodejs/videomanager.i b/bin/nodejs/videomanager.i index 279f6b6cbd72dbd61eebfecd6cb7f5081ba25792..5bc0dcb58f76b83529b207c9e9560550dd5d8e6b 100644 --- a/bin/nodejs/videomanager.i +++ b/bin/nodejs/videomanager.i @@ -48,7 +48,6 @@ std::string getDefaultDevice(); void startCamera(); void stopCamera(); -bool hasCameraStarted(); void startAudioDevice(); void stopAudioDevice(); bool switchInput(const std::string& resource); diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp index 4eb7494510bbeb62a1ea163deaefbe4ddad030cb..be35b1be6ed3b9dbdb0bf1e7175893904d3326b6 100644 --- a/src/client/videomanager.cpp +++ b/src/client/videomanager.cpp @@ -536,12 +536,6 @@ switchToCamera() jami::Manager::instance().getVideoManager().videoDeviceMonitor.getMRLForDefaultDevice()); } -bool -hasCameraStarted() -{ - return jami::Manager::instance().getVideoManager().started; -} - void registerSinkTarget(const std::string& sinkId, const SinkTarget& target) { diff --git a/src/jami/videomanager_interface.h b/src/jami/videomanager_interface.h index 9058b0ad3a87f551612478f335c79898b3acc8fe..d4c0d54d63dad2e2a9b97de71bbb9a4292ee9f41 100644 --- a/src/jami/videomanager_interface.h +++ b/src/jami/videomanager_interface.h @@ -192,10 +192,8 @@ DRING_PUBLIC void setDefaultDevice(const std::string& deviceId); DRING_PUBLIC void setDeviceOrientation(const std::string& deviceId, int angle); DRING_PUBLIC std::map<std::string, std::string> getDeviceParams(const std::string& deviceId); DRING_PUBLIC std::string getDefaultDevice(); -DRING_PUBLIC std::string getCurrentCodecName(const std::string& callID); DRING_PUBLIC void startCamera(); DRING_PUBLIC void stopCamera(); -DRING_PUBLIC bool hasCameraStarted(); DRING_PUBLIC void startAudioDevice(); DRING_PUBLIC void stopAudioDevice(); DRING_PUBLIC std::string createMediaPlayer(const std::string& path);