diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/audio.h | 30 | ||||
-rw-r--r-- | firmware/mpeg.c | 6 |
2 files changed, 9 insertions, 27 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index c39fca428c..49ff4c168a 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h @@ -77,49 +77,31 @@ struct audio_debug }; void audio_init(void); -void audio_wait_for_init(void); -void audio_play(long offset); +void audio_play(const long offset); void audio_stop(void); void audio_pause(void); void audio_resume(void); void audio_next(void); void audio_prev(void); int audio_status(void); -#if CONFIG_CODEC == SWCODEC -int audio_track_count(void); /* SWCODEC only */ -long audio_filebufused(void); /* SWCODEC only */ -void audio_pre_ff_rewind(void); /* SWCODEC only */ -#endif /* CONFIG_CODEC == SWCODEC */ -void audio_ff_rewind(long newtime); +void audio_ff_rewind(const long newtime); void audio_flush_and_reload_tracks(void); -#ifdef HAVE_ALBUMART -int audio_current_aa_hid(void); -#endif struct mp3entry* audio_current_track(void); struct mp3entry* audio_next_track(void); bool audio_has_changed_track(void); void audio_get_debugdata(struct audio_debug *dbgdata); -void audio_set_crossfade(int type); #ifndef HAVE_FLASH_STORAGE -void audio_set_buffer_margin(int seconds); +void audio_set_buffer_margin(const int seconds); #endif unsigned int audio_error(void); void audio_error_clear(void); int audio_get_file_pos(void); void audio_beep(int duration); void audio_init_playback(void); -/* Required call when audio buffer is require for some other purpose */ -unsigned char *audio_get_buffer(bool talk_buf, size_t *buffer_size); -/* Stops audio from serving playback */ -void audio_hard_stop(void); -/* Retores the audio buffer to handle the requested playback */ -enum -{ - AUDIO_WANT_PLAYBACK = 0, - AUDIO_WANT_VOICE, -}; -bool audio_restore_playback(int type); +/* Required call when audio buffer is required for some other purpose */ +unsigned char *audio_get_buffer(const bool talk_buf, size_t *buffer_size); +/* only implemented in playback.c, but called from firmware */ /* channel modes */ enum rec_channel_modes diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 11cbcdcb68..78824cfe36 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c @@ -533,7 +533,7 @@ static void recalculate_watermark(int bitrate) } #ifndef HAVE_FLASH_STORAGE -void audio_set_buffer_margin(int seconds) +void audio_set_buffer_margin(const int seconds) { low_watermark_margin = seconds; } @@ -2627,7 +2627,7 @@ void audio_set_recording_options(struct audio_recording_options *options) #endif /* SIMULATOR */ #endif /* CONFIG_CODEC == MAS3587F */ -void audio_play(long offset) +void audio_play(const long offset) { #ifdef SIMULATOR char* trackname; @@ -2768,7 +2768,7 @@ void audio_prev(void) #endif /* SIMULATOR */ } -void audio_ff_rewind(long newtime) +void audio_ff_rewind(const long newtime) { #ifndef SIMULATOR queue_post(&mpeg_queue, MPEG_FF_REWIND, newtime); |