diff options
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index e412c36fe2..65fb024db3 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -127,8 +127,6 @@ static bool (*cuesheet_callback)(const char *filename) = NULL; | |||
127 | static const char mpeg_thread_name[] = "mpeg"; | 127 | static const char mpeg_thread_name[] = "mpeg"; |
128 | static unsigned int mpeg_errno; | 128 | static unsigned int mpeg_errno; |
129 | 129 | ||
130 | static bool v1first = false; | ||
131 | |||
132 | static bool playing = false; /* We are playing an MP3 stream */ | 130 | static bool playing = false; /* We are playing an MP3 stream */ |
133 | static bool is_playing = false; /* We are (attempting to) playing MP3 files */ | 131 | static bool is_playing = false; /* We are (attempting to) playing MP3 files */ |
134 | static bool paused; /* playback is paused */ | 132 | static bool paused; /* playback is paused */ |
@@ -922,7 +920,7 @@ static struct trackdata *add_track_to_tag_list(const char *filename) | |||
922 | 920 | ||
923 | /* grab id3 tag of new file and | 921 | /* grab id3 tag of new file and |
924 | remember where in memory it starts */ | 922 | remember where in memory it starts */ |
925 | if(mp3info(&track->id3, filename, v1first)) | 923 | if(mp3info(&track->id3, filename)) |
926 | { | 924 | { |
927 | DEBUGF("Bad mp3\n"); | 925 | DEBUGF("Bad mp3\n"); |
928 | return NULL; | 926 | return NULL; |
@@ -2098,11 +2096,6 @@ static void mpeg_thread(void) | |||
2098 | } | 2096 | } |
2099 | #endif /* !SIMULATOR */ | 2097 | #endif /* !SIMULATOR */ |
2100 | 2098 | ||
2101 | void mpeg_id3_options(bool _v1first) | ||
2102 | { | ||
2103 | v1first = _v1first; | ||
2104 | } | ||
2105 | |||
2106 | struct mp3entry* audio_current_track() | 2099 | struct mp3entry* audio_current_track() |
2107 | { | 2100 | { |
2108 | #ifdef SIMULATOR | 2101 | #ifdef SIMULATOR |
@@ -2707,7 +2700,7 @@ void audio_play(long offset) | |||
2707 | trackname = playlist_peek( steps ); | 2700 | trackname = playlist_peek( steps ); |
2708 | if (!trackname) | 2701 | if (!trackname) |
2709 | break; | 2702 | break; |
2710 | if(mp3info(&taginfo, trackname, v1first)) { | 2703 | if(mp3info(&taginfo, trackname)) { |
2711 | /* bad mp3, move on */ | 2704 | /* bad mp3, move on */ |
2712 | if(++steps > playlist_amount()) | 2705 | if(++steps > playlist_amount()) |
2713 | break; | 2706 | break; |
@@ -2793,7 +2786,7 @@ void audio_next(void) | |||
2793 | file = playlist_peek(steps); | 2786 | file = playlist_peek(steps); |
2794 | if(!file) | 2787 | if(!file) |
2795 | break; | 2788 | break; |
2796 | if(mp3info(&taginfo, file, v1first)) { | 2789 | if(mp3info(&taginfo, file)) { |
2797 | if(++steps > playlist_amount()) | 2790 | if(++steps > playlist_amount()) |
2798 | break; | 2791 | break; |
2799 | continue; | 2792 | continue; |
@@ -2822,7 +2815,7 @@ void audio_prev(void) | |||
2822 | file = playlist_peek(steps); | 2815 | file = playlist_peek(steps); |
2823 | if(!file) | 2816 | if(!file) |
2824 | break; | 2817 | break; |
2825 | if(mp3info(&taginfo, file, v1first)) { | 2818 | if(mp3info(&taginfo, file)) { |
2826 | steps--; | 2819 | steps--; |
2827 | continue; | 2820 | continue; |
2828 | } | 2821 | } |