From 255fd16ada7c343287035cee01cc43e5474df9c0 Mon Sep 17 00:00:00 2001
From: AmarOk <contact@enconn.fr>
Date: Thu, 6 Jul 2017 10:49:48 -0400
Subject: [PATCH] CallManager: Remove unused parameter
Change-Id: I75106210a5db977d57cc2e3921e28e8bf30e9af7
---
bin/dbus/cx.ring.Ring.CallManager.xml | 1 -
bin/dbus/dbuscallmanager.cpp | 4 ++--
bin/dbus/dbuscallmanager.h | 2 +-
src/client/callmanager.cpp | 4 ++--
src/dring/callmanager_interface.h | 2 +-
src/manager.cpp | 6 ++----
src/manager.h | 5 ++---
7 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml
index 84a3394518..c2ae995013 100644
--- a/bin/dbus/cx.ring.Ring.CallManager.xml
+++ b/bin/dbus/cx.ring.Ring.CallManager.xml
@@ -706,7 +706,6 @@
<method name="stopRecordedFilePlayback" tp:name-for-bindings="stopRecordedFilePlayback">
<tp:added version="0.9.14"/>
<tp:docstring/>
- <arg type="s" name="filepath" direction="in"/>
</method>
<signal name="voiceMailNotify" tp:name-for-bindings="voiceMailNotify">
diff --git a/bin/dbus/dbuscallmanager.cpp b/bin/dbus/dbuscallmanager.cpp
index 3bbcf45081..7ebf8bbf97 100644
--- a/bin/dbus/dbuscallmanager.cpp
+++ b/bin/dbus/dbuscallmanager.cpp
@@ -208,9 +208,9 @@ DBusCallManager::startRecordedFilePlayback(const std::string& filepath) -> declt
}
void
-DBusCallManager::stopRecordedFilePlayback(const std::string& filepath)
+DBusCallManager::stopRecordedFilePlayback()
{
- DRing::stopRecordedFilePlayback(filepath);
+ DRing::stopRecordedFilePlayback();
}
auto
diff --git a/bin/dbus/dbuscallmanager.h b/bin/dbus/dbuscallmanager.h
index 2f50420008..9ee0d60888 100644
--- a/bin/dbus/dbuscallmanager.h
+++ b/bin/dbus/dbuscallmanager.h
@@ -85,7 +85,7 @@ class DBusCallManager :
std::string getConferenceId(const std::string& callID);
std::map<std::string, std::string> getConferenceDetails(const std::string& callID);
bool startRecordedFilePlayback(const std::string& filepath);
- void stopRecordedFilePlayback(const std::string& filepath);
+ void stopRecordedFilePlayback();
bool toggleRecording(const std::string& callID);
void setRecording(const std::string& callID);
void recordPlaybackSeek(const double& value);
diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp
index 28dfd67fca..c8b8c5bf17 100644
--- a/src/client/callmanager.cpp
+++ b/src/client/callmanager.cpp
@@ -247,9 +247,9 @@ startRecordedFilePlayback(const std::string& filepath)
}
void
-stopRecordedFilePlayback(const std::string& filepath)
+stopRecordedFilePlayback()
{
- ring::Manager::instance().stopRecordedFilePlayback(filepath);
+ ring::Manager::instance().stopRecordedFilePlayback();
}
bool
diff --git a/src/dring/callmanager_interface.h b/src/dring/callmanager_interface.h
index 5ddbc669e7..d8e1e71880 100644
--- a/src/dring/callmanager_interface.h
+++ b/src/dring/callmanager_interface.h
@@ -75,7 +75,7 @@ void stopSmartInfo();
/* File Playback methods */
bool startRecordedFilePlayback(const std::string& filepath);
-void stopRecordedFilePlayback(const std::string& filepath);
+void stopRecordedFilePlayback();
/* General audio methods */
bool toggleRecording(const std::string& callID);
diff --git a/src/manager.cpp b/src/manager.cpp
index f74a26dd38..b4f30d7a5f 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2415,11 +2415,9 @@ Manager::recordingPlaybackSeek(const double value)
}
void
-Manager::stopRecordedFilePlayback(const std::string& filepath)
+Manager::stopRecordedFilePlayback()
{
- // TODO: argument is uneeded (API change)
-
- RING_DBG("Stop recorded file playback %s", filepath.c_str());
+ RING_DBG("Stop recorded file playback");
checkAudio();
pimpl_->toneCtrl_.stopAudioFile();
diff --git a/src/manager.h b/src/manager.h
index f28a641ea9..2aa19f6245 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -593,16 +593,15 @@ class Manager {
/**
* Start playback fo a recorded file if and only if audio layer is not already started.
* @param File path of the file to play
- */
+ */
bool startRecordedFilePlayback(const std::string&);
void recordingPlaybackSeek(const double value);
/**
* Stop playback of recorded file
- * @param File of the file to stop
*/
- void stopRecordedFilePlayback(const std::string&);
+ void stopRecordedFilePlayback();
/**
* Set the maximum number of days to keep in the history
--
GitLab