From 56cdce6946d5c281ba278b19ec89204d6023c6fb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:44:19 +0200 Subject: renamed decode.h to decoder_control.h --- src/Makefile.am | 2 +- src/decode.h | 89 -------------------------------------------------- src/decoder_api.c | 2 +- src/decoder_control.c | 2 +- src/decoder_control.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/decoder_thread.c | 2 +- src/playerData.c | 2 +- src/player_thread.c | 2 +- 8 files changed, 96 insertions(+), 95 deletions(-) delete mode 100644 src/decode.h create mode 100644 src/decoder_control.h diff --git a/src/Makefile.am b/src/Makefile.am index ff4db3523..612a039f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,8 +40,8 @@ mpd_headers = \ conf.h \ crossfade.h \ dbUtils.h \ - decode.h \ decoder_thread.h \ + decoder_control.h \ decoder_api.h \ decoder_internal.h \ directory.h \ diff --git a/src/decode.h b/src/decode.h deleted file mode 100644 index 0b1fe389f..000000000 --- a/src/decode.h +++ /dev/null @@ -1,89 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * This project's homepage is: 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 DECODE_H -#define DECODE_H - -#include "decoder_api.h" -#include "song.h" - -#include "audio_format.h" -#include "notify.h" - -#define DECODE_TYPE_FILE 0 -#define DECODE_TYPE_URL 1 - -enum decoder_state { - DECODE_STATE_STOP = 0, - DECODE_STATE_START, - DECODE_STATE_DECODE -}; - -#define DECODE_ERROR_NOERROR 0 -#define DECODE_ERROR_UNKTYPE 10 -#define DECODE_ERROR_FILE 20 - -struct decoder_control { - Notify notify; - - volatile enum decoder_state state; - volatile enum decoder_command command; - volatile mpd_uint16 error; - volatile mpd_sint8 seekError; - volatile mpd_sint8 seekable; - volatile double seekWhere; - AudioFormat audioFormat; - Song *current_song; - Song *volatile next_song; - volatile float totalTime; -}; - -extern struct decoder_control dc; - -static inline int decoder_is_idle(void) -{ - return dc.state == DECODE_STATE_STOP && - dc.command != DECODE_COMMAND_START; -} - -static inline int decoder_is_starting(void) -{ - return dc.command == DECODE_COMMAND_START || - dc.state == DECODE_STATE_START; -} - -static inline Song *decoder_current_song(void) -{ - if (dc.state == DECODE_STATE_STOP || - dc.error != DECODE_ERROR_NOERROR) - return NULL; - - return dc.current_song; -} - -void dc_command_wait(Notify *notify); - -void dc_start(Notify *notify, Song *song); - -void dc_start_async(Song *song); - -void dc_stop(Notify *notify); - -int dc_seek(Notify *notify, double where); - -#endif diff --git a/src/decoder_api.c b/src/decoder_api.c index 4ce9ee980..016c27400 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -19,7 +19,7 @@ #include "decoder_internal.h" #include "decoder_list.h" -#include "decode.h" +#include "decoder_control.h" #include "player.h" #include "audio.h" diff --git a/src/decoder_control.c b/src/decoder_control.c index 7fc04de7d..49842b445 100644 --- a/src/decoder_control.c +++ b/src/decoder_control.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "decode.h" +#include "decoder_control.h" struct decoder_control dc; diff --git a/src/decoder_control.h b/src/decoder_control.h new file mode 100644 index 000000000..f492b6aba --- /dev/null +++ b/src/decoder_control.h @@ -0,0 +1,90 @@ +/* the Music Player Daemon (MPD) + * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) + * Copyright (C) 2008 Max Kellermann + * This project's homepage is: 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 DECODE_H +#define DECODE_H + +#include "decoder_api.h" +#include "song.h" + +#include "audio_format.h" +#include "notify.h" + +#define DECODE_TYPE_FILE 0 +#define DECODE_TYPE_URL 1 + +enum decoder_state { + DECODE_STATE_STOP = 0, + DECODE_STATE_START, + DECODE_STATE_DECODE +}; + +#define DECODE_ERROR_NOERROR 0 +#define DECODE_ERROR_UNKTYPE 10 +#define DECODE_ERROR_FILE 20 + +struct decoder_control { + Notify notify; + + volatile enum decoder_state state; + volatile enum decoder_command command; + volatile mpd_uint16 error; + volatile mpd_sint8 seekError; + volatile mpd_sint8 seekable; + volatile double seekWhere; + AudioFormat audioFormat; + Song *current_song; + Song *volatile next_song; + volatile float totalTime; +}; + +extern struct decoder_control dc; + +static inline int decoder_is_idle(void) +{ + return dc.state == DECODE_STATE_STOP && + dc.command != DECODE_COMMAND_START; +} + +static inline int decoder_is_starting(void) +{ + return dc.command == DECODE_COMMAND_START || + dc.state == DECODE_STATE_START; +} + +static inline Song *decoder_current_song(void) +{ + if (dc.state == DECODE_STATE_STOP || + dc.error != DECODE_ERROR_NOERROR) + return NULL; + + return dc.current_song; +} + +void dc_command_wait(Notify *notify); + +void dc_start(Notify *notify, Song *song); + +void dc_start_async(Song *song); + +void dc_stop(Notify *notify); + +int dc_seek(Notify *notify, double where); + +#endif diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 4104b585f..cb153b6e5 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -18,7 +18,7 @@ */ #include "decoder_thread.h" -#include "decode.h" +#include "decoder_control.h" #include "decoder_internal.h" #include "player.h" diff --git a/src/playerData.c b/src/playerData.c index 308fc4b59..019c8a906 100644 --- a/src/playerData.c +++ b/src/playerData.c @@ -17,8 +17,8 @@ */ #include "playerData.h" -#include "decode.h" #include "player.h" +#include "decoder_control.h" #include "outputBuffer.h" #include "conf.h" #include "log.h" diff --git a/src/player_thread.c b/src/player_thread.c index 9cccc1ab2..bb4746132 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -19,7 +19,7 @@ #include "player_thread.h" #include "player.h" #include "playerData.h" -#include "decode.h" +#include "decoder_control.h" #include "audio.h" #include "pcm_utils.h" #include "path.h" -- cgit v1.2.3