aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/FLACCommon.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-10-02 19:27:30 +0200
committerMax Kellermann <max@duempel.org>2012-10-02 19:59:49 +0200
commitebd90dbb1a265d1a1c38252891cfe862a0d8a9b9 (patch)
tree876c92a56ebde52f489af9732957aaf70ad629c4 /src/decoder/FLACCommon.hxx
parentc9e700f07928b4a7dd34b8fdd2a00c226fd9b0b4 (diff)
downloadmpd-ebd90dbb1a265d1a1c38252891cfe862a0d8a9b9.tar.gz
mpd-ebd90dbb1a265d1a1c38252891cfe862a0d8a9b9.tar.xz
mpd-ebd90dbb1a265d1a1c38252891cfe862a0d8a9b9.zip
decoder/flac: move callbacks to class FLACInput
Diffstat (limited to '')
-rw-r--r--src/decoder/FLACCommon.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/decoder/FLACCommon.hxx b/src/decoder/FLACCommon.hxx
index 501c58f62..e9b45976d 100644
--- a/src/decoder/FLACCommon.hxx
+++ b/src/decoder/FLACCommon.hxx
@@ -24,6 +24,8 @@
#ifndef MPD_FLAC_COMMON_HXX
#define MPD_FLAC_COMMON_HXX
+#include "FLACInput.hxx"
+
extern "C" {
#include "decoder_api.h"
#include "pcm_buffer.h"
@@ -35,7 +37,7 @@ extern "C" {
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "flac"
-struct flac_data {
+struct flac_data : public FLACInput {
struct pcm_buffer buffer;
/**
@@ -91,9 +93,6 @@ struct flac_data {
void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
struct flac_data *data);
-void flac_error_common_cb(FLAC__StreamDecoderErrorStatus status,
- struct flac_data *data);
-
FLAC__StreamDecoderWriteStatus
flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
const FLAC__int32 *const buf[],