diff options
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/playback.c b/apps/playback.c index b7d3b9987f..85aaad2e08 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -263,7 +263,6 @@ static size_t conf_watermark = 0; /* Level to trigger filebuf fill (A/C) FIXME * | |||
263 | static size_t conf_filechunk = 0; /* Largest chunk the codec accepts (A/C) FIXME */ | 263 | static size_t conf_filechunk = 0; /* Largest chunk the codec accepts (A/C) FIXME */ |
264 | static size_t conf_preseek = 0; /* Codec pre-seek margin (A/C) FIXME */ | 264 | static size_t conf_preseek = 0; /* Codec pre-seek margin (A/C) FIXME */ |
265 | static size_t buffer_margin = 0; /* Buffer margin aka anti-skip buffer (A/C-) */ | 265 | static size_t buffer_margin = 0; /* Buffer margin aka anti-skip buffer (A/C-) */ |
266 | static bool v1first = false; /* ID3 data control, true if V1 then V2 (A) */ | ||
267 | #if MEM > 8 | 266 | #if MEM > 8 |
268 | static size_t high_watermark = 0; /* High watermark for rebuffer (A/V/other) */ | 267 | static size_t high_watermark = 0; /* High watermark for rebuffer (A/V/other) */ |
269 | #endif | 268 | #endif |
@@ -395,11 +394,6 @@ bool mp3_is_playing(void) | |||
395 | return voice_is_playing; | 394 | return voice_is_playing; |
396 | } | 395 | } |
397 | 396 | ||
398 | void mpeg_id3_options(bool _v1first) | ||
399 | { | ||
400 | v1first = _v1first; | ||
401 | } | ||
402 | |||
403 | /* If voice could be swapped out - wait for it to return | 397 | /* If voice could be swapped out - wait for it to return |
404 | * Used by buffer claming functions. | 398 | * Used by buffer claming functions. |
405 | */ | 399 | */ |
@@ -2744,7 +2738,7 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer) | |||
2744 | /* Get track metadata if we don't already have it. */ | 2738 | /* Get track metadata if we don't already have it. */ |
2745 | if (!tracks[track_widx].taginfo_ready) | 2739 | if (!tracks[track_widx].taginfo_ready) |
2746 | { | 2740 | { |
2747 | if (get_metadata(&(tracks[track_widx].id3),current_fd,trackname,v1first)) | 2741 | if (get_metadata(&(tracks[track_widx].id3),current_fd,trackname)) |
2748 | { | 2742 | { |
2749 | tracks[track_widx].taginfo_ready = true; | 2743 | tracks[track_widx].taginfo_ready = true; |
2750 | if (start_play) | 2744 | if (start_play) |
@@ -2886,7 +2880,7 @@ static bool audio_read_next_metadata(void) | |||
2886 | if (fd < 0) | 2880 | if (fd < 0) |
2887 | return false; | 2881 | return false; |
2888 | 2882 | ||
2889 | status = get_metadata(&(tracks[next_idx].id3),fd,trackname,v1first); | 2883 | status = get_metadata(&(tracks[next_idx].id3),fd,trackname); |
2890 | /* Preload the glyphs in the tags */ | 2884 | /* Preload the glyphs in the tags */ |
2891 | if (status) | 2885 | if (status) |
2892 | { | 2886 | { |