From 6a3f6c4ab5f1099cf626d0549b836cd7cf17e6d5 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 3 Jun 2013 15:00:02 -0400
Subject: [PATCH] manager: move join_string into Account.
Only account uses it.
---
daemon/src/account.cpp | 19 ++++++++++++++++++-
daemon/src/managerimpl.cpp | 7 -------
daemon/src/managerimpl.h | 7 -------
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/daemon/src/account.cpp b/daemon/src/account.cpp
index af507a52e6..6c859f213e 100644
--- a/daemon/src/account.cpp
+++ b/daemon/src/account.cpp
@@ -34,6 +34,8 @@
#endif
#include "account.h"
#include <algorithm>
+#include <iterator>
+
#ifdef SFL_VIDEO
#include "video/libav_utils.h"
#endif
@@ -195,6 +197,21 @@ void Account::setVideoCodecs(const vector<map<string, string> > &list)
#endif
}
+namespace {
+
+// Convert a list of payloads in a special format, readable by the server.
+// Required format: payloads separated by slashes.
+// @return std::string The serializable string
+
+std::string join_string(const std::vector<std::string> &v)
+{
+ std::ostringstream os;
+ std::copy(v.begin(), v.end(), std::ostream_iterator<std::string>(os, "/"));
+ return os.str();
+}
+}
+
+
void Account::setActiveAudioCodecs(const vector<string> &list)
{
// first clear the previously stored codecs
@@ -208,7 +225,7 @@ void Account::setActiveAudioCodecs(const vector<string> &list)
}
// update the codec string according to new codec selection
- audioCodecStr_ = ManagerImpl::join_string(list);
+ audioCodecStr_ = join_string(list);
}
string Account::mapStateNumberToString(RegistrationState state)
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index ec446e356c..8d950e03e0 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -1912,13 +1912,6 @@ std::vector<std::string> ManagerImpl::split_string(std::string s)
return list;
}
-std::string ManagerImpl::join_string(const std::vector<std::string> &v)
-{
- std::ostringstream os;
- std::copy(v.begin(), v.end(), std::ostream_iterator<std::string>(os, "/"));
- return os.str();
-}
-
std::string ManagerImpl::getCurrentAudioCodecName(const std::string& id)
{
std::string accountid = getAccountFromCall(id);
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index b65468ffa8..4cb02aacbf 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -577,13 +577,6 @@ class ManagerImpl {
*/
void setEchoCancelState(const std::string &state);
- /**
- * Convert a list of payload in a special format, readable by the server.
- * Required format: payloads separated with one slash.
- * @return std::string The serializabled string
- */
- static std::string join_string(const std::vector<std::string> &v);
-
static std::vector<std::string> split_string(std::string v);
/**
--
GitLab