3 files changed, 11 insertions, 18 deletions

diff --git a/apps/plugins/lib/id3.c b/apps/plugins/lib/id3.c
index 0ce1736ffe..b0202b1d9c 100644
--- a/apps/plugins/lib/id3.c
+++ b/apps/plugins/lib/id3.c
@@ -20,27 +20,20 @@
  ****************************************************************************/
 #include "plugin.h"
 
-bool retrieve_id3(struct mp3entry *id3, const char* file, bool try_tagcache)
+/* Fills mp3entry with metadata retrieved from  RAM, if possible, or by reading from
+ * the file directly.  Note that the tagcache only stores a subset of metadata and
+ * will thus not return certain properties of the file, such as frequency, size, or
+ * codec.
+ */
+bool retrieve_id3(struct mp3entry *id3, const char* file)
 {
-    bool ret = false;
-    int fd;
-
 #if defined (HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
-    if (try_tagcache && rb->tagcache_fill_tags(id3, file))
+    if (rb->tagcache_fill_tags(id3, file))
     {
         rb->strlcpy(id3->path, file, sizeof(id3->path));
         return true;
     }
-#else
-    (void) try_tagcache;
 #endif
 
-    fd = rb->open(file, O_RDONLY);
-    if (fd >= 0)
-    {
-        if (rb->get_metadata(id3, fd, file))
-            ret = true;
-        rb->close(fd);
-    }
-    return ret;
+    return !rb->mp3info(id3, file);
 }
diff --git a/apps/plugins/lib/id3.h b/apps/plugins/lib/id3.h
index 292556d0c4..6ae1688798 100644
--- a/apps/plugins/lib/id3.h
+++ b/apps/plugins/lib/id3.h
@@ -21,6 +21,6 @@
 #ifndef ID3_H
 #define ID3_H
 
-bool retrieve_id3(struct mp3entry *id3, const char* file, bool try_tagcache);
+bool retrieve_id3(struct mp3entry *id3, const char* file);
 
-#endif /* ID3_H */
\ No newline at end of file
+#endif /* ID3_H */
diff --git a/apps/plugins/lib/mul_id3.h b/apps/plugins/lib/mul_id3.h
index 71da10e87e..40d7fa7822 100644
--- a/apps/plugins/lib/mul_id3.h
+++ b/apps/plugins/lib/mul_id3.h
@@ -25,4 +25,4 @@ void init_mul_id3(void);
 void collect_id3(struct mp3entry *id3, bool is_first_track);
 void write_id3_mul_tracks(struct mp3entry *id3);
 
-#endif /* MUL_ID3_H */
\ No newline at end of file
+#endif /* MUL_ID3_H */