diff options
author | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
commit | fd3fe45bc14a0a540f2525102551c92a64a73b76 (patch) | |
tree | 1ef8103bbfa5b33f684a94bddc5ecb4685ec5e88 /firmware | |
parent | ce135909b9393d9824b3f69a70659400480cc069 (diff) | |
download | rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.gz rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.zip |
FS#7487 - mpegplayer - video start time seek with resume
by John S. Gwynne & Brian J. Morey
This should stop the patch from breaking again and give them opportunity to improve it further.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15052 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 5 | ||||
-rw-r--r-- | firmware/export/button.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 3daa08b2c3..d79a9333ff 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -293,6 +293,11 @@ static void button_boost(bool state) | |||
293 | } | 293 | } |
294 | #endif /* HAVE_ADJUSTABLE_CPU_FREQ */ | 294 | #endif /* HAVE_ADJUSTABLE_CPU_FREQ */ |
295 | 295 | ||
296 | int button_available( void ) | ||
297 | { | ||
298 | return queue_count(&button_queue); | ||
299 | } | ||
300 | |||
296 | long button_get(bool block) | 301 | long button_get(bool block) |
297 | { | 302 | { |
298 | struct event ev; | 303 | struct event ev; |
diff --git a/firmware/export/button.h b/firmware/export/button.h index 5322d814bf..881d7c424d 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -27,6 +27,7 @@ | |||
27 | extern struct event_queue button_queue; | 27 | extern struct event_queue button_queue; |
28 | 28 | ||
29 | void button_init (void); | 29 | void button_init (void); |
30 | int button_available(void); | ||
30 | long button_get (bool block); | 31 | long button_get (bool block); |
31 | long button_get_w_tmo(int ticks); | 32 | long button_get_w_tmo(int ticks); |
32 | intptr_t button_get_data(void); | 33 | intptr_t button_get_data(void); |