From d562ba5fbbe117585eaade40a8e9c6ef1bf7ca1f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Oct 2008 10:49:11 +0200 Subject: song: converted typedef Song to struct song Again, a data type which can be forward-declared. --- src/decoder_control.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/decoder_control.h') diff --git a/src/decoder_control.h b/src/decoder_control.h index e34e9d607..f9e65bc51 100644 --- a/src/decoder_control.h +++ b/src/decoder_control.h @@ -21,7 +21,6 @@ #define DECODE_H #include "decoder_api.h" -#include "song.h" #include "audio_format.h" #include "notify.h" @@ -49,8 +48,8 @@ struct decoder_control { volatile int8_t seekable; volatile double seekWhere; struct audio_format audioFormat; - Song *current_song; - Song *volatile next_song; + struct song *current_song; + struct song *volatile next_song; volatile float totalTime; }; @@ -72,7 +71,8 @@ static inline int decoder_is_starting(void) dc.state == DECODE_STATE_START; } -static inline Song *decoder_current_song(void) +static inline struct song * +decoder_current_song(void) { if (dc.state == DECODE_STATE_STOP || dc.error != DECODE_ERROR_NOERROR) @@ -83,9 +83,11 @@ static inline Song *decoder_current_song(void) void dc_command_wait(Notify *notify); -void dc_start(Notify *notify, Song *song); +void +dc_start(Notify *notify, struct song *song); -void dc_start_async(Song *song); +void +dc_start_async(struct song *song); void dc_stop(Notify *notify); -- cgit v1.2.3