diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-06-17 10:36:42 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-06-17 10:36:42 +0000 |
commit | fc2bb6cd2086045d8261b0bf95703510a3aa1bc6 (patch) | |
tree | 9311df0d3118b4985aa6473770a4cd873b5d5fe6 /apps/main_menu.c | |
parent | dbf59f490e716a7cc92cbb999572c08236e4908d (diff) | |
download | rockbox-fc2bb6cd2086045d8261b0bf95703510a3aa1bc6.tar.gz rockbox-fc2bb6cd2086045d8261b0bf95703510a3aa1bc6.zip |
Made playlist shuffle an option instead of an action
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1031 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 25ab12e97b..fb286eca98 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -169,18 +169,29 @@ void scroll_speed(void) | |||
169 | 169 | ||
170 | void shuffle(void) | 170 | void shuffle(void) |
171 | { | 171 | { |
172 | bool done = false; | ||
173 | |||
172 | lcd_clear_display(); | 174 | lcd_clear_display(); |
173 | if(playlist.amount) { | 175 | lcd_puts(0,0,"[Shuffle]"); |
174 | lcd_puts(0,0,"Shuffling..."); | 176 | |
177 | while ( !done ) { | ||
178 | lcd_puts(0,1,playlist_shuffle ? "on " : "off"); | ||
175 | lcd_update(); | 179 | lcd_update(); |
176 | randomise_playlist( &playlist, current_tick ); | 180 | |
177 | lcd_puts(0,1,"Done."); | 181 | switch ( button_get(true) ) { |
178 | } | 182 | #ifdef HAVE_RECORDER_KEYPAD |
179 | else { | 183 | case BUTTON_LEFT: |
180 | lcd_puts(0,0,"No playlist"); | 184 | #else |
185 | case BUTTON_STOP: | ||
186 | #endif | ||
187 | done = true; | ||
188 | break; | ||
189 | |||
190 | default: | ||
191 | playlist_shuffle = !playlist_shuffle; | ||
192 | break; | ||
193 | } | ||
181 | } | 194 | } |
182 | lcd_update(); | ||
183 | sleep(HZ); | ||
184 | } | 195 | } |
185 | 196 | ||
186 | void main_menu(void) | 197 | void main_menu(void) |