oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/wavpack: don't use GLib

Browse Source
This commit is contained in:
Max Kellermann 2014-10-24 20:25:24 +02:00
parent a1cb1d78bd
commit de7e4f0db7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -629,8 +629,6 @@ AC_ARG_ENABLE(wavpack,
AS_HELP_STRING([--enable-wavpack], AS_HELP_STRING([--enable-wavpack],
[enable WavPack support]),, [enable WavPack support]),,
enable_wavpack=auto) enable_wavpack=auto)
MPD_DEPENDS([enable_wavpack], [enable_glib],
[Cannot use --enable-wavpack with --disable-glib])
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror], AS_HELP_STRING([--enable-werror],

6
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@ -28,10 +28,10 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/Macros.hxx" #include "util/Macros.hxx"
#include "util/Alloc.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
@ -484,10 +484,10 @@ wavpack_open_wvc(Decoder &decoder, const char *uri)
if (uri == nullptr) if (uri == nullptr)
return 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()); InputStream *is_wvc = decoder_open_uri(decoder, uri, IgnoreError());
g_free(wvc_url); free(wvc_url);
if (is_wvc == nullptr) if (is_wvc == nullptr)
return nullptr; return nullptr;