From 9cb40ea5e33c9e57c4e4b10c519aef046a90c561 Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Tue, 3 Jul 2007 10:21:23 +0000
Subject: [PATCH] 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
---
 apps/FILES                  | 1 +
 apps/codecs/libwma/Makefile | 2 +-
 apps/codecs/wma.c           | 2 +-
 apps/metadata/asf.c         | 6 +++---
 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/*
 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 fc1cd6f690..0d7f966737 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 5303eb4287..a8e386a177 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 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)
     /* 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 14f4d552d1..c586a3f205 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