diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-24 07:49:16 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-24 07:49:16 +0000 |
commit | f077710b86c611888fde6c3b01c870e87d6ce2e2 (patch) | |
tree | 6b4a75145cf3ad1ad660bbc89c45cef811c200ea /firmware | |
parent | 1a07eef1671ff2d0c460adc8271da0fb7cafcb67 (diff) | |
download | rockbox-f077710b86c611888fde6c3b01c870e87d6ce2e2.tar.gz rockbox-f077710b86c611888fde6c3b01c870e87d6ce2e2.zip |
New mpeg_status() function replaces mpeg_is_playing()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2379 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/mpeg.c | 12 | ||||
-rw-r--r-- | firmware/mpeg.h | 9 |
2 files changed, 17 insertions, 4 deletions
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) | |||
1528 | #endif | 1528 | #endif |
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | bool mpeg_is_playing(void) | 1531 | int mpeg_status(void) |
1532 | { | 1532 | { |
1533 | return is_playing; | 1533 | int ret = 0; |
1534 | |||
1535 | if(is_playing) | ||
1536 | ret |= MPEG_STATUS_PLAY; | ||
1537 | |||
1538 | if(paused) | ||
1539 | ret |= MPEG_STATUS_PAUSE; | ||
1540 | |||
1541 | return ret; | ||
1534 | } | 1542 | } |
1535 | 1543 | ||
1536 | #ifndef SIMULATOR | 1544 | #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 @@ | |||
21 | 21 | ||
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | 23 | ||
24 | void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int bass_boost, int avc); | 24 | void mpeg_init(int volume, int bass, int treble, int balance, |
25 | int loudness, int bass_boost, int avc); | ||
25 | void mpeg_play(int offset); | 26 | void mpeg_play(int offset); |
26 | void mpeg_stop(void); | 27 | void mpeg_stop(void); |
27 | void mpeg_pause(void); | 28 | void mpeg_pause(void); |
@@ -30,7 +31,6 @@ void mpeg_next(void); | |||
30 | void mpeg_prev(void); | 31 | void mpeg_prev(void); |
31 | void mpeg_ff_rewind(int change); | 32 | void mpeg_ff_rewind(int change); |
32 | void mpeg_flush_and_reload_tracks(void); | 33 | void mpeg_flush_and_reload_tracks(void); |
33 | bool mpeg_is_playing(void); | ||
34 | void mpeg_sound_set(int setting, int value); | 34 | void mpeg_sound_set(int setting, int value); |
35 | int mpeg_sound_min(int setting); | 35 | int mpeg_sound_min(int setting); |
36 | int mpeg_sound_max(int setting); | 36 | int mpeg_sound_max(int setting); |
@@ -41,6 +41,7 @@ char *mpeg_sound_unit(int setting); | |||
41 | int mpeg_sound_numdecimals(int setting); | 41 | int mpeg_sound_numdecimals(int setting); |
42 | struct mp3entry* mpeg_current_track(void); | 42 | struct mp3entry* mpeg_current_track(void); |
43 | bool mpeg_has_changed_track(void); | 43 | bool mpeg_has_changed_track(void); |
44 | int mpeg_status(void); | ||
44 | #ifdef HAVE_MAS3587F | 45 | #ifdef HAVE_MAS3587F |
45 | void mpeg_set_pitch(int percent); | 46 | void mpeg_set_pitch(int percent); |
46 | #endif | 47 | #endif |
@@ -60,4 +61,8 @@ void mpeg_set_pitch(int percent); | |||
60 | #define MPEG_SOUND_MONO_LEFT 2 | 61 | #define MPEG_SOUND_MONO_LEFT 2 |
61 | #define MPEG_SOUND_MONO_RIGHT 3 | 62 | #define MPEG_SOUND_MONO_RIGHT 3 |
62 | 63 | ||
64 | #define MPEG_STATUS_PLAY 1 | ||
65 | #define MPEG_STATUS_PAUSE 2 | ||
66 | #define MPEG_STATUS_RECORD 4 | ||
67 | |||
63 | #endif | 68 | #endif |