diff options
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/screens.c b/apps/screens.c index f56c28a165..1d11fdbb5e 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "lang.h" | 25 | #include "lang.h" |
26 | #include "icons.h" | 26 | #include "icons.h" |
27 | #include "font.h" | 27 | #include "font.h" |
28 | #include "mpeg.h" | 28 | #include "audio.h" |
29 | #include "mp3_playback.h" | 29 | #include "mp3_playback.h" |
30 | #include "usb.h" | 30 | #include "usb.h" |
31 | #include "settings.h" | 31 | #include "settings.h" |
@@ -452,17 +452,17 @@ int pitch_screen(void) | |||
452 | break; | 452 | break; |
453 | 453 | ||
454 | case BUTTON_ON | BUTTON_PLAY: | 454 | case BUTTON_ON | BUTTON_PLAY: |
455 | mpeg_pause(); | 455 | audio_pause(); |
456 | used = true; | 456 | used = true; |
457 | break; | 457 | break; |
458 | 458 | ||
459 | case BUTTON_PLAY | BUTTON_REL: | 459 | case BUTTON_PLAY | BUTTON_REL: |
460 | mpeg_resume(); | 460 | audio_resume(); |
461 | used = true; | 461 | used = true; |
462 | break; | 462 | break; |
463 | 463 | ||
464 | case BUTTON_ON | BUTTON_PLAY | BUTTON_REL: | 464 | case BUTTON_ON | BUTTON_PLAY | BUTTON_REL: |
465 | mpeg_resume(); | 465 | audio_resume(); |
466 | exit = true; | 466 | exit = true; |
467 | break; | 467 | break; |
468 | 468 | ||
@@ -651,7 +651,7 @@ bool quick_screen(int context, int button) | |||
651 | global_settings.playlist_shuffle = | 651 | global_settings.playlist_shuffle = |
652 | !global_settings.playlist_shuffle; | 652 | !global_settings.playlist_shuffle; |
653 | 653 | ||
654 | if(mpeg_status() & MPEG_STATUS_PLAY) | 654 | if(audio_status() & AUDIO_STATUS_PLAY) |
655 | { | 655 | { |
656 | if (global_settings.playlist_shuffle) | 656 | if (global_settings.playlist_shuffle) |
657 | playlist_randomise(NULL, current_tick, true); | 657 | playlist_randomise(NULL, current_tick, true); |
@@ -727,7 +727,7 @@ bool quick_screen(int context, int button) | |||
727 | case BUTTON_F2: | 727 | case BUTTON_F2: |
728 | 728 | ||
729 | if ( oldrepeat != global_settings.repeat_mode ) | 729 | if ( oldrepeat != global_settings.repeat_mode ) |
730 | mpeg_flush_and_reload_tracks(); | 730 | audio_flush_and_reload_tracks(); |
731 | 731 | ||
732 | break; | 732 | break; |
733 | case BUTTON_F3: | 733 | case BUTTON_F3: |
@@ -1254,14 +1254,14 @@ bool shutdown_screen(void) | |||
1254 | 1254 | ||
1255 | bool browse_id3(void) | 1255 | bool browse_id3(void) |
1256 | { | 1256 | { |
1257 | struct mp3entry* id3 = mpeg_current_track(); | 1257 | struct mp3entry* id3 = audio_current_track(); |
1258 | int button; | 1258 | int button; |
1259 | int menu_pos = 0; | 1259 | int menu_pos = 0; |
1260 | int menu_max = 8; | 1260 | int menu_max = 8; |
1261 | bool exit = false; | 1261 | bool exit = false; |
1262 | char scroll_text[MAX_PATH]; | 1262 | char scroll_text[MAX_PATH]; |
1263 | 1263 | ||
1264 | if (!(mpeg_status() & MPEG_STATUS_PLAY)) | 1264 | if (!(audio_status() & AUDIO_STATUS_PLAY)) |
1265 | return false; | 1265 | return false; |
1266 | 1266 | ||
1267 | while (!exit) | 1267 | while (!exit) |