diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-16 20:34:54 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-16 20:34:54 +0000 |
commit | d7757eb75c7263dd01d10a1b5a6f178b7ebf3ca3 (patch) | |
tree | 5b49bd840726b5d6fff364b816988741a50a7e22 | |
parent | 94f76513412cdaf8f3b98054f9c027b97093027e (diff) | |
download | rockbox-d7757eb75c7263dd01d10a1b5a6f178b7ebf3ca3.tar.gz rockbox-d7757eb75c7263dd01d10a1b5a6f178b7ebf3ca3.zip |
Fix Player, checkwps and database tools
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23215 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 4 | ||||
-rw-r--r-- | tools/checkwps/checkwps.c | 12 | ||||
-rw-r--r-- | tools/database/database.make | 1 |
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) | |||
337 | int elapsed, length; | 337 | int elapsed, length; |
338 | if (LIKELY(state->id3)) | 338 | if (LIKELY(state->id3)) |
339 | { | 339 | { |
340 | elapsed = id3->elapsed; | 340 | elapsed = state->id3->elapsed; |
341 | length = id3->length; | 341 | length = state->id3->length; |
342 | } | 342 | } |
343 | else | 343 | else |
344 | { | 344 | { |
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) | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | #ifdef HAVE_ALBUMART | ||
144 | int playback_claim_aa_slot(struct dim *dim) | ||
145 | { | ||
146 | return 0; | ||
147 | } | ||
148 | |||
149 | void playback_release_aa_slot(int slot) | ||
150 | { | ||
151 | return; | ||
152 | } | ||
153 | #endif | ||
154 | |||
143 | int resize_on_load(struct bitmap *bm, bool dither, | 155 | int resize_on_load(struct bitmap *bm, bool dither, |
144 | struct dim *src, struct rowset *tmp_row, | 156 | struct dim *src, struct rowset *tmp_row, |
145 | unsigned char *buf, unsigned int len, | 157 | 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 | |||
19 | INCLUDES = -I$(ROOTDIR)/apps/gui \ | 19 | INCLUDES = -I$(ROOTDIR)/apps/gui \ |
20 | -I$(ROOTDIR)/firmware/export \ | 20 | -I$(ROOTDIR)/firmware/export \ |
21 | -I$(ROOTDIR)/apps \ | 21 | -I$(ROOTDIR)/apps \ |
22 | -I$(ROOTDIR)/apps/recorder \ | ||
22 | -I$(APPSDIR) \ | 23 | -I$(APPSDIR) \ |
23 | -I$(BUILDDIR) \ | 24 | -I$(BUILDDIR) \ |
24 | 25 | ||