diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-05-28 12:10:12 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-05-28 12:10:12 +0000 |
commit | 856a13a2d2f230d390fea35395f3ed64df803952 (patch) | |
tree | efa0589e042357fb6eb99e1609e69c7b4e90d125 /apps | |
parent | f0085673799e0d7f20d9ba6a799147dfaf2dedc1 (diff) | |
download | rockbox-856a13a2d2f230d390fea35395f3ed64df803952.tar.gz rockbox-856a13a2d2f230d390fea35395f3ed64df803952.zip |
Adapted to modified button_get() call
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@760 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/credits.c | 4 | ||||
-rw-r--r-- | apps/main_menu.c | 2 | ||||
-rw-r--r-- | apps/menu.c | 8 | ||||
-rw-r--r-- | apps/play.c | 8 | ||||
-rw-r--r-- | apps/sound_menu.c | 6 | ||||
-rw-r--r-- | apps/tree.c | 8 |
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) | |||
78 | /* abort on keypress */ | 78 | /* abort on keypress */ |
79 | for ( j=0;j<10;j++ ) { | 79 | for ( j=0;j<10;j++ ) { |
80 | sleep(DISPLAY_TIME/10); | 80 | sleep(DISPLAY_TIME/10); |
81 | if (button_get()) | 81 | if (button_get(false)) |
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | lcd_clear_display(); | 84 | lcd_clear_display(); |
@@ -90,7 +90,7 @@ void show_credits(void) | |||
90 | /* abort on keypress */ | 90 | /* abort on keypress */ |
91 | for ( j=0;j<10;j++ ) { | 91 | for ( j=0;j<10;j++ ) { |
92 | sleep(DISPLAY_TIME/10); | 92 | sleep(DISPLAY_TIME/10); |
93 | if (button_get()) | 93 | if (button_get(false)) |
94 | return; | 94 | return; |
95 | } | 95 | } |
96 | } | 96 | } |
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) | |||
99 | lcd_update(); | 99 | lcd_update(); |
100 | for ( i=0;i<10;i++) { | 100 | for ( i=0;i<10;i++) { |
101 | sleep(HZ/10); | 101 | sleep(HZ/10); |
102 | if (button_get()) | 102 | if (button_get(false)) |
103 | break; | 103 | break; |
104 | } | 104 | } |
105 | } | 105 | } |
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) | |||
103 | menu_draw(m); | 103 | menu_draw(m); |
104 | 104 | ||
105 | while(1) { | 105 | while(1) { |
106 | key = button_get(); | 106 | switch( button_get(true) ) { |
107 | if(!key) { | ||
108 | sleep(1); | ||
109 | continue; | ||
110 | } | ||
111 | |||
112 | switch(key) { | ||
113 | #ifdef HAVE_RECORDER_KEYPAD | 107 | #ifdef HAVE_RECORDER_KEYPAD |
114 | case BUTTON_UP: | 108 | case BUTTON_UP: |
115 | #else | 109 | #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) | |||
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | while(1) { | 91 | while(1) { |
92 | int key = button_get(); | 92 | switch ( button_get(true) ) { |
93 | |||
94 | if(!key) { | ||
95 | sleep(30); | ||
96 | continue; | ||
97 | } | ||
98 | switch(key) { | ||
99 | #ifdef HAVE_RECORDER_KEYPAD | 93 | #ifdef HAVE_RECORDER_KEYPAD |
100 | case BUTTON_OFF: | 94 | case BUTTON_OFF: |
101 | case BUTTON_LEFT: | 95 | 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) | |||
44 | lcd_puts(0,0,buf); | 44 | lcd_puts(0,0,buf); |
45 | 45 | ||
46 | while ( !done ) { | 46 | while ( !done ) { |
47 | int key; | ||
48 | snprintf(buf,sizeof buf,"%d %% ",value); | 47 | snprintf(buf,sizeof buf,"%d %% ",value); |
49 | lcd_puts(0,1,buf); | 48 | lcd_puts(0,1,buf); |
50 | 49 | ||
51 | while ( !(key = button_get()) ) | 50 | switch ( button_get(true) ) { |
52 | yield(); | ||
53 | |||
54 | switch ( key ) { | ||
55 | #ifdef HAVE_RECORDER_KEYPAD | 51 | #ifdef HAVE_RECORDER_KEYPAD |
56 | case BUTTON_UP: | 52 | case BUTTON_UP: |
57 | #else | 53 | #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) | |||
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | while(1) { | 180 | while(1) { |
181 | int key = button_get(); | 181 | switch ( button_get(true) ) { |
182 | |||
183 | if(!key) { | ||
184 | sleep(1); | ||
185 | continue; | ||
186 | } | ||
187 | switch(key) { | ||
188 | #if defined(SIMULATOR) && defined(HAVE_RECODER_KEYPAD) | 182 | #if defined(SIMULATOR) && defined(HAVE_RECODER_KEYPAD) |
189 | case BUTTON_OFF: | 183 | case BUTTON_OFF: |
190 | return false; | 184 | return false; |