From 257bf30d14d4d71147eb107a1c68f7a6645d1df1 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Tue, 21 Feb 2017 10:39:24 -0500
Subject: [PATCH] manager: remove dead code
This patch removes all non-used or non-implemented members
of the Manager class.
This class is "fat" enough to get care.
Change-Id: I03d85385c4e3d822a3d3cb89050d77ec02e31443
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
---
src/manager.cpp | 1 -
src/manager.h | 35 -----------------------------------
2 files changed, 36 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
index 8eb3da644b..b2e533a6c2 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -247,7 +247,6 @@ Manager::Manager() :
#ifdef RING_VIDEO
, videoPreferences()
#endif
- , hasTriedToRegister_(false)
, toneCtrl_(preferences)
, currentCallMutex_(), dtmfKey_(), dtmfBuf_(0, AudioFormat::MONO())
, audioLayerMutex_()
diff --git a/src/manager.h b/src/manager.h
index 88f2491084..65afd43186 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -53,32 +53,19 @@
namespace ring {
-namespace Conf {
-class YamlParser;
-class YamlEmitter;
-}
-
namespace video {
class SinkClient;
}
class PluginManager;
-class AudioFile;
class DTMF;
class RingBufferPool;
class VideoManager;
-/** To send multiple string */
-typedef std::list<std::string> TokenList;
-
/** To store conference objects by conference ids */
typedef std::map<std::string, std::shared_ptr<Conference> > ConferenceMap;
typedef std::set<std::string> CallIDSet;
-static const char * const default_conf = "conf";
-
-typedef std::set<std::string> CallIDSet;
-
/** Manager (controller) of Ring daemon */
class Manager {
private:
@@ -334,11 +321,6 @@ class Manager {
*/
void saveConfig();
- /**
- * @return true if we tried to register once
- */
- bool hasTriedToRegister_;
-
/**
* Play a ringtone
*/
@@ -650,19 +632,6 @@ class Manager {
*/
int getHistoryLimit() const;
- /**
- * Configure the start-up option
- * @return int 1 if Ring should start in the system tray
- * 0 otherwise
- */
- int isStartHidden();
-
- /**
- * Configure the start-up option
- * At startup, Ring can be displayed or start hidden in the system tray
- */
- void startHidden();
-
/**
* Get the audio manager
* @return int The audio manager
@@ -787,10 +756,6 @@ class Manager {
bool parseConfiguration();
- // Set the ringtone or recorded call to be played
- void updateAudioFile(const std::string &file, int sampleRate);
-
-
/**
* Process remaining participant given a conference and the current call id.
* Mainly called when a participant is detached or hagned up
--
GitLab