Fix Player, checkwps and database tools

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23215 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 15 insertions, 2 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index a5ea28619a..8abbcddb39 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -337,8 +337,8 @@ static void draw_player_fullbar(struct gui_wps *gwps, char* buf, int buf_size)
     int elapsed, length;
     if (LIKELY(state->id3))
     {
-        elapsed = id3->elapsed;
-        length = id3->length;
+        elapsed = state->id3->elapsed;
+        length = state->id3->length;
     }
     else
     {
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 079454def1..93487bcd89 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -140,6 +140,18 @@ int recalc_dimension(struct dim *dst, struct dim *src)
     return 0;
 }
 
+#ifdef HAVE_ALBUMART
+int playback_claim_aa_slot(struct dim *dim)
+{
+    return 0;
+}
+
+void playback_release_aa_slot(int slot)
+{
+    return;
+}
+#endif
+
 int resize_on_load(struct bitmap *bm, bool dither,
                    struct dim *src, struct rowset *tmp_row,
                    unsigned char *buf, unsigned int len,
diff --git a/tools/database/database.make b/tools/database/database.make
index a32031f73c..a94aa55c78 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -19,6 +19,7 @@ FIRMINC = -I$(ROOTDIR)/firmware/include -fno-builtin
 INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(ROOTDIR)/firmware/export \
            -I$(ROOTDIR)/apps \
+           -I$(ROOTDIR)/apps/recorder \
            -I$(APPSDIR) \
            -I$(BUILDDIR) \