diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-03-14 17:16:48 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-03-14 17:23:18 -0400 |
commit | 9b4e7845602683882577aa9fe52aa55f3874a341 (patch) | |
tree | 8bd997bd63346f514e3ab3acb8220352701d8753 /lib/rbcodec/metadata/asf.c | |
parent | 6dcbf7ff77b0596c3317a76097e8b0c1c2f8158a (diff) | |
download | rockbox-9b4e7845602683882577aa9fe52aa55f3874a341.tar.gz rockbox-9b4e7845602683882577aa9fe52aa55f3874a341.zip |
BUGFIX string_option parsers
fix bugs introduced in the switch over to using string_option
instead of if else strcmp trees,
embedded album art should work again
skin parser had an error for 'noborder' and 'nobar'
Change-Id: I957d81e5fa8467b33bbd93d63c4428c36100acca
Diffstat (limited to 'lib/rbcodec/metadata/asf.c')
-rw-r--r-- | lib/rbcodec/metadata/asf.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/rbcodec/metadata/asf.c b/lib/rbcodec/metadata/asf.c index 82873a43a6..b578746658 100644 --- a/lib/rbcodec/metadata/asf.c +++ b/lib/rbcodec/metadata/asf.c | |||
@@ -441,13 +441,20 @@ static int asf_parse_header(int fd, struct mp3entry* id3, | |||
441 | { | 441 | { |
442 | eWM_TrackNumber, eWM_Genre, eWM_AlbumTitle, | 442 | eWM_TrackNumber, eWM_Genre, eWM_AlbumTitle, |
443 | eWM_AlbumArtist, eWM_Composer, eWM_Year, | 443 | eWM_AlbumArtist, eWM_Composer, eWM_Year, |
444 | eWM_MusicBrainz_Track_Id, eWM_Picture | 444 | eWM_MusicBrainz_Track_Id, eWM_Picture, |
445 | eWM_COUNT_TAG_COUNT | ||
445 | }; | 446 | }; |
446 | 447 | ||
447 | static const char *tagops[] = | 448 | static const char *tagops[eWM_COUNT_TAG_COUNT + 1] = |
448 | { "WM/TrackNumber", "WM/Genre", "WM/AlbumTitle", | 449 | { [eWM_TrackNumber] = "WM/TrackNumber", |
449 | "WM/AlbumArtist", "WM/Composer", "WM/Year", | 450 | [eWM_Genre] = "WM/Genre", |
450 | "MusicBrainz/Track Id", "WM/Picture", NULL | 451 | [eWM_AlbumTitle] = "WM/AlbumTitle", |
452 | [eWM_AlbumArtist] = "WM/AlbumArtist", | ||
453 | [eWM_Composer] = "WM/Composer", | ||
454 | [eWM_Year] = "WM/Year", | ||
455 | [eWM_MusicBrainz_Track_Id]"MusicBrainz/Track Id", | ||
456 | [eWM_Picture]"WM/Picture", | ||
457 | [eWM_COUNT_TAG_COUNT] = NULL | ||
451 | }; | 458 | }; |
452 | 459 | ||
453 | for (i=0; i < count; i++) { | 460 | for (i=0; i < count; i++) { |