summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/id3.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/id3.c b/firmware/id3.c
index 448fcb22f3..e2f45468b2 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -35,7 +35,7 @@
35#include <ctype.h> 35#include <ctype.h>
36#include "config.h" 36#include "config.h"
37#include "file.h" 37#include "file.h"
38#include "debug.h" 38#include "logf.h"
39#include "atoi.h" 39#include "atoi.h"
40 40
41#include "id3.h" 41#include "id3.h"
@@ -841,7 +841,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
841 /* Keep track of the total size */ 841 /* Keep track of the total size */
842 totframelen = framelen; 842 totframelen = framelen;
843 843
844 DEBUGF("framelen = %ld\n", framelen); 844 logf("framelen = %ld", framelen);
845 if(framelen == 0){ 845 if(framelen == 0){
846 if (header[0] == 0 && header[1] == 0 && header[2] == 0) 846 if (header[0] == 0 && header[1] == 0 && header[2] == 0)
847 return; 847 return;
@@ -896,7 +896,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
896 if(framelen >= buffersize - bufferpos) 896 if(framelen >= buffersize - bufferpos)
897 framelen = buffersize - bufferpos - 1; 897 framelen = buffersize - bufferpos - 1;
898 898
899 DEBUGF("id3v2 frame: %.4s\n", header); 899 logf("id3v2 frame: %.4s", header);
900 900
901 /* Check for certain frame headers 901 /* Check for certain frame headers
902 902
@@ -1049,7 +1049,7 @@ int getid3v2len(int fd)
1049 else 1049 else
1050 offset = unsync(buf[0], buf[1], buf[2], buf[3]) + 10; 1050 offset = unsync(buf[0], buf[1], buf[2], buf[3]) + 10;
1051 1051
1052 DEBUGF("ID3V2 Length: 0x%x\n", offset); 1052 logf("ID3V2 Length: 0x%x", offset);
1053 return offset; 1053 return offset;
1054} 1054}
1055 1055
@@ -1076,7 +1076,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
1076 1076
1077 bytecount = get_mp3file_info(fd, &info); 1077 bytecount = get_mp3file_info(fd, &info);
1078 1078
1079 DEBUGF("Space between ID3V2 tag and first audio frame: 0x%lx bytes\n", 1079 logf("Space between ID3V2 tag and first audio frame: 0x%lx bytes",
1080 bytecount); 1080 bytecount);
1081 1081
1082 if(bytecount < 0) 1082 if(bytecount < 0)
@@ -1096,8 +1096,8 @@ static int getsonglength(int fd, struct mp3entry *entry)
1096 if ((info.byte_count > expected + diff) 1096 if ((info.byte_count > expected + diff)
1097 || (info.byte_count < expected - diff)) 1097 || (info.byte_count < expected - diff))
1098 { 1098 {
1099 DEBUGF("Note: info.byte_count differs from expected value by " 1099 logf("Note: info.byte_count differs from expected value by "
1100 "%ld bytes\n", labs((long) (expected - info.byte_count))); 1100 "%ld bytes", labs((long) (expected - info.byte_count)));
1101 info.byte_count = 0; 1101 info.byte_count = 0;
1102 info.frame_count = 0; 1102 info.frame_count = 0;
1103 info.file_time = 0; 1103 info.file_time = 0;
@@ -1161,7 +1161,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
1161 1161
1162 /* Update the seek point for the first playable frame */ 1162 /* Update the seek point for the first playable frame */
1163 entry->first_frame_offset = bytecount; 1163 entry->first_frame_offset = bytecount;
1164 DEBUGF("First frame is at %lx\n", entry->first_frame_offset); 1164 logf("First frame is at %lx", entry->first_frame_offset);
1165 1165
1166 return filetime; 1166 return filetime;
1167} 1167}