diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-07-03 10:21:23 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-07-03 10:21:23 +0000 |
| commit | 9cb40ea5e33c9e57c4e4b10c519aef046a90c561 (patch) | |
| tree | 6d6d8bbabac6c8c0c90d7fa9317ad6b68b8baa2d /apps | |
| parent | fe163c51786fe9d0a0bdf8d38ad32bcfc3a518ab (diff) | |
| download | rockbox-9cb40ea5e33c9e57c4e4b10c519aef046a90c561.zip rockbox-9cb40ea5e33c9e57c4e4b10c519aef046a90c561.tar.gz rockbox-9cb40ea5e33c9e57c4e4b10c519aef046a90c561.tar.bz2 rockbox-9cb40ea5e33c9e57c4e4b10c519aef046a90c561.tar.xz | |
WMA clean-up commit - fix 64-bit sim warnings, set svn keywords property, and add new files to apps/FILES
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13771 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -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
@@ -28,6 +28,7 @@ codecs/libmusepack/* codecs/libspeex/* codecs/libspeex/speex/* codecs/libwavpack/* +codecs/libwma/* codecs/spc/* codecs/Tremor/* eqs/*.cfg diff --git a/apps/codecs/libwma/Makefile b/apps/codecs/libwma/Makefile index fc1cd6f..0d7f966 100644 --- a/apps/codecs/libwma/Makefile +++ b/apps/codecs/libwma/Makefile @@ -4,7 +4,7 @@ # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ # \/ \/ \/ \/ \/ -# $Id: Makefile 11401 2006-10-30 18:14:12Z learman $ +# $Id$ # INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c index 5303eb4..a8e386a 100644 --- a/apps/codecs/wma.c +++ b/apps/codecs/wma.c @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: flac.c 12830 2007-03-18 09:50:53Z learman $ + * $Id$ * * Copyright (C) 2005 Dave Chapman * diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c index 85d30f5..7bcfea2 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) /* Two reserved bytes - do we need to read them? */ lseek(fd, 2, SEEK_CUR); - DEBUGF("Read header - size=%d, subobjects=%lu\n",(int)header.size, subobjects); + DEBUGF("Read header - size=%d, subobjects=%d\n",(int)header.size, (int)subobjects); if (subobjects > 0) { header.datalen = header.size - 30; @@ -328,13 +328,13 @@ static int asf_parse_header(int fd, struct mp3entry* id3) case 3: /* 32-bit int */ read_uint32le(fd, &tmp32); - DEBUGF("Value=%lu\n",tmp32); + DEBUGF("Value=%u\n",(unsigned int)tmp32); lseek(fd,length - 4,SEEK_CUR); break; case 4: /* 64-bit int */ read_uint64le(fd, &tmp64); - DEBUGF("Value=%llu\n",tmp64); + DEBUGF("Value=[64-bit int]\n"); lseek(fd,length - 8,SEEK_CUR); break; diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 14f4d55..c586a3f 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -118,6 +118,7 @@ nim.c mp3_encoder.c midiplay.c wav2wv.c +test_codec.c #else /* hardware codec platforms */ #ifndef HAVE_MMC /* not for Ondio, has no remote control pin */ alpine_cdc.c |