devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21467 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-06-22 18:40:49 +00:00
parent 67c86a76d9
commit 659425f23e
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/metadata/vorbis.c
View file

@ -34,12 +34,6 @@
/*#define LOGF_ENABLE*/ /*#define LOGF_ENABLE*/
#include "logf.h" #include "logf.h"
#ifdef SIMULATOR
#define LOGFQUEUE logf
#else
#define LOGFQUEUE(...)
#endif
struct file struct file
{ {
int fd; int fd;
@ -353,7 +347,7 @@ long read_vorbis_tags(int fd, struct mp3entry *id3,
return 0; 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, len = parse_tag(name, id3->path, id3, buf, buf_remaining,
TAGTYPE_VORBIS); TAGTYPE_VORBIS);
buf += len; buf += len;

10
apps/recorder/albumart.c
View file

@ -34,12 +34,6 @@
/*#define LOGF_ENABLE*/ /*#define LOGF_ENABLE*/
#include "logf.h" #include "logf.h"
#ifdef SIMULATOR
#define LOGFQUEUE logf
#else
#define LOGFQUEUE(...)
#endif
#if defined(HAVE_JPEG) || defined(PLUGIN) #if defined(HAVE_JPEG) || defined(PLUGIN)
#define USE_JPEG_COVER #define USE_JPEG_COVER
#endif #endif
@ -273,7 +267,7 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string,
return false; return false;
strncpy(buf, path, buflen); strncpy(buf, path, buflen);
LOGFQUEUE("Album art found: %s", path); logf("Album art found: %s", path);
return true; return true;
} }
@ -292,7 +286,7 @@ bool find_albumart(const struct mp3entry *id3, char *buf, int buflen)
if (!data) if (!data)
return false; 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". */ /* Write the size string, e.g. ".100x100". */
snprintf(size_string, sizeof(size_string), ".%dx%d", snprintf(size_string, sizeof(size_string), ".%dx%d",