aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-11-29 10:06:20 +0100
committerMax Kellermann <max@duempel.org>2013-11-29 11:00:57 +0100
commit1a002eb23dd2843f463ccad7b17cc0637a82566c (patch)
tree05d79aa168c740bc7b5164ad29fe919721b76644 /src
parent71bc15aca14db549eef54d39968f8ebe343d56bd (diff)
downloadmpd-1a002eb23dd2843f463ccad7b17cc0637a82566c.tar.gz
mpd-1a002eb23dd2843f463ccad7b17cc0637a82566c.tar.xz
mpd-1a002eb23dd2843f463ccad7b17cc0637a82566c.zip
PcmConvert: add pcm_convert_global_init()
Wrapper for pcm_resample_global_init(), just in case other PCM libraries need initialization, too.
Diffstat (limited to '')
-rw-r--r--src/Main.cxx4
-rw-r--r--src/pcm/PcmConvert.cxx6
-rw-r--r--src/pcm/PcmConvert.hxx3
3 files changed, 11 insertions, 2 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index dcf080d0d..9a70b0015 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -54,7 +54,7 @@
#include "ZeroconfGlue.hxx"
#include "DecoderList.hxx"
#include "AudioConfig.hxx"
-#include "pcm/PcmResample.hxx"
+#include "pcm/PcmConvert.hxx"
#include "Daemon.hxx"
#include "system/FatalError.hxx"
#include "util/Error.hxx"
@@ -428,7 +428,7 @@ int mpd_main(int argc, char *argv[])
archive_plugin_init_all();
#endif
- if (!pcm_resample_global_init(error)) {
+ if (!pcm_convert_global_init(error)) {
LogError(error);
return EXIT_FAILURE;
}
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 05ed92faf..f1e36ed4b 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -30,6 +30,12 @@
const Domain pcm_convert_domain("pcm_convert");
+bool
+pcm_convert_global_init(Error &error)
+{
+ return pcm_resample_global_init(error);
+}
+
PcmConvert::PcmConvert()
{
#ifndef NDEBUG
diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx
index 0672c2955..2db24f87b 100644
--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
@@ -110,4 +110,7 @@ private:
extern const Domain pcm_convert_domain;
+bool
+pcm_convert_global_init(Error &error);
+
#endif