diff options
Diffstat (limited to 'apps/iap')
-rw-r--r-- | apps/iap/iap-core.c | 7 | ||||
-rw-r--r-- | apps/iap/iap-lingo4.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/apps/iap/iap-core.c b/apps/iap/iap-core.c index da04a67311..3faf8237bf 100644 --- a/apps/iap/iap-core.c +++ b/apps/iap/iap-core.c | |||
@@ -685,7 +685,6 @@ bool iap_getc(const unsigned char x) | |||
685 | void iap_get_trackinfo(const unsigned int track, struct mp3entry* id3) | 685 | void iap_get_trackinfo(const unsigned int track, struct mp3entry* id3) |
686 | { | 686 | { |
687 | int tracknum; | 687 | int tracknum; |
688 | int fd; | ||
689 | struct playlist_track_info info; | 688 | struct playlist_track_info info; |
690 | 689 | ||
691 | tracknum = track; | 690 | tracknum = track; |
@@ -699,10 +698,8 @@ void iap_get_trackinfo(const unsigned int track, struct mp3entry* id3) | |||
699 | if(playlist_next(0) != tracknum) | 698 | if(playlist_next(0) != tracknum) |
700 | { | 699 | { |
701 | playlist_get_track_info(NULL, tracknum, &info); | 700 | playlist_get_track_info(NULL, tracknum, &info); |
702 | fd = open(info.filename, O_RDONLY); | 701 | /* memset(id3, 0, sizeof(*id3)) --get_metadata does this for us */ |
703 | memset(id3, 0, sizeof(*id3)); | 702 | get_metadata(id3, -1, info.filename); |
704 | get_metadata(id3, fd, info.filename); | ||
705 | close(fd); | ||
706 | } else { | 703 | } else { |
707 | memcpy(id3, audio_current_track(), sizeof(*id3)); | 704 | memcpy(id3, audio_current_track(), sizeof(*id3)); |
708 | } | 705 | } |
diff --git a/apps/iap/iap-lingo4.c b/apps/iap/iap-lingo4.c index e1ab150fd9..6eb63003a5 100644 --- a/apps/iap/iap-lingo4.c +++ b/apps/iap/iap-lingo4.c | |||
@@ -1787,7 +1787,6 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf) | |||
1787 | { | 1787 | { |
1788 | unsigned char data[70] = {0x04, 0x00, 0xFF}; | 1788 | unsigned char data[70] = {0x04, 0x00, 0xFF}; |
1789 | struct mp3entry id3; | 1789 | struct mp3entry id3; |
1790 | int fd; | ||
1791 | size_t len; | 1790 | size_t len; |
1792 | long tracknum = get_u32(&buf[3]); | 1791 | long tracknum = get_u32(&buf[3]); |
1793 | 1792 | ||
@@ -1802,10 +1801,8 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf) | |||
1802 | { | 1801 | { |
1803 | struct playlist_track_info info; | 1802 | struct playlist_track_info info; |
1804 | playlist_get_track_info(NULL, tracknum, &info); | 1803 | playlist_get_track_info(NULL, tracknum, &info); |
1805 | fd = open(info.filename, O_RDONLY); | 1804 | /* memset(&id3, 0, sizeof(struct mp3entry)); --get_metadata does this for us */ |
1806 | memset(&id3, 0, sizeof(struct mp3entry)); | 1805 | get_metadata(&id3, -1, info.filename); |
1807 | get_metadata(&id3, fd, info.filename); | ||
1808 | close(fd); | ||
1809 | } | 1806 | } |
1810 | /* Return the requested track data */ | 1807 | /* Return the requested track data */ |
1811 | switch(cmd) | 1808 | switch(cmd) |