aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am9
-rw-r--r--src/DecoderAPI.cxx6
-rw-r--r--src/DecoderControl.cxx5
-rw-r--r--src/DecoderInternal.cxx9
-rw-r--r--src/Main.cxx2
-rw-r--r--src/MusicBuffer.cxx (renamed from src/buffer.c)6
-rw-r--r--src/MusicBuffer.hxx (renamed from src/buffer.h)6
-rw-r--r--src/MusicChunk.cxx (renamed from src/chunk.c)7
-rw-r--r--src/MusicChunk.hxx (renamed from src/chunk.h)7
-rw-r--r--src/MusicPipe.cxx (renamed from src/pipe.c)8
-rw-r--r--src/MusicPipe.hxx (renamed from src/pipe.h)2
-rw-r--r--src/OutputAll.cxx10
-rw-r--r--src/OutputThread.cxx5
-rw-r--r--src/PlayerThread.cxx6
-rw-r--r--src/crossfade.c2
15 files changed, 39 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ec3ec12..ea9a53be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,9 +110,6 @@ mpd_headers = \
src/daemon.h \
src/AudioCompress/config.h \
src/AudioCompress/compress.h \
- src/buffer.h \
- src/pipe.h \
- src/chunk.h \
src/path.h \
src/open.h \
src/output/httpd_client.h \
@@ -260,9 +257,9 @@ src_mpd_SOURCES = \
src/event_pipe.c \
src/daemon.c \
src/AudioCompress/compress.c \
- src/buffer.c \
- src/pipe.c \
- src/chunk.c \
+ src/MusicBuffer.cxx src/MusicBuffer.hxx \
+ src/MusicPipe.cxx src/MusicPipe.hxx \
+ src/MusicChunk.cxx src/MusicChunk.hxx \
src/path.c \
src/Mapper.cxx src/Mapper.hxx \
src/page.c \
diff --git a/src/DecoderAPI.cxx b/src/DecoderAPI.cxx
index 738e7184..015d64d2 100644
--- a/src/DecoderAPI.cxx
+++ b/src/DecoderAPI.cxx
@@ -22,12 +22,12 @@
extern "C" {
#include "decoder_api.h"
#include "audio_config.h"
-#include "buffer.h"
-#include "pipe.h"
-#include "chunk.h"
#include "replay_gain_config.h"
}
+#include "MusicChunk.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicPipe.hxx"
#include "DecoderControl.hxx"
#include "DecoderInternal.hxx"
#include "song.h"
diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx
index bd075ed7..58d10948 100644
--- a/src/DecoderControl.cxx
+++ b/src/DecoderControl.cxx
@@ -19,12 +19,9 @@
#include "config.h"
#include "DecoderControl.hxx"
+#include "MusicPipe.hxx"
#include "song.h"
-extern "C" {
-#include "pipe.h"
-}
-
#include <assert.h>
#undef G_LOG_DOMAIN
diff --git a/src/DecoderInternal.cxx b/src/DecoderInternal.cxx
index ab496dbd..00749b89 100644
--- a/src/DecoderInternal.cxx
+++ b/src/DecoderInternal.cxx
@@ -20,14 +20,11 @@
#include "config.h"
#include "DecoderInternal.hxx"
#include "DecoderControl.hxx"
-
-extern "C" {
-#include "pipe.h"
-#include "buffer.h"
-}
+#include "MusicPipe.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
#include "input_stream.h"
-#include "chunk.h"
#include <assert.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index 1974a610..2da1ca69 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -22,7 +22,7 @@
#include "CommandLine.hxx"
#include "PlaylistFile.hxx"
#include "UpdateGlue.hxx"
-#include "chunk.h"
+#include "MusicChunk.hxx"
#include "StateFile.hxx"
#include "PlayerThread.hxx"
#include "Mapper.hxx"
diff --git a/src/buffer.c b/src/MusicBuffer.cxx
index 559f39a9..f1547f1f 100644
--- a/src/buffer.c
+++ b/src/MusicBuffer.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,8 @@
*/
#include "config.h"
-#include "buffer.h"
-#include "chunk.h"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
#include "poison.h"
#include <glib.h>
diff --git a/src/buffer.h b/src/MusicBuffer.hxx
index f860231e..cc03dfcb 100644
--- a/src/buffer.h
+++ b/src/MusicBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_MUSIC_BUFFER_H
-#define MPD_MUSIC_BUFFER_H
+#ifndef MPD_MUSIC_BUFFER_HXX
+#define MPD_MUSIC_BUFFER_HXX
/**
* An allocator for #music_chunk objects.
diff --git a/src/chunk.c b/src/MusicChunk.cxx
index 1eb96f4b..24f21f66 100644
--- a/src/chunk.c
+++ b/src/MusicChunk.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,12 @@
*/
#include "config.h"
-#include "chunk.h"
+#include "MusicChunk.hxx"
#include "audio_format.h"
+
+extern "C" {
#include "tag.h"
+}
#include <assert.h>
diff --git a/src/chunk.h b/src/MusicChunk.hxx
index a06a203e..0ed72006 100644
--- a/src/chunk.h
+++ b/src/MusicChunk.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_CHUNK_H
-#define MPD_CHUNK_H
+#ifndef MPD_MUSIC_CHUNK_HXX
+#define MPD_MUSIC_CHUNK_HXX
#include "replay_gain_info.h"
@@ -26,7 +26,6 @@
#include "audio_format.h"
#endif
-#include <stdbool.h>
#include <stdint.h>
#include <stddef.h>
diff --git a/src/pipe.c b/src/MusicPipe.cxx
index d8131432..d9fc07ec 100644
--- a/src/pipe.c
+++ b/src/MusicPipe.cxx
@@ -18,9 +18,9 @@
*/
#include "config.h"
-#include "pipe.h"
-#include "buffer.h"
-#include "chunk.h"
+#include "MusicPipe.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
#include <glib.h>
@@ -137,7 +137,7 @@ music_pipe_shift(struct music_pipe *mp)
#ifndef NDEBUG
/* poison the "next" reference */
- chunk->next = (void*)0x01010101;
+ chunk->next = (struct music_chunk *)(void *)0x01010101;
if (mp->size == 0)
audio_format_clear(&mp->audio_format);
diff --git a/src/pipe.h b/src/MusicPipe.hxx
index 6b5bbf0c..99561ca6 100644
--- a/src/pipe.h
+++ b/src/MusicPipe.hxx
@@ -22,8 +22,6 @@
#include "gcc.h"
-#include <stdbool.h>
-
#ifndef NDEBUG
struct audio_format;
#endif
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index ec716a41..811d93a1 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -26,21 +26,17 @@ extern "C" {
#include "OutputControl.hxx"
#include "OutputError.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicPipe.hxx"
+#include "MusicChunk.hxx"
#include "mpd_error.h"
extern "C" {
#include "player_control.h"
#include "conf.h"
-#include "chunk.h"
-#include "pipe.h"
-#include "buffer.h"
#include "notify.h"
}
-#ifndef NDEBUG
-#include "chunk.h"
-#endif
-
#include <assert.h>
#include <string.h>
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index 75394703..e88efd38 100644
--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -23,8 +23,6 @@
extern "C" {
#include "output_api.h"
#include "output_internal.h"
-#include "chunk.h"
-#include "pipe.h"
#include "player_control.h"
#include "pcm_mix.h"
#include "filter_plugin.h"
@@ -33,6 +31,9 @@ extern "C" {
#include "notify.h"
}
+#include "MusicPipe.hxx"
+#include "MusicChunk.hxx"
+
#include "mpd_error.h"
#include "gcc.h"
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index 9e5c6042..cb641bbf 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -21,6 +21,9 @@
#include "PlayerThread.hxx"
#include "DecoderThread.hxx"
#include "DecoderControl.hxx"
+#include "MusicPipe.hxx"
+#include "MusicBuffer.hxx"
+#include "MusicChunk.hxx"
#include "song.h"
#include "Main.hxx"
#include "mpd_error.h"
@@ -31,10 +34,7 @@ extern "C" {
#include "event_pipe.h"
#include "crossfade.h"
#include "tag.h"
-#include "pipe.h"
-#include "chunk.h"
#include "idle.h"
-#include "buffer.h"
}
#include <glib.h>
diff --git a/src/crossfade.c b/src/crossfade.c
index 46a0dff3..cf394331 100644
--- a/src/crossfade.c
+++ b/src/crossfade.c
@@ -19,7 +19,7 @@
#include "config.h"
#include "crossfade.h"
-#include "chunk.h"
+#include "MusicChunk.hxx"
#include "audio_format.h"
#include "tag.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 22:17:11 +0000