aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-02 14:15:47 +0100
committerMax Kellermann <max@duempel.org>2008-11-02 14:15:47 +0100
commit8964c69a643108a4b4828c99111517c0f6f8e3d0 (patch)
treef74d3a7af2f79393fe7471bcdc2737e3cd801bd3 /src/player_thread.c
parent767b4c95bdb468429232a96242bd73b8e92d8660 (diff)
downloadmpd-8964c69a643108a4b4828c99111517c0f6f8e3d0.tar.gz
mpd-8964c69a643108a4b4828c99111517c0f6f8e3d0.tar.xz
mpd-8964c69a643108a4b4828c99111517c0f6f8e3d0.zip
music_pipe: renamed struct output_buffer to struct music_pipe
.. and rename ob_chunk to struct music_chunk.
Diffstat (limited to '')
-rw-r--r--src/player_thread.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index 0c2407eac..7da0269c0 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -26,6 +26,7 @@
#include "main_notify.h"
#include "crossfade.h"
#include "song.h"
+#include "pipe.h"
enum xfade_state {
XFADE_DISABLED = -1,
@@ -205,8 +206,9 @@ static void processDecodeInput(struct player *player)
}
}
-static int playChunk(ob_chunk * chunk,
- const struct audio_format *format, double sizeToTime)
+static int
+playChunk(struct music_chunk *chunk, const struct audio_format *format,
+ double sizeToTime)
{
pc.elapsedTime = chunk->times;
pc.bitRate = chunk->bitRate;
@@ -355,7 +357,7 @@ static void do_play(void)
notify_wait(&pc.notify);
else if (!ob_is_empty() &&
(int)ob.begin != player.next_song_chunk) {
- ob_chunk *beginChunk = ob_get_chunk(ob.begin);
+ struct music_chunk *beginChunk = ob_get_chunk(ob.begin);
unsigned int fadePosition;
if (player.xfade == XFADE_ENABLED &&
player.next_song_chunk >= 0 &&