aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-02 14:12:52 +0100
committerMax Kellermann <max@duempel.org>2008-11-02 14:12:52 +0100
commit767b4c95bdb468429232a96242bd73b8e92d8660 (patch)
tree9e0fbc9cbe930cb66910fe7ff22c97f64de5f552
parentb48ae8c26fafe3e2bf8767a2fb7aa1779fe8abc4 (diff)
downloadmpd-767b4c95bdb468429232a96242bd73b8e92d8660.tar.gz
mpd-767b4c95bdb468429232a96242bd73b8e92d8660.tar.xz
mpd-767b4c95bdb468429232a96242bd73b8e92d8660.zip
renamed outputBuffer.[ch] to pipe.[ch]
No CamelCase in the file name. The output_buffer struct is going to be renamed to music_pipe. There are so many buffer levels in MPD, and calling this one "output buffer" is wrong, because it's not the last buffer before the music reaches the output devices.
-rw-r--r--src/Makefile.am4
-rw-r--r--src/crossfade.h2
-rw-r--r--src/decoder_api.c2
-rw-r--r--src/decoder_thread.c2
-rw-r--r--src/main.c2
-rw-r--r--src/pipe.c (renamed from src/outputBuffer.c)2
-rw-r--r--src/pipe.h (renamed from src/outputBuffer.h)4
-rw-r--r--src/playerData.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 56651e36f..8debfb6a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,7 +45,7 @@ mpd_headers = \
normalize.h \
compress.h \
os_compat.h \
- outputBuffer.h \
+ pipe.h \
path.h \
mapper.h \
pcm_utils.h \
@@ -124,7 +124,7 @@ mpd_SOURCES = \
main_notify.c \
normalize.c \
compress.c \
- outputBuffer.c \
+ pipe.c \
path.c \
mapper.c \
pcm_utils.c \
diff --git a/src/crossfade.h b/src/crossfade.h
index a8b6e85ad..5ceb37b11 100644
--- a/src/crossfade.h
+++ b/src/crossfade.h
@@ -20,7 +20,7 @@
#ifndef MPD_CROSSFADE_H
#define MPD_CROSSFADE_H
-#include "outputBuffer.h"
+#include "pipe.h"
struct audio_format;
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 77f5b0215..1c9bd822a 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -25,7 +25,7 @@
#include "utils.h"
#include "normalize.h"
-#include "outputBuffer.h"
+#include "pipe.h"
#include "gcc.h"
#include <assert.h>
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index 659d43603..f45446dc2 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -21,7 +21,7 @@
#include "decoder_control.h"
#include "decoder_internal.h"
#include "player_control.h"
-#include "outputBuffer.h"
+#include "pipe.h"
#include "song.h"
#include "mapper.h"
#include "path.h"
diff --git a/src/main.c b/src/main.c
index 025570f84..5b50b135d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,7 @@
#include "path.h"
#include "mapper.h"
#include "playerData.h"
-#include "outputBuffer.h"
+#include "pipe.h"
#include "decoder_thread.h"
#include "decoder_control.h"
#include "player_control.h"
diff --git a/src/outputBuffer.c b/src/pipe.c
index 932ffd032..9b8683834 100644
--- a/src/outputBuffer.c
+++ b/src/pipe.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "outputBuffer.h"
+#include "pipe.h"
#include "notify.h"
#include "utils.h"
diff --git a/src/outputBuffer.h b/src/pipe.h
index 4769abc19..477b1e358 100644
--- a/src/outputBuffer.h
+++ b/src/pipe.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef MPD_OUTPUT_BUFFER_H
-#define MPD_OUTPUT_BUFFER_H
+#ifndef MPD_PIPE_H
+#define MPD_PIPE_H
#include "audio_format.h"
diff --git a/src/playerData.c b/src/playerData.c
index fd87843ab..2731e916b 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -17,7 +17,7 @@
*/
#include "playerData.h"
-#include "outputBuffer.h"
+#include "pipe.h"
#include "conf.h"
#include "log.h"