Commit dff8c645 authored by Max Kellermann's avatar Max Kellermann

renamed decode.c to decoder_thread.c

It should be obvious in which thread or context a function is being executed at runtime. The code which was left in decode.c is for the decoder thread itself; give the file a better name.
parent 4255bba0
...@@ -41,6 +41,7 @@ mpd_headers = \ ...@@ -41,6 +41,7 @@ mpd_headers = \
crossfade.h \ crossfade.h \
dbUtils.h \ dbUtils.h \
decode.h \ decode.h \
decoder_thread.h \
decoder_api.h \ decoder_api.h \
decoder_internal.h \ decoder_internal.h \
directory.h \ directory.h \
...@@ -106,7 +107,7 @@ mpd_SOURCES = \ ...@@ -106,7 +107,7 @@ mpd_SOURCES = \
conf.c \ conf.c \
crossfade.c \ crossfade.c \
dbUtils.c \ dbUtils.c \
decode.c \ decoder_thread.c \
decoder_control.c \ decoder_control.c \
decoder_api.c \ decoder_api.c \
directory.c \ directory.c \
......
...@@ -55,8 +55,6 @@ struct decoder_control { ...@@ -55,8 +55,6 @@ struct decoder_control {
extern struct decoder_control dc; extern struct decoder_control dc;
void decoderInit(void);
static inline int decoder_is_idle(void) static inline int decoder_is_idle(void)
{ {
return dc.state == DECODE_STATE_STOP && return dc.state == DECODE_STATE_STOP &&
......
/* the Music Player Daemon (MPD) /* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* Copyright (C) 2008 Max Kellermann <max@duempel.org>
* This project's homepage is: http://www.musicpd.org * This project's homepage is: http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "decoder_thread.h"
#include "decode.h" #include "decode.h"
#include "decoder_internal.h" #include "decoder_internal.h"
#include "player.h" #include "player.h"
......
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* Copyright (C) 2008 Max Kellermann <max@duempel.org>
* 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 DECODER_THREAD_H
#define DECODER_THREAD_H
void decoderInit(void);
#endif
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "conf.h" #include "conf.h"
#include "path.h" #include "path.h"
#include "playerData.h" #include "playerData.h"
#include "decode.h" #include "decoder_thread.h"
#include "player.h" #include "player.h"
#include "stats.h" #include "stats.h"
#include "sig_handlers.h" #include "sig_handlers.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment