From e2c5eb02cb6130a6847f18d630d3fe6dba63b0db 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:14:27 -0400
Subject: [PATCH] api: remove hasCameraStarted
Change-Id: If509355da31d71e9301d463fbbd64c202530cdfc
---
bin/dbus/cx.ring.Ring.VideoManager.xml | 7 -------
bin/dbus/dbusvideomanager.cpp | 6 ------
bin/dbus/dbusvideomanager.h | 1 -
bin/jni/videomanager.i | 1 -
bin/nodejs/videomanager.i | 1 -
src/client/videomanager.cpp | 6 ------
src/jami/videomanager_interface.h | 2 --
7 files changed, 24 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.VideoManager.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml
index 6d0d51202b..99dddaaffd 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 7cbe5bfb8e..2218ad9cad 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 2ce8e7362d..3de30452fa 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 945d78daab..352b0f9585 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 279f6b6cbd..5bc0dcb58f 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 4eb7494510..be35b1be6e 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 9058b0ad3a..d4c0d54d63 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);
--
GitLab