Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
38a33131
Commit
38a33131
authored
Mar 25, 2008
by
Emmanuel Milou
Browse files
Remove libboost-dev dependency!!
parent
817e01b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
38a33131
...
...
@@ -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],
...
...
src/audio/audiolayer.h
View file @
38a33131
...
...
@@ -24,7 +24,6 @@
#define _AUDIO_LAYER_H
#include
<cc++/thread.h>
// for ost::Mutex
#include
<boost/tokenizer.hpp>
#include
"../global.h"
#include
"audiodevice.h"
...
...
src/managerimpl.cpp
View file @
38a33131
...
...
@@ -35,8 +35,6 @@
#include
<ccrtp/rtp.h>
// why do I need this here?
#include
<cc++/file.h>
#include
<boost/tokenizer.hpp>
#include
"manager.h"
#include
"account.h"
#include
"audio/audiolayer.h"
...
...
@@ -1118,19 +1116,21 @@ ManagerImpl::initAudioCodec (void)
}
}
std
::
vector
<
std
::
string
>
std
::
vector
<
std
::
string
>
ManagerImpl
::
retrieveActiveCodecs
()
{
std
::
vector
<
std
::
string
>
order
;
std
::
string
list
;
std
::
vector
<
std
::
string
>
order
;
std
::
string
temp
;
std
::
string
s
=
getConfigString
(
AUDIO
,
"ActiveCodecs"
);
typedef
boost
::
tokenizer
<
boost
::
char_separator
<
char
>
>
tokenizer
;
boost
::
char_separator
<
char
>
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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment