From dec6b1612e953c6029d963ff55d2b4a669b60f43 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 13 Apr 2008 01:16:03 +0000 Subject: Stop passing our single DecoderControl object everywhere This at least makes the argument list to a lot of our plugin functions shorter and removes a good amount of line nois^W^Wcode, hopefully making things easier to read and follow. git-svn-id: https://svn.musicpd.org/mpd/trunk@7353 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputPlugin.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/inputPlugin.h') diff --git a/src/inputPlugin.h b/src/inputPlugin.h index 953bab153..4b591ee53 100644 --- a/src/inputPlugin.h +++ b/src/inputPlugin.h @@ -21,6 +21,7 @@ #include "inputStream.h" #include "outputBuffer.h" +#include "playerData.h" /* valid values for streamTypes in the InputPlugin struct: */ #define INPUT_PLUGIN_STREAM_FILE 0x01 @@ -41,16 +42,14 @@ typedef unsigned int (*InputPlugin_tryDecodeFunc) (InputStream *); * and networked (HTTP) connections. * * returns -1 on error, 0 on success */ -typedef int (*InputPlugin_streamDecodeFunc) (OutputBuffer *, DecoderControl *, - InputStream *); +typedef int (*InputPlugin_streamDecodeFunc) (OutputBuffer *, InputStream *); /* use this if and only if your InputPlugin can only be passed a filename or * handle as input, and will not allow callbacks to be set (like Ogg-Vorbis * and FLAC libraries allow) * * returns -1 on error, 0 on success */ -typedef int (*InputPlugin_fileDecodeFunc) (OutputBuffer *, DecoderControl *, - char *path); +typedef int (*InputPlugin_fileDecodeFunc) (OutputBuffer *, char *path); /* file should be the full path! Returns NULL if a tag cannot be found * or read */ -- cgit v1.2.3