Adapted to modified button_get() call

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

6 files changed, 7 insertions, 29 deletions

diff --git a/apps/credits.c b/apps/credits.c
index de27af2550..31662b0755 100644
--- a/apps/credits.c
+++ b/apps/credits.c
@@ -78,7 +78,7 @@ void show_credits(void)
             /* abort on keypress */
             for ( j=0;j<10;j++ ) {
                 sleep(DISPLAY_TIME/10);
-                if (button_get())
+                if (button_get(false))
                     return;
             }
             lcd_clear_display();
@@ -90,7 +90,7 @@ void show_credits(void)
         /* abort on keypress */
         for ( j=0;j<10;j++ ) {
             sleep(DISPLAY_TIME/10);
-            if (button_get())
+            if (button_get(false))
                 return;
         }
     }
diff --git a/apps/main_menu.c b/apps/main_menu.c
index 2c23c3185b..31fe73bdde 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -99,7 +99,7 @@ void show_splash(void)
     lcd_update();
     for ( i=0;i<10;i++) {
         sleep(HZ/10);
-        if (button_get())
+        if (button_get(false))
             break;
     }
 }
diff --git a/apps/menu.c b/apps/menu.c
index 027f1fcbea..c18a881e07 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -103,13 +103,7 @@ void menu_run(int m)
     menu_draw(m);
     
     while(1) {
-        key = button_get();
-        if(!key) {
-            sleep(1);
-            continue;
-        }
-        
-        switch(key) {
+        switch( button_get(true) ) {
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_UP:
 #else
diff --git a/apps/play.c b/apps/play.c
index b107b28d38..80c1019e13 100644
--- a/apps/play.c
+++ b/apps/play.c
@@ -89,13 +89,7 @@ void playtune(char *dir, char *file)
 #endif
 
     while(1) {
-        int key = button_get();
-
-        if(!key) {
-            sleep(30);
-            continue;
-        }
-        switch(key) {
+        switch ( button_get(true) ) {
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_OFF:
             case BUTTON_LEFT:
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index f6908a503f..c00b5cc431 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -44,14 +44,10 @@ static void soundsetting(int setting)
     lcd_puts(0,0,buf);
 
     while ( !done ) {
-        int key;
         snprintf(buf,sizeof buf,"%d %% ",value);
         lcd_puts(0,1,buf);
 
-        while ( !(key = button_get()) )
-            yield();
-
-        switch ( key ) {
+        switch ( button_get(true) ) {
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_UP:
 #else
diff --git a/apps/tree.c b/apps/tree.c
index 65ee43396f..30548139ad 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -178,13 +178,7 @@ bool dirbrowse(char *root)
 #endif
 
     while(1) {
-        int key = button_get();
-
-        if(!key) {
-            sleep(1);
-            continue;
-        }
-        switch(key) {
+        switch ( button_get(true) ) {
 #if defined(SIMULATOR) && defined(HAVE_RECODER_KEYPAD)
             case BUTTON_OFF:
                 return false;