diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-01-10 15:39:56 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-01-10 15:39:56 +0000 |
commit | ec5d44627fb8a409c445741264cc4f2995a17721 (patch) | |
tree | 757a89bd1a7bff52f302df77c5db22bb63759c34 /firmware/export | |
parent | 1e32b94441afd344a250efec1450c86a83c297d1 (diff) | |
download | rockbox-ec5d44627fb8a409c445741264cc4f2995a17721.tar.gz rockbox-ec5d44627fb8a409c445741264cc4f2995a17721.zip |
next round of playback function split: everything in place, working and used; except for the playtime
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4218 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/mp3_playback.h | 8 | ||||
-rw-r--r-- | firmware/export/mpeg.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h index 2767092b75..3c190f2691 100644 --- a/firmware/export/mp3_playback.h +++ b/firmware/export/mp3_playback.h | |||
@@ -40,6 +40,12 @@ int mpeg_sound_numdecimals(int setting); | |||
40 | void mpeg_set_pitch(int percent); | 40 | void mpeg_set_pitch(int percent); |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | |||
44 | /* exported just for mpeg.c, to keep the recording there */ | ||
45 | #ifdef HAVE_MAS3587F | ||
46 | void demand_irq_enable(bool on); | ||
47 | #endif | ||
48 | |||
43 | /* new functions, to be exported to plugin API */ | 49 | /* new functions, to be exported to plugin API */ |
44 | void mp3_play_init(void); | 50 | void mp3_play_init(void); |
45 | void mp3_play_data(unsigned char* start, int size, | 51 | void mp3_play_data(unsigned char* start, int size, |
@@ -47,6 +53,8 @@ void mp3_play_data(unsigned char* start, int size, | |||
47 | ); | 53 | ); |
48 | void mp3_play_pause(bool play); | 54 | void mp3_play_pause(bool play); |
49 | void mp3_play_stop(void); | 55 | void mp3_play_stop(void); |
56 | long mp3_get_playtime(void); | ||
57 | void mp3_reset_playtime(void); | ||
50 | 58 | ||
51 | 59 | ||
52 | #define SOUND_VOLUME 0 | 60 | #define SOUND_VOLUME 0 |
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h index 2a629f4b45..ff003e62f5 100644 --- a/firmware/export/mpeg.h +++ b/firmware/export/mpeg.h | |||
@@ -90,6 +90,10 @@ void mpeg_set_buffer_margin(int seconds); | |||
90 | unsigned int mpeg_error(void); | 90 | unsigned int mpeg_error(void); |
91 | void mpeg_error_clear(void); | 91 | void mpeg_error_clear(void); |
92 | 92 | ||
93 | /* in order to keep the recording here, I have to expose this */ | ||
94 | void rec_tick(void); | ||
95 | void playback_tick(void); /* FixMe: get rid of this, use mp3_get_playtime() */ | ||
96 | |||
93 | #define MPEG_STATUS_PLAY 1 | 97 | #define MPEG_STATUS_PLAY 1 |
94 | #define MPEG_STATUS_PAUSE 2 | 98 | #define MPEG_STATUS_PAUSE 2 |
95 | #define MPEG_STATUS_RECORD 4 | 99 | #define MPEG_STATUS_RECORD 4 |