summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-03-03 02:09:58 +0000
committerJens Arnold <amiconn@rockbox.org>2006-03-03 02:09:58 +0000
commit8ac3ae73c5f5a87dc4cddafe2b0d1a0f41e41bdd (patch)
treebf6477ab6f715af85901f0c81ef0d12d01402ace /firmware
parent3187a59f7467cc10371748f0cc17846dddc3c22a (diff)
downloadrockbox-8ac3ae73c5f5a87dc4cddafe2b0d1a0f41e41bdd.tar.gz
rockbox-8ac3ae73c5f5a87dc4cddafe2b0d1a0f41e41bdd.zip
More 64bit simulator fixes, coinciding with the long policy this time.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8890 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/audio.h6
-rw-r--r--firmware/mpeg.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h
index 6867f3a268..62dec73078 100644
--- a/firmware/export/audio.h
+++ b/firmware/export/audio.h
@@ -63,15 +63,15 @@ struct audio_debug
63}; 63};
64 64
65void audio_init(void); 65void audio_init(void);
66void audio_play(int offset); 66void audio_play(long offset);
67void audio_stop(void); 67void audio_stop(void);
68void audio_pause(void); 68void audio_pause(void);
69void audio_resume(void); 69void audio_resume(void);
70void audio_next(void); 70void audio_next(void);
71void audio_prev(void); 71void audio_prev(void);
72int audio_status(void); 72int audio_status(void);
73void audio_ff_rewind(int newtime); 73void audio_ff_rewind(long newtime);
74void audio_seamless_seek(int newtime); 74void audio_seamless_seek(long newtime);
75void audio_flush_and_reload_tracks(void); 75void audio_flush_and_reload_tracks(void);
76struct mp3entry* audio_current_track(void); 76struct mp3entry* audio_current_track(void);
77struct mp3entry* audio_next_track(void); 77struct mp3entry* audio_next_track(void);
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index f1bb97291a..c47c279d24 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -2671,7 +2671,7 @@ void audio_set_recording_options(int frequency, int quality,
2671#endif /* SIMULATOR */ 2671#endif /* SIMULATOR */
2672#endif /* CONFIG_CODEC == MAS3587F */ 2672#endif /* CONFIG_CODEC == MAS3587F */
2673 2673
2674void audio_play(int offset) 2674void audio_play(long offset)
2675{ 2675{
2676#ifdef SIMULATOR 2676#ifdef SIMULATOR
2677 char* trackname; 2677 char* trackname;
@@ -2805,7 +2805,7 @@ void audio_prev(void)
2805#endif /* SIMULATOR */ 2805#endif /* SIMULATOR */
2806} 2806}
2807 2807
2808void audio_ff_rewind(int newtime) 2808void audio_ff_rewind(long newtime)
2809{ 2809{
2810#ifndef SIMULATOR 2810#ifndef SIMULATOR
2811 queue_post(&mpeg_queue, MPEG_FF_REWIND, (void *)newtime); 2811 queue_post(&mpeg_queue, MPEG_FF_REWIND, (void *)newtime);