From f077710b86c611888fde6c3b01c870e87d6ce2e2 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 24 Sep 2002 07:49:16 +0000 Subject: New mpeg_status() function replaces mpeg_is_playing() git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2379 a1c6a512-1295-4272-9138-f99709370657 --- firmware/mpeg.c | 12 ++++++++++-- firmware/mpeg.h | 9 +++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 4d26d4b3fe..c6e95dd588 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c @@ -1528,9 +1528,17 @@ void mpeg_flush_and_reload_tracks(void) #endif } -bool mpeg_is_playing(void) +int mpeg_status(void) { - return is_playing; + int ret = 0; + + if(is_playing) + ret |= MPEG_STATUS_PLAY; + + if(paused) + ret |= MPEG_STATUS_PAUSE; + + return ret; } #ifndef SIMULATOR diff --git a/firmware/mpeg.h b/firmware/mpeg.h index f2a2b38c6c..a67ca922c4 100644 --- a/firmware/mpeg.h +++ b/firmware/mpeg.h @@ -21,7 +21,8 @@ #include -void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int bass_boost, int avc); +void mpeg_init(int volume, int bass, int treble, int balance, + int loudness, int bass_boost, int avc); void mpeg_play(int offset); void mpeg_stop(void); void mpeg_pause(void); @@ -30,7 +31,6 @@ void mpeg_next(void); void mpeg_prev(void); void mpeg_ff_rewind(int change); void mpeg_flush_and_reload_tracks(void); -bool mpeg_is_playing(void); void mpeg_sound_set(int setting, int value); int mpeg_sound_min(int setting); int mpeg_sound_max(int setting); @@ -41,6 +41,7 @@ char *mpeg_sound_unit(int setting); int mpeg_sound_numdecimals(int setting); struct mp3entry* mpeg_current_track(void); bool mpeg_has_changed_track(void); +int mpeg_status(void); #ifdef HAVE_MAS3587F void mpeg_set_pitch(int percent); #endif @@ -60,4 +61,8 @@ void mpeg_set_pitch(int percent); #define MPEG_SOUND_MONO_LEFT 2 #define MPEG_SOUND_MONO_RIGHT 3 +#define MPEG_STATUS_PLAY 1 +#define MPEG_STATUS_PAUSE 2 +#define MPEG_STATUS_RECORD 4 + #endif -- cgit v1.2.3