aboutsummaryrefslogtreecommitdiff
path: root/src/player_thread.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/player_thread.c')
-rw-r--r--src/player_thread.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index 4a45e3af..302b38d1 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -52,7 +52,7 @@ enum xfade_state {
struct player {
struct player_control *pc;
- struct decoder_control *dc;
+ DecoderControl *dc;
struct music_pipe *pipe;
@@ -152,7 +152,7 @@ player_command_finished(struct player_control *pc)
static void player_dc_start(struct player *player, struct music_pipe *pipe)
{
struct player_control *pc = player->pc;
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
assert(player->queued || pc->command == PLAYER_COMMAND_SEEK);
assert(pc->next_song != NULL);
@@ -200,7 +200,7 @@ player_dc_at_next_song(const struct player *player)
static void
player_dc_stop(struct player *player)
{
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
dc_stop(dc);
@@ -227,7 +227,7 @@ static bool
player_wait_for_decoder(struct player *player)
{
struct player_control *pc = player->pc;
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
assert(player->queued || pc->command == PLAYER_COMMAND_SEEK);
assert(pc->next_song != NULL);
@@ -340,7 +340,7 @@ static bool
player_check_decoder_startup(struct player *player)
{
struct player_control *pc = player->pc;
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
assert(player->decoder_starting);
@@ -457,7 +457,7 @@ static bool player_seek_decoder(struct player *player)
{
struct player_control *pc = player->pc;
struct song *song = pc->next_song;
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
assert(pc->next_song != NULL);
@@ -535,7 +535,7 @@ static bool player_seek_decoder(struct player *player)
static void player_process_command(struct player *player)
{
struct player_control *pc = player->pc;
- G_GNUC_UNUSED struct decoder_control *dc = player->dc;
+ G_GNUC_UNUSED DecoderControl *dc = player->dc;
switch (pc->command) {
case PLAYER_COMMAND_NONE:
@@ -696,7 +696,7 @@ static bool
play_next_chunk(struct player *player)
{
struct player_control *pc = player->pc;
- struct decoder_control *dc = player->dc;
+ DecoderControl *dc = player->dc;
if (!audio_output_all_wait(pc, 64 * 2048))
/* the output pipe is still large enough, don't send
@@ -857,7 +857,7 @@ player_song_border(struct player *player)
* basically a state machine, which multiplexes data between the
* decoder thread and the output threads.
*/
-static void do_play(struct player_control *pc, struct decoder_control *dc)
+static void do_play(struct player_control *pc, DecoderControl *dc)
{
struct player player = {
.pc = pc,
@@ -1063,7 +1063,7 @@ player_task(gpointer arg)
{
struct player_control *pc = arg;
- struct decoder_control *dc = dc_new(pc->cond);
+ DecoderControl *dc = dc_new(pc->cond);
decoder_thread_start(dc);
player_lock(pc);