diff options
Diffstat (limited to 'apps/mpeg.c')
-rw-r--r-- | apps/mpeg.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c index e28260b6a7..079faac13c 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -533,9 +533,9 @@ static void recalculate_watermark(int bitrate) | |||
533 | } | 533 | } |
534 | 534 | ||
535 | #ifdef HAVE_DISK_STORAGE | 535 | #ifdef HAVE_DISK_STORAGE |
536 | void audio_set_buffer_margin(int seconds) | 536 | void audio_set_buffer_margin(int setting) |
537 | { | 537 | { |
538 | low_watermark_margin = seconds; | 538 | low_watermark_margin = setting; /* in seconds */ |
539 | } | 539 | } |
540 | #endif | 540 | #endif |
541 | 541 | ||
@@ -2040,7 +2040,7 @@ static void mpeg_thread(void) | |||
2040 | } | 2040 | } |
2041 | #endif /* !SIMULATOR */ | 2041 | #endif /* !SIMULATOR */ |
2042 | 2042 | ||
2043 | struct mp3entry* audio_current_track() | 2043 | struct mp3entry* audio_current_track(void) |
2044 | { | 2044 | { |
2045 | #ifdef SIMULATOR | 2045 | #ifdef SIMULATOR |
2046 | struct mp3entry *id3 = &taginfo; | 2046 | struct mp3entry *id3 = &taginfo; |
@@ -2069,7 +2069,7 @@ struct mp3entry* audio_current_track() | |||
2069 | #endif /* !SIMULATOR */ | 2069 | #endif /* !SIMULATOR */ |
2070 | } | 2070 | } |
2071 | 2071 | ||
2072 | struct mp3entry* audio_next_track() | 2072 | struct mp3entry* audio_next_track(void) |
2073 | { | 2073 | { |
2074 | #ifdef SIMULATOR | 2074 | #ifdef SIMULATOR |
2075 | return &taginfo; | 2075 | return &taginfo; |
@@ -2771,12 +2771,12 @@ void audio_prev(void) | |||
2771 | #endif /* SIMULATOR */ | 2771 | #endif /* SIMULATOR */ |
2772 | } | 2772 | } |
2773 | 2773 | ||
2774 | void audio_ff_rewind(long newtime) | 2774 | void audio_ff_rewind(long newpos) |
2775 | { | 2775 | { |
2776 | #ifndef SIMULATOR | 2776 | #ifndef SIMULATOR |
2777 | queue_post(&mpeg_queue, MPEG_FF_REWIND, newtime); | 2777 | queue_post(&mpeg_queue, MPEG_FF_REWIND, newpos); |
2778 | #else /* SIMULATOR */ | 2778 | #else /* SIMULATOR */ |
2779 | (void)newtime; | 2779 | (void)newpos; |
2780 | #endif /* SIMULATOR */ | 2780 | #endif /* SIMULATOR */ |
2781 | } | 2781 | } |
2782 | 2782 | ||
@@ -2811,10 +2811,12 @@ int audio_status(void) | |||
2811 | return ret; | 2811 | return ret; |
2812 | } | 2812 | } |
2813 | 2813 | ||
2814 | /* Unused function | ||
2814 | unsigned int audio_error(void) | 2815 | unsigned int audio_error(void) |
2815 | { | 2816 | { |
2816 | return mpeg_errno; | 2817 | return mpeg_errno; |
2817 | } | 2818 | } |
2819 | */ | ||
2818 | 2820 | ||
2819 | void audio_error_clear(void) | 2821 | void audio_error_clear(void) |
2820 | { | 2822 | { |