decoder_api: moved struct decoder_plugin to decoder_plugin.h

The decoder_plugin struct is used by both the MPD core and the decoder
plugin implementations.  Move it to a shared header file, to minimize
header dependencies.

1 files changed, 1 insertions, 57 deletions

diff --git a/src/decoder_api.h b/src/decoder_api.h
index 6e3332d52..d0a0f6df5 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -26,6 +26,7 @@
  *
  */
 
+#include "decoder_plugin.h"
 #include "input_stream.h"
 #include "replay_gain.h"
 #include "tag.h"
@@ -41,63 +42,6 @@ enum decoder_command {
 };
 
 
-struct decoder;
-
-struct decoder_plugin {
-	const char *name;
-
-	/**
-	 * optional, set this to NULL if the InputPlugin doesn't
-	 * have/need one this must return < 0 if there is an error and
-	 * >= 0 otherwise
-	 */
-	bool (*init)(void);
-
-	/**
-	 * optional, set this to NULL if the InputPlugin doesn't have/need one
-	 */
-	void (*finish)(void);
-
-	/**
-	 * this will be used to decode InputStreams, and is
-	 * recommended for files and networked (HTTP) connections.
-	 *
-	 * @return false if the plugin cannot decode the stream, and
-	 * true if it was able to do so (even if an error occured
-	 * during playback)
-	 */
-	void (*stream_decode)(struct decoder *, struct input_stream *);
-
-	/**
-	 * 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)
-	 *
-	 * @return false if the plugin cannot decode the file, and
-	 * true if it was able to do so (even if an error occured
-	 * during playback)
-	 */
-	void (*file_decode)(struct decoder *, const char *path);
-
-	/**
-	 * file should be the full path!  Returns NULL if a tag cannot
-	 * be found or read
-	 */
-	struct tag *(*tag_dup)(const char *file);
-
-	/* last element in these arrays must always be a NULL: */
-	const char *const*suffixes;
-	const char *const*mime_types;
-};
-
-
-/**
- * Opaque handle which the decoder plugin passes to the functions in
- * this header.
- */
-struct decoder;
-
-
 /**
  * Notify the player thread that it has finished initialization and
  * that it has read the song's meta data.