From eacbec668dbd16222ee4d96baf0b9d07826fd6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 17 Nov 2021 17:23:21 -0500
Subject: [PATCH] videomanager api: add deviceId to stopCapture

Change-Id: Ie1b88abf5790e2f17251e2c34ed229e34cdc496c
---
 bin/jni/jni_interface.i           | 2 +-
 bin/jni/videomanager.i            | 4 ++--
 bin/nodejs/videomanager.i         | 4 ++--
 src/jami/videomanager_interface.h | 2 +-
 src/media/video/video_input.cpp   | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/jni/jni_interface.i b/bin/jni/jni_interface.i
index 3a278ee13..ead1d7abc 100644
--- a/bin/jni/jni_interface.i
+++ b/bin/jni/jni_interface.i
@@ -313,7 +313,7 @@ void init(ConfigurationCallback* confM, Callback* callM, PresenceCallback* presM
         exportable_callback<VideoSignal::SetBitrate>(bind(&VideoCallback::setBitrate, videoM, _1, _2)),
         exportable_callback<VideoSignal::RequestKeyFrame>(bind(&VideoCallback::requestKeyFrame, videoM)),
         exportable_callback<VideoSignal::StartCapture>(bind(&VideoCallback::startCapture, videoM, _1)),
-        exportable_callback<VideoSignal::StopCapture>(bind(&VideoCallback::stopCapture, videoM)),
+        exportable_callback<VideoSignal::StopCapture>(bind(&VideoCallback::stopCapture, videoM, _1)),
         exportable_callback<VideoSignal::DecodingStarted>(bind(&VideoCallback::decodingStarted, videoM, _1, _2, _3, _4, _5)),
         exportable_callback<VideoSignal::DecodingStopped>(bind(&VideoCallback::decodingStopped, videoM, _1, _2, _3)),
     };
diff --git a/bin/jni/videomanager.i b/bin/jni/videomanager.i
index 71f4ee589..9fbf5c462 100644
--- a/bin/jni/videomanager.i
+++ b/bin/jni/videomanager.i
@@ -47,7 +47,7 @@ public:
     virtual void setBitrate(const std::string&, const int bitrate) {}
     virtual void requestKeyFrame(){}
     virtual void startCapture(const std::string& camid) {}
-    virtual void stopCapture() {}
+    virtual void stopCapture(const std::string& camid) {}
     virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
     virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
 };
@@ -445,7 +445,7 @@ public:
     virtual void setBitrate(const std::string&, const int bitrate) {}
     virtual void requestKeyFrame(){}
     virtual void startCapture(const std::string& camid) {}
-    virtual void stopCapture() {}
+    virtual void stopCapture(const std::string& camid) {}
     virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
     virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
 };
diff --git a/bin/nodejs/videomanager.i b/bin/nodejs/videomanager.i
index 3d55c272b..4f5147acc 100644
--- a/bin/nodejs/videomanager.i
+++ b/bin/nodejs/videomanager.i
@@ -33,7 +33,7 @@ public:
     virtual void getCameraInfo(const std::string& device, std::vector<int> *formats, std::vector<unsigned> *sizes, std::vector<unsigned> *rates) {}
     virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {}
     virtual void startCapture(const std::string& camid) {}
-    virtual void stopCapture() {}
+    virtual void stopCapture(const std::string& camid) {}
     virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
     virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
 };
@@ -65,7 +65,7 @@ public:
     virtual void getCameraInfo(const std::string& device, std::vector<int> *formats, std::vector<unsigned> *sizes, std::vector<unsigned> *rates){}
     virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {}
     virtual void startCapture(const std::string& camid) {}
-    virtual void stopCapture() {}
+    virtual void stopCapture(const std::string& camid) {}
     virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {}
     virtual void decodingStopped(const std::string& id, const std::string& shm_path, bool is_mixer) {}
 };
diff --git a/src/jami/videomanager_interface.h b/src/jami/videomanager_interface.h
index 337c9d10d..261032e6a 100644
--- a/src/jami/videomanager_interface.h
+++ b/src/jami/videomanager_interface.h
@@ -298,7 +298,7 @@ struct DRING_PUBLIC VideoSignal
     struct DRING_PUBLIC StopCapture
     {
         constexpr static const char* name = "StopCapture";
-        using cb_type = void(void);
+        using cb_type = void(const std::string& /*device*/);
     };
     struct DRING_PUBLIC DeviceAdded
     {
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index aad46f712..c14e2fc51 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -83,7 +83,7 @@ VideoInput::~VideoInput()
 {
     isStopped_ = true;
     if (videoManagedByClient()) {
-        emitSignal<DRing::VideoSignal::StopCapture>();
+        emitSignal<DRing::VideoSignal::StopCapture>(decOpts_.input);
         capturing_ = false;
         return;
     }
@@ -111,7 +111,6 @@ VideoInput::switchDevice()
             return;
         }
 
-        emitSignal<DRing::VideoSignal::StopCapture>();
         emitSignal<DRing::VideoSignal::StartCapture>(decOpts_.input);
         capturing_ = true;
     }