diff --git a/daemon/bin/dbus/configurationmanager-introspec.xml b/daemon/bin/dbus/configurationmanager-introspec.xml index ad56b08290106c565c8549f4f623008dbf0c92a0..4a7e65fc1fa2f70e64c21dfe7c6349b0c770ffcc 100644 --- a/daemon/bin/dbus/configurationmanager-introspec.xml +++ b/daemon/bin/dbus/configurationmanager-introspec.xml @@ -464,16 +464,6 @@ </arg> </method> - <method name="getRingtoneList" tp:name-for-bindings="getRingtoneList"> - <tp:added version="1.1.1"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <tp:docstring> - Get a map [Path,Filename] of available ringtone. Note, set the ringtone with the complete path - </tp:docstring> - <arg type="a{ss}" name="list" direction="out"> - </arg> - </method> - <!-- General Settings Panel --> <method name="getNoiseSuppressState" tp:name-for-bindings="getNoiseSuppressState"> diff --git a/daemon/bin/dbus/dbusconfigurationmanager.cpp b/daemon/bin/dbus/dbusconfigurationmanager.cpp index d2830b2156c1072ce23c7094f184fd956ae9f9f7..614c56a3b0b04a21a49f2b382a698fa6f2a89cec 100644 --- a/daemon/bin/dbus/dbusconfigurationmanager.cpp +++ b/daemon/bin/dbus/dbusconfigurationmanager.cpp @@ -222,11 +222,6 @@ void DBusConfigurationManager::mutePlayback(const bool& mute) ring_config_mute_playback(mute); } -std::map<std::string, std::string> DBusConfigurationManager::getRingtoneList() -{ - return ring_config_get_ringtone_list(); -} - std::string DBusConfigurationManager::getAudioManager() { return ring_config_get_audio_manager(); diff --git a/daemon/src/client/configurationmanager.cpp b/daemon/src/client/configurationmanager.cpp index 296209d1acabcbe994d3aae0d4a388902c1426fa..c3fb0f46d0aa3a46c5a2dd18f8a10a449ee2c744 100644 --- a/daemon/src/client/configurationmanager.cpp +++ b/daemon/src/client/configurationmanager.cpp @@ -368,35 +368,6 @@ void ConfigurationManager::setAgcState(bool enabled) Manager::instance().setAGCState(enabled); } -std::map<std::string, std::string> ConfigurationManager::getRingtoneList() -{ - std::map<std::string, std::string> ringToneList; - - std::string r_path(fileutils::get_ringtone_dir()); - struct dirent **namelist; - int n = scandir(r_path.c_str(), &namelist, 0, alphasort); - if (n == -1) { - RING_ERR("%s", strerror(errno)); - return ringToneList; - } - - while (n--) { - if (strcmp(namelist[n]->d_name, ".") and strcmp(namelist[n]->d_name, "..")) { - std::string file(namelist[n]->d_name); - - if (file.find(".wav") != std::string::npos) - file.replace(file.find(".wav"), 4, ""); - else - file.replace(file.size() - 3, 3, ""); - if (file[0] <= 0x7A and file[0] >= 0x61) file[0] = file[0] - 32; - ringToneList[r_path + namelist[n]->d_name] = file; - } - free(namelist[n]); - } - free(namelist); - return ringToneList; -} - int32_t ConfigurationManager::isIax2Enabled() { return HAVE_IAX; diff --git a/daemon/src/client/configurationmanager.h b/daemon/src/client/configurationmanager.h index 1d384603f5ab1ed7c6cbbbe503deccc341528a84..f979c2c6aed2664aad1a9123c1a1f83c893c1b80 100644 --- a/daemon/src/client/configurationmanager.h +++ b/daemon/src/client/configurationmanager.h @@ -98,8 +98,6 @@ class ConfigurationManager bool isPlaybackMuted(); void mutePlayback(bool mute); - std::map<std::string, std::string> getRingtoneList(); - std::string getAudioManager(); bool setAudioManager(const std::string& api); diff --git a/daemon/src/dring/dring.h b/daemon/src/dring/dring.h index 6579b55279c3216f4bb4618b186c8a94a33ffff6..dd5081df3d70201ea906f7ba6941222caa1d1ad8 100644 --- a/daemon/src/dring/dring.h +++ b/daemon/src/dring/dring.h @@ -230,7 +230,6 @@ bool ring_config_is_capture_muted(void); void ring_config_mute_capture(bool mute); bool ring_config_is_playback_muted(void); void ring_config_mute_playback(int mute); -std::map<std::string, std::string> ring_config_get_ringtone_list(void); std::string ring_config_get_audio_manager(void); bool ring_config_set_audio_manager(const std::string& api); std::vector<std::string> ring_config_get_supported_audio_managers(void); diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp index 196820dbd41fd59f10fcc03b6afc86885546d5f8..1fb3bd43b6ee14d5bd67762b193f5f313d48adab 100644 --- a/daemon/src/fileutils.cpp +++ b/daemon/src/fileutils.cpp @@ -97,13 +97,6 @@ const char *get_program_dir() return program_dir; } -// FIXME: This should use our real DATADIR -std::string -get_ringtone_dir() -{ - return std::string(get_program_dir()) + "/../../share/ring/ringtones/"; -} - /* Lock a file region */ static int lockReg(int fd, int cmd, int type, int whence, int start, off_t len) diff --git a/daemon/src/fileutils.h b/daemon/src/fileutils.h index c48653c18c8e7b85803461a06e82769bc7a1b897..4ea624413cebbdb0649522c6be075953b2a9b894 100644 --- a/daemon/src/fileutils.h +++ b/daemon/src/fileutils.h @@ -55,7 +55,6 @@ namespace ring { namespace fileutils { bool check_dir(const char *path); void set_program_dir(char *program_path); const char *get_program_dir(); - std::string get_ringtone_dir(); std::string expand_path(const std::string &path); bool isDirectoryWritable(const std::string &directory); diff --git a/daemon/src/ring_api.cpp b/daemon/src/ring_api.cpp index b1083dd363ee871443d951c36b72577e9a84e392..a58f2bfacdae37f276ab5a6f8477f2f12e5084b5 100644 --- a/daemon/src/ring_api.cpp +++ b/daemon/src/ring_api.cpp @@ -520,11 +520,6 @@ void ring_config_mute_playback(int mute) getConfigurationManager()->mutePlayback(mute); } -std::map<std::string, std::string> ring_config_get_ringtone_list(void) -{ - return getConfigurationManager()->getRingtoneList(); -} - std::string ring_config_get_audio_manager(void) { return getConfigurationManager()->getAudioManager(); diff --git a/gnome/src/dbus/configurationmanager-introspec.xml b/gnome/src/dbus/configurationmanager-introspec.xml index 019edd3b43ceb63eec0e3053b78ab8a7a9b0b9aa..72dda85e27744ff6339b20cc2ae0b6156b0becf3 100644 --- a/gnome/src/dbus/configurationmanager-introspec.xml +++ b/gnome/src/dbus/configurationmanager-introspec.xml @@ -445,16 +445,6 @@ </arg> </method> - <method name="getRingtoneList" tp:name-for-bindings="getRingtoneList"> - <tp:added version="1.1.1"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <tp:docstring> - Get a map [Path,Filename] of available ringtone. Note, set the ringtone with the complete path - </tp:docstring> - <arg type="a{ss}" name="list" direction="out"> - </arg> - </method> - <!-- General Settings Panel --> <method name="getNoiseSuppressState" tp:name-for-bindings="getNoiseSuppressState">