diff --git a/configure.ac b/configure.ac index 335e09fa0..c81a9ab44 100644 --- a/configure.ac +++ b/configure.ac @@ -188,9 +188,6 @@ PKG_CHECK_MODULES(libdbuscpp, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION}) SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libdbuscpp_CFLAGS" SFLPHONE_LIBS="$SFLPHONE_LIBS $libdbuscpp_LIBS" -# check for libboost (doesn't use pkg-config) -AC_CHECK_HEADER(boost/tokenizer.hpp, , AC_MSG_ERROR("Unable to find the libboost tokenizer headers; you may need to install the libboost-dev package" ) ) - # check for libgsm1 (doesn't use pkg-config) dnl Check for libgsm AC_ARG_WITH([gsm], diff --git a/src/audio/audiolayer.h b/src/audio/audiolayer.h index 471e85e2b..bcb54c88b 100644 --- a/src/audio/audiolayer.h +++ b/src/audio/audiolayer.h @@ -24,7 +24,6 @@ #define _AUDIO_LAYER_H #include // for ost::Mutex -#include #include "../global.h" #include "audiodevice.h" diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp index 9d0c97d45..bff84f1af 100644 --- a/src/managerimpl.cpp +++ b/src/managerimpl.cpp @@ -35,8 +35,6 @@ #include // why do I need this here? #include -#include - #include "manager.h" #include "account.h" #include "audio/audiolayer.h" @@ -1118,19 +1116,21 @@ ManagerImpl::initAudioCodec (void) } } - std::vector +std::vector ManagerImpl::retrieveActiveCodecs() { - std::vector order; - std::string list; + std::vector order; + std::string temp; std::string s = getConfigString(AUDIO, "ActiveCodecs"); - typedef boost::tokenizer > tokenizer; - boost::char_separator slash("/"); - tokenizer tokens(s, slash); - for(tokenizer::iterator tok_iter = tokens.begin(); tok_iter!= tokens.end(); ++tok_iter) + + while (s.find("/", 0) != std::string::npos) { - order.push_back(*tok_iter); + size_t pos = s.find("/", 0); + temp = s.substr(0, pos); + s.erase(0, pos + 1); + order.push_back(temp); } + return order; }