aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:41:05 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:41:05 +0200
commit15c9352bb632277fc6e787114ae5af60e6dc8597 (patch)
tree2c7d8232bfc34dab98ddc423a54b92fd62f2d8ac /src
parent1c03c721eae87077675ccafece4cf4b9fef0a1ac (diff)
downloadmpd-15c9352bb632277fc6e787114ae5af60e6dc8597.tar.gz
mpd-15c9352bb632277fc6e787114ae5af60e6dc8597.tar.xz
mpd-15c9352bb632277fc6e787114ae5af60e6dc8597.zip
moved enum decoder_command to decoder_api.h
The decoder plugins need this type, so export it in the public API. This allows is to remove "decode.h" from "decoder_api.h", uncluttering the API namespace some more.
Diffstat (limited to 'src')
-rw-r--r--src/decode.h8
-rw-r--r--src/decoder_api.h9
2 files changed, 9 insertions, 8 deletions
diff --git a/src/decode.h b/src/decode.h
index 9922cd81e..a1ed04157 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -19,6 +19,7 @@
#ifndef DECODE_H
#define DECODE_H
+#include "decoder_api.h"
#include "song.h"
#include "audio_format.h"
@@ -33,13 +34,6 @@ enum decoder_state {
DECODE_STATE_DECODE
};
-enum decoder_command {
- DECODE_COMMAND_NONE = 0,
- DECODE_COMMAND_START,
- DECODE_COMMAND_STOP,
- DECODE_COMMAND_SEEK
-};
-
#define DECODE_ERROR_NOERROR 0
#define DECODE_ERROR_UNKTYPE 10
#define DECODE_ERROR_FILE 20
diff --git a/src/decoder_api.h b/src/decoder_api.h
index 9c998f0a8..7428b3aab 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -30,7 +30,6 @@
#include "replayGain.h"
#include "tag.h"
#include "playerData.h"
-#include "decode.h"
/* valid values for streamTypes in the InputPlugin struct: */
@@ -38,6 +37,14 @@
#define INPUT_PLUGIN_STREAM_URL 0x02
+enum decoder_command {
+ DECODE_COMMAND_NONE = 0,
+ DECODE_COMMAND_START,
+ DECODE_COMMAND_STOP,
+ DECODE_COMMAND_SEEK
+};
+
+
struct decoder;