diff options
-rw-r--r-- | apps/FILES | 1 | ||||
-rw-r--r-- | apps/codecs/libwma/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/wma.c | 2 | ||||
-rw-r--r-- | apps/metadata/asf.c | 6 | ||||
-rw-r--r-- | apps/plugins/SOURCES | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/apps/FILES b/apps/FILES index 85d70cbe74..b6a0ce97f8 100644 --- a/apps/FILES +++ b/apps/FILES | |||
@@ -28,6 +28,7 @@ codecs/libmusepack/* | |||
28 | codecs/libspeex/* | 28 | codecs/libspeex/* |
29 | codecs/libspeex/speex/* | 29 | codecs/libspeex/speex/* |
30 | codecs/libwavpack/* | 30 | codecs/libwavpack/* |
31 | codecs/libwma/* | ||
31 | codecs/spc/* | 32 | codecs/spc/* |
32 | codecs/Tremor/* | 33 | codecs/Tremor/* |
33 | eqs/*.cfg | 34 | eqs/*.cfg |
diff --git a/apps/codecs/libwma/Makefile b/apps/codecs/libwma/Makefile index fc1cd6f690..0d7f966737 100644 --- a/apps/codecs/libwma/Makefile +++ b/apps/codecs/libwma/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
6 | # \/ \/ \/ \/ \/ | 6 | # \/ \/ \/ \/ \/ |
7 | # $Id: Makefile 11401 2006-10-30 18:14:12Z learman $ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c index 5303eb4287..a8e386a177 100644 --- a/apps/codecs/wma.c +++ b/apps/codecs/wma.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id: flac.c 12830 2007-03-18 09:50:53Z learman $ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2005 Dave Chapman | 10 | * Copyright (C) 2005 Dave Chapman |
11 | * | 11 | * |
diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c index 85d30f50fd..7bcfea22f0 100644 --- a/apps/metadata/asf.c +++ b/apps/metadata/asf.c | |||
@@ -151,7 +151,7 @@ static int asf_parse_header(int fd, struct mp3entry* id3) | |||
151 | /* Two reserved bytes - do we need to read them? */ | 151 | /* Two reserved bytes - do we need to read them? */ |
152 | lseek(fd, 2, SEEK_CUR); | 152 | lseek(fd, 2, SEEK_CUR); |
153 | 153 | ||
154 | DEBUGF("Read header - size=%d, subobjects=%lu\n",(int)header.size, subobjects); | 154 | DEBUGF("Read header - size=%d, subobjects=%d\n",(int)header.size, (int)subobjects); |
155 | 155 | ||
156 | if (subobjects > 0) { | 156 | if (subobjects > 0) { |
157 | header.datalen = header.size - 30; | 157 | header.datalen = header.size - 30; |
@@ -328,13 +328,13 @@ static int asf_parse_header(int fd, struct mp3entry* id3) | |||
328 | 328 | ||
329 | case 3: /* 32-bit int */ | 329 | case 3: /* 32-bit int */ |
330 | read_uint32le(fd, &tmp32); | 330 | read_uint32le(fd, &tmp32); |
331 | DEBUGF("Value=%lu\n",tmp32); | 331 | DEBUGF("Value=%u\n",(unsigned int)tmp32); |
332 | lseek(fd,length - 4,SEEK_CUR); | 332 | lseek(fd,length - 4,SEEK_CUR); |
333 | break; | 333 | break; |
334 | 334 | ||
335 | case 4: /* 64-bit int */ | 335 | case 4: /* 64-bit int */ |
336 | read_uint64le(fd, &tmp64); | 336 | read_uint64le(fd, &tmp64); |
337 | DEBUGF("Value=%llu\n",tmp64); | 337 | DEBUGF("Value=[64-bit int]\n"); |
338 | lseek(fd,length - 8,SEEK_CUR); | 338 | lseek(fd,length - 8,SEEK_CUR); |
339 | break; | 339 | break; |
340 | 340 | ||
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 14f4d552d1..c586a3f205 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -118,6 +118,7 @@ nim.c | |||
118 | mp3_encoder.c | 118 | mp3_encoder.c |
119 | midiplay.c | 119 | midiplay.c |
120 | wav2wv.c | 120 | wav2wv.c |
121 | test_codec.c | ||
121 | #else /* hardware codec platforms */ | 122 | #else /* hardware codec platforms */ |
122 | #ifndef HAVE_MMC /* not for Ondio, has no remote control pin */ | 123 | #ifndef HAVE_MMC /* not for Ondio, has no remote control pin */ |
123 | alpine_cdc.c | 124 | alpine_cdc.c |