diff options
| -rw-r--r-- | src/decoder_api.h | 8 | ||||
| -rw-r--r-- | src/decoder_command.h | 29 | ||||
| -rw-r--r-- | src/decoder_control.h | 3 | ||||
| -rw-r--r-- | src/decoder_thread.c | 3 | ||||
| -rw-r--r-- | src/player_thread.c | 1 |
5 files changed, 35 insertions, 9 deletions
diff --git a/src/decoder_api.h b/src/decoder_api.h index d0a0f6df5..caa61dcff 100644 --- a/src/decoder_api.h +++ b/src/decoder_api.h @@ -26,6 +26,7 @@ * */ +#include "decoder_command.h" #include "decoder_plugin.h" #include "input_stream.h" #include "replay_gain.h" @@ -34,13 +35,6 @@ #include <stdbool.h> -enum decoder_command { - DECODE_COMMAND_NONE = 0, - DECODE_COMMAND_START, - DECODE_COMMAND_STOP, - DECODE_COMMAND_SEEK -}; - /** * Notify the player thread that it has finished initialization and diff --git a/src/decoder_command.h b/src/decoder_command.h new file mode 100644 index 000000000..654471f86 --- /dev/null +++ b/src/decoder_command.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef MPD_DECODER_COMMAND_H +#define MPD_DECODER_COMMAND_H + +enum decoder_command { + DECODE_COMMAND_NONE = 0, + DECODE_COMMAND_START, + DECODE_COMMAND_STOP, + DECODE_COMMAND_SEEK +}; + +#endif diff --git a/src/decoder_control.h b/src/decoder_control.h index 542cfe78a..d1d0625e1 100644 --- a/src/decoder_control.h +++ b/src/decoder_control.h @@ -20,8 +20,7 @@ #ifndef MPD_DECODER_CONTROL_H #define MPD_DECODER_CONTROL_H -#include "decoder_api.h" - +#include "decoder_command.h" #include "audio_format.h" #include "notify.h" diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 07eea2f65..5aa13efc0 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -21,9 +21,12 @@ #include "decoder_control.h" #include "decoder_internal.h" #include "decoder_list.h" +#include "decoder_plugin.h" +#include "input_stream.h" #include "player_control.h" #include "pipe.h" #include "song.h" +#include "tag.h" #include "mapper.h" #include "path.h" #include "log.h" diff --git a/src/player_thread.c b/src/player_thread.c index e16a46d5d..06d44c7b4 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -26,6 +26,7 @@ #include "event_pipe.h" #include "crossfade.h" #include "song.h" +#include "tag.h" #include "pipe.h" #include "idle.h" #include "main.h" |