summaryrefslogtreecommitdiff
path: root/apps/mpeg.c
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2009-11-16 20:09:46 +0000
committerJeffrey Goode <jeffg7@gmail.com>2009-11-16 20:09:46 +0000
commitdb82be4390d294c8d460f50c06add41ffa6686f5 (patch)
tree070f9e3df3841eaabf2b81b774eae07f773329bc /apps/mpeg.c
parent0d93a00e37b5f0c5e2977d77393c88d8baf58f38 (diff)
downloadrockbox-db82be4390d294c8d460f50c06add41ffa6686f5.zip
rockbox-db82be4390d294c8d460f50c06add41ffa6686f5.tar.gz
rockbox-db82be4390d294c8d460f50c06add41ffa6686f5.tar.bz2
rockbox-db82be4390d294c8d460f50c06add41ffa6686f5.tar.xz
Cleanup audio.h, related functions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23651 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/mpeg.c')
-rw-r--r--apps/mpeg.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c
index e28260b..079faac 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -533,9 +533,9 @@ static void recalculate_watermark(int bitrate)
}
#ifdef HAVE_DISK_STORAGE
-void audio_set_buffer_margin(int seconds)
+void audio_set_buffer_margin(int setting)
{
- low_watermark_margin = seconds;
+ low_watermark_margin = setting; /* in seconds */
}
#endif
@@ -2040,7 +2040,7 @@ static void mpeg_thread(void)
}
#endif /* !SIMULATOR */
-struct mp3entry* audio_current_track()
+struct mp3entry* audio_current_track(void)
{
#ifdef SIMULATOR
struct mp3entry *id3 = &taginfo;
@@ -2069,7 +2069,7 @@ struct mp3entry* audio_current_track()
#endif /* !SIMULATOR */
}
-struct mp3entry* audio_next_track()
+struct mp3entry* audio_next_track(void)
{
#ifdef SIMULATOR
return &taginfo;
@@ -2771,12 +2771,12 @@ void audio_prev(void)
#endif /* SIMULATOR */
}
-void audio_ff_rewind(long newtime)
+void audio_ff_rewind(long newpos)
{
#ifndef SIMULATOR
- queue_post(&mpeg_queue, MPEG_FF_REWIND, newtime);
+ queue_post(&mpeg_queue, MPEG_FF_REWIND, newpos);
#else /* SIMULATOR */
- (void)newtime;
+ (void)newpos;
#endif /* SIMULATOR */
}
@@ -2811,10 +2811,12 @@ int audio_status(void)
return ret;
}
+/* Unused function
unsigned int audio_error(void)
{
return mpeg_errno;
}
+*/
void audio_error_clear(void)
{