aboutsummaryrefslogtreecommitdiffstats
path: root/src/pipe.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-02 16:55:43 +0100
committerMax Kellermann <max@duempel.org>2008-11-02 16:55:43 +0100
commit8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82 (patch)
tree1f54932ea014cf5ef97b2c298e2051bbd4fbb22e /src/pipe.h
parent30fca5e5a9c26bf73a24ae5710f8d9d21be49011 (diff)
downloadmpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.tar.gz
mpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.tar.xz
mpd-8b1f6ff3c8ed06ef469d29b4a691dc4776a3db82.zip
decoder: replaced music_pipe.audioFormat with dc.out_audio_format
.. and rename dc.audioFormat to dc.in_audio_format. The music pipe does not need to know the audio format, and its former "audioFormat" property indicated the format of the most recently added chunk, which might be confusing when you are reading the oldest chunks.
Diffstat (limited to '')
-rw-r--r--src/pipe.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pipe.h b/src/pipe.h
index a27629697..10a3501ec 100644
--- a/src/pipe.h
+++ b/src/pipe.h
@@ -19,14 +19,15 @@
#ifndef MPD_PIPE_H
#define MPD_PIPE_H
-#include "audio_format.h"
-
#include <stddef.h>
+#include <stdint.h>
#include <stdbool.h>
/* pick 1020 since its devisible for 8,16,24, and 32-bit audio */
#define CHUNK_SIZE 1020
+struct audio_format;
+
struct music_chunk {
uint16_t chunkSize;
uint16_t bitRate;
@@ -53,8 +54,6 @@ struct music_pipe {
the buffer becomes non-empty */
bool lazy;
- struct audio_format audioFormat;
-
struct notify *notify;
};
@@ -109,6 +108,7 @@ music_pipe_get_chunk(const unsigned i);
* @return the number of bytes actually written
*/
size_t music_pipe_append(const void *data, size_t datalen,
+ const struct audio_format *audio_format,
float data_time, uint16_t bitRate);
void music_pipe_skip(unsigned num);