diff options
| author | Max Kellermann <max@duempel.org> | 2014-10-24 20:25:24 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-25 01:24:45 +0200 |
| commit | de7e4f0db79f5250aac307f26bdbf228d7fc2fac (patch) | |
| tree | 94adcacd0b6218603709dbc56020aae67dd94193 | |
| parent | a1cb1d78bd2b65ee365f6c7e5fa43c52aecc35c1 (diff) | |
| download | mpd-de7e4f0db79f5250aac307f26bdbf228d7fc2fac.tar.gz mpd-de7e4f0db79f5250aac307f26bdbf228d7fc2fac.tar.xz mpd-de7e4f0db79f5250aac307f26bdbf228d7fc2fac.zip | |
decoder/wavpack: don't use GLib
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/decoder/plugins/WavpackDecoderPlugin.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index eb3feb7e2..0e121e55e 100644 --- a/configure.ac +++ b/configure.ac @@ -629,8 +629,6 @@ AC_ARG_ENABLE(wavpack, AS_HELP_STRING([--enable-wavpack], [enable WavPack support]),, enable_wavpack=auto) -MPD_DEPENDS([enable_wavpack], [enable_glib], - [Cannot use --enable-wavpack with --disable-glib]) AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index 67859bbd2..0b41d052e 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -28,10 +28,10 @@ #include "util/Error.hxx" #include "util/Domain.hxx" #include "util/Macros.hxx" +#include "util/Alloc.hxx" #include "Log.hxx" #include <wavpack/wavpack.h> -#include <glib.h> #include <assert.h> #include <stdio.h> @@ -484,10 +484,10 @@ wavpack_open_wvc(Decoder &decoder, const char *uri) if (uri == nullptr) return nullptr; - char *wvc_url = g_strconcat(uri, "c", nullptr); + char *wvc_url = xstrcatdup(uri, "c"); InputStream *is_wvc = decoder_open_uri(decoder, uri, IgnoreError()); - g_free(wvc_url); + free(wvc_url); if (is_wvc == nullptr) return nullptr; |