diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/audio.h | 10 | ||||
-rw-r--r-- | firmware/export/id3.h | 2 | ||||
-rw-r--r-- | firmware/id3.c | 2 | ||||
-rw-r--r-- | firmware/mpeg.c | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 49ff4c168a..5cd0d0fc9e 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -77,21 +77,21 @@ struct audio_debug | |||
77 | }; | 77 | }; |
78 | 78 | ||
79 | void audio_init(void); | 79 | void audio_init(void); |
80 | void audio_play(const long offset); | 80 | void audio_play(long offset); |
81 | void audio_stop(void); | 81 | void audio_stop(void); |
82 | void audio_pause(void); | 82 | void audio_pause(void); |
83 | void audio_resume(void); | 83 | void audio_resume(void); |
84 | void audio_next(void); | 84 | void audio_next(void); |
85 | void audio_prev(void); | 85 | void audio_prev(void); |
86 | int audio_status(void); | 86 | int audio_status(void); |
87 | void audio_ff_rewind(const long newtime); | 87 | void audio_ff_rewind(long newtime); |
88 | void audio_flush_and_reload_tracks(void); | 88 | void audio_flush_and_reload_tracks(void); |
89 | struct mp3entry* audio_current_track(void); | 89 | struct mp3entry* audio_current_track(void); |
90 | struct mp3entry* audio_next_track(void); | 90 | struct mp3entry* audio_next_track(void); |
91 | bool audio_has_changed_track(void); | 91 | bool audio_has_changed_track(void); |
92 | void audio_get_debugdata(struct audio_debug *dbgdata); | 92 | void audio_get_debugdata(struct audio_debug *dbgdata); |
93 | #ifndef HAVE_FLASH_STORAGE | 93 | #ifndef HAVE_FLASH_STORAGE |
94 | void audio_set_buffer_margin(const int seconds); | 94 | void audio_set_buffer_margin(int seconds); |
95 | #endif | 95 | #endif |
96 | unsigned int audio_error(void); | 96 | unsigned int audio_error(void); |
97 | void audio_error_clear(void); | 97 | void audio_error_clear(void); |
@@ -100,7 +100,7 @@ void audio_beep(int duration); | |||
100 | void audio_init_playback(void); | 100 | void audio_init_playback(void); |
101 | 101 | ||
102 | /* Required call when audio buffer is required for some other purpose */ | 102 | /* Required call when audio buffer is required for some other purpose */ |
103 | unsigned char *audio_get_buffer(const bool talk_buf, size_t *buffer_size); | 103 | unsigned char *audio_get_buffer(bool talk_buf, size_t *buffer_size); |
104 | /* only implemented in playback.c, but called from firmware */ | 104 | /* only implemented in playback.c, but called from firmware */ |
105 | 105 | ||
106 | /* channel modes */ | 106 | /* channel modes */ |
@@ -196,7 +196,7 @@ unsigned long audio_recorded_time(void); | |||
196 | unsigned long audio_num_recorded_bytes(void); | 196 | unsigned long audio_num_recorded_bytes(void); |
197 | 197 | ||
198 | #if CONFIG_CODEC == SWCODEC | 198 | #if CONFIG_CODEC == SWCODEC |
199 | /* SWCODEC recoring functions */ | 199 | /* SWCODEC recording functions */ |
200 | /* playback.c */ | 200 | /* playback.c */ |
201 | bool audio_load_encoder(int afmt); | 201 | bool audio_load_encoder(int afmt); |
202 | void audio_remove_encoder(void); | 202 | void audio_remove_encoder(void); |
diff --git a/firmware/export/id3.h b/firmware/export/id3.h index 0035fae19a..8b2d02ea30 100644 --- a/firmware/export/id3.h +++ b/firmware/export/id3.h | |||
@@ -231,7 +231,7 @@ enum { | |||
231 | 231 | ||
232 | bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename); | 232 | bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename); |
233 | bool mp3info(struct mp3entry *entry, const char *filename); | 233 | bool mp3info(struct mp3entry *entry, const char *filename); |
234 | char* id3_get_num_genre(const unsigned int genre_num); | 234 | char* id3_get_num_genre(unsigned int genre_num); |
235 | char* id3_get_codec(const struct mp3entry* id3); | 235 | char* id3_get_codec(const struct mp3entry* id3); |
236 | int getid3v2len(int fd); | 236 | int getid3v2len(int fd); |
237 | void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig); | 237 | void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig); |
diff --git a/firmware/id3.c b/firmware/id3.c index 6afe2ac304..d63acbb8aa 100644 --- a/firmware/id3.c +++ b/firmware/id3.c | |||
@@ -185,7 +185,7 @@ static const char* const genres[] = { | |||
185 | "Synthpop" | 185 | "Synthpop" |
186 | }; | 186 | }; |
187 | 187 | ||
188 | char* id3_get_num_genre(const unsigned int genre_num) | 188 | char* id3_get_num_genre(unsigned int genre_num) |
189 | { | 189 | { |
190 | if (genre_num < sizeof(genres)/sizeof(char*)) | 190 | if (genre_num < sizeof(genres)/sizeof(char*)) |
191 | return (char*)genres[genre_num]; | 191 | return (char*)genres[genre_num]; |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 78824cfe36..de3b347f77 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -210,7 +210,7 @@ unsigned shadow_codec_reg0; | |||
210 | #endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */ | 210 | #endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */ |
211 | 211 | ||
212 | #ifdef HAVE_RECORDING | 212 | #ifdef HAVE_RECORDING |
213 | const unsigned char empty_id3_header[] = | 213 | static const unsigned char empty_id3_header[] = |
214 | { | 214 | { |
215 | 'I', 'D', '3', 0x03, 0x00, 0x00, | 215 | 'I', 'D', '3', 0x03, 0x00, 0x00, |
216 | 0x00, 0x00, 0x1f, 0x76 /* Size is 4096 minus 10 bytes for the header */ | 216 | 0x00, 0x00, 0x1f, 0x76 /* Size is 4096 minus 10 bytes for the header */ |
@@ -533,7 +533,7 @@ static void recalculate_watermark(int bitrate) | |||
533 | } | 533 | } |
534 | 534 | ||
535 | #ifndef HAVE_FLASH_STORAGE | 535 | #ifndef HAVE_FLASH_STORAGE |
536 | void audio_set_buffer_margin(const int seconds) | 536 | void audio_set_buffer_margin(int seconds) |
537 | { | 537 | { |
538 | low_watermark_margin = seconds; | 538 | low_watermark_margin = seconds; |
539 | } | 539 | } |
@@ -2627,7 +2627,7 @@ void audio_set_recording_options(struct audio_recording_options *options) | |||
2627 | #endif /* SIMULATOR */ | 2627 | #endif /* SIMULATOR */ |
2628 | #endif /* CONFIG_CODEC == MAS3587F */ | 2628 | #endif /* CONFIG_CODEC == MAS3587F */ |
2629 | 2629 | ||
2630 | void audio_play(const long offset) | 2630 | void audio_play(long offset) |
2631 | { | 2631 | { |
2632 | #ifdef SIMULATOR | 2632 | #ifdef SIMULATOR |
2633 | char* trackname; | 2633 | char* trackname; |
@@ -2768,7 +2768,7 @@ void audio_prev(void) | |||
2768 | #endif /* SIMULATOR */ | 2768 | #endif /* SIMULATOR */ |
2769 | } | 2769 | } |
2770 | 2770 | ||
2771 | void audio_ff_rewind(const long newtime) | 2771 | void audio_ff_rewind(long newtime) |
2772 | { | 2772 | { |
2773 | #ifndef SIMULATOR | 2773 | #ifndef SIMULATOR |
2774 | queue_post(&mpeg_queue, MPEG_FF_REWIND, newtime); | 2774 | queue_post(&mpeg_queue, MPEG_FF_REWIND, newtime); |