Redo r21460 and r21462 so that it doesn't introduce a new #define. Patch by Jeffrey Goode, taken from FS#10366.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21467 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 15 deletions

diff --git a/apps/metadata/vorbis.c b/apps/metadata/vorbis.c
index b968cc79fe..f6d3af1cef 100644
--- a/apps/metadata/vorbis.c
+++ b/apps/metadata/vorbis.c
@@ -34,12 +34,6 @@
 /*#define LOGF_ENABLE*/
 #include "logf.h"
 
-#ifdef SIMULATOR
-#define LOGFQUEUE logf
-#else
-#define LOGFQUEUE(...)
-#endif
-
 struct file
 {
     int fd;
@@ -353,7 +347,7 @@ long read_vorbis_tags(int fd, struct mp3entry *id3,
             return 0;
         }
 
-        LOGFQUEUE("Vorbis comment %d: %s=%s", i, name, id3->path);
+        logf("Vorbis comment %d: %s=%s", i, name, id3->path);
         len = parse_tag(name, id3->path, id3, buf, buf_remaining, 
             TAGTYPE_VORBIS);
         buf += len;
diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c
index e3cb5f1098..6bd2adade3 100644
--- a/apps/recorder/albumart.c
+++ b/apps/recorder/albumart.c
@@ -34,12 +34,6 @@
 /*#define LOGF_ENABLE*/
 #include "logf.h"
 
-#ifdef SIMULATOR
-#define LOGFQUEUE logf
-#else
-#define LOGFQUEUE(...)
-#endif
-
 #if defined(HAVE_JPEG) || defined(PLUGIN)
 #define USE_JPEG_COVER
 #endif
@@ -273,7 +267,7 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string,
         return false;
 
     strncpy(buf, path, buflen);
-    LOGFQUEUE("Album art found: %s", path);
+    logf("Album art found: %s", path);
     return true;
 }
 
@@ -292,7 +286,7 @@ bool find_albumart(const struct mp3entry *id3, char *buf, int buflen)
     if (!data)
         return false;
 
-    LOGFQUEUE("Looking for album art for %s", id3->path);
+    logf("Looking for album art for %s", id3->path);
 
     /* Write the size string, e.g. ".100x100". */
     snprintf(size_string, sizeof(size_string), ".%dx%d",