diff options
-rw-r--r-- | apps/tree.c | 2 | ||||
-rw-r--r-- | apps/wps-display.c | 2 | ||||
-rw-r--r-- | apps/wps.c | 5 | ||||
-rw-r--r-- | firmware/mpeg.c | 12 | ||||
-rw-r--r-- | firmware/mpeg.h | 9 |
5 files changed, 22 insertions, 8 deletions
diff --git a/apps/tree.c b/apps/tree.c index 9689ac5ae9..d3ee244ff6 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -851,7 +851,7 @@ bool dirbrowse(char *root) | |||
851 | break; | 851 | break; |
852 | 852 | ||
853 | case BUTTON_ON: | 853 | case BUTTON_ON: |
854 | if (mpeg_is_playing()) | 854 | if (mpeg_status() & MPEG_STATUS_PLAY) |
855 | { | 855 | { |
856 | lcd_stop_scroll(); | 856 | lcd_stop_scroll(); |
857 | if (wps_show() == SYS_USB_CONNECTED) | 857 | if (wps_show() == SYS_USB_CONNECTED) |
diff --git a/apps/wps-display.c b/apps/wps-display.c index 72905e441b..98a1d8b632 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -576,7 +576,7 @@ void wps_display(struct mp3entry* id3) | |||
576 | { | 576 | { |
577 | lcd_clear_display(); | 577 | lcd_clear_display(); |
578 | 578 | ||
579 | if (!id3 && !mpeg_is_playing()) | 579 | if (!id3 && !(mpeg_status() & MPEG_STATUS_PLAY)) |
580 | { | 580 | { |
581 | #ifdef HAVE_LCD_CHARCELLS | 581 | #ifdef HAVE_LCD_CHARCELLS |
582 | lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); | 582 | lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); |
diff --git a/apps/wps.c b/apps/wps.c index a8b7900b0a..c8fafc5913 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -355,7 +355,8 @@ static bool ffwd_rew(int button) | |||
355 | } | 355 | } |
356 | else | 356 | else |
357 | { | 357 | { |
358 | if ( mpeg_is_playing() && id3 && id3->length ) | 358 | if ( (mpeg_status() & MPEG_STATUS_PLAY) && |
359 | id3 && id3->length ) | ||
359 | { | 360 | { |
360 | if (!paused) | 361 | if (!paused) |
361 | mpeg_pause(); | 362 | mpeg_pause(); |
@@ -907,7 +908,7 @@ int wps_show(void) | |||
907 | 908 | ||
908 | ff_rewind = false; | 909 | ff_rewind = false; |
909 | 910 | ||
910 | if(mpeg_is_playing()) | 911 | if(mpeg_status() & MPEG_STATUS_PLAY) |
911 | { | 912 | { |
912 | id3 = mpeg_current_track(); | 913 | id3 = mpeg_current_track(); |
913 | if (id3) { | 914 | if (id3) { |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 4d26d4b3fe..c6e95dd588 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -1528,9 +1528,17 @@ void mpeg_flush_and_reload_tracks(void) | |||
1528 | #endif | 1528 | #endif |
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | bool mpeg_is_playing(void) | 1531 | int mpeg_status(void) |
1532 | { | 1532 | { |
1533 | return is_playing; | 1533 | int ret = 0; |
1534 | |||
1535 | if(is_playing) | ||
1536 | ret |= MPEG_STATUS_PLAY; | ||
1537 | |||
1538 | if(paused) | ||
1539 | ret |= MPEG_STATUS_PAUSE; | ||
1540 | |||
1541 | return ret; | ||
1534 | } | 1542 | } |
1535 | 1543 | ||
1536 | #ifndef SIMULATOR | 1544 | #ifndef SIMULATOR |
diff --git a/firmware/mpeg.h b/firmware/mpeg.h index f2a2b38c6c..a67ca922c4 100644 --- a/firmware/mpeg.h +++ b/firmware/mpeg.h | |||
@@ -21,7 +21,8 @@ | |||
21 | 21 | ||
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | 23 | ||
24 | void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int bass_boost, int avc); | 24 | void mpeg_init(int volume, int bass, int treble, int balance, |
25 | int loudness, int bass_boost, int avc); | ||
25 | void mpeg_play(int offset); | 26 | void mpeg_play(int offset); |
26 | void mpeg_stop(void); | 27 | void mpeg_stop(void); |
27 | void mpeg_pause(void); | 28 | void mpeg_pause(void); |
@@ -30,7 +31,6 @@ void mpeg_next(void); | |||
30 | void mpeg_prev(void); | 31 | void mpeg_prev(void); |
31 | void mpeg_ff_rewind(int change); | 32 | void mpeg_ff_rewind(int change); |
32 | void mpeg_flush_and_reload_tracks(void); | 33 | void mpeg_flush_and_reload_tracks(void); |
33 | bool mpeg_is_playing(void); | ||
34 | void mpeg_sound_set(int setting, int value); | 34 | void mpeg_sound_set(int setting, int value); |
35 | int mpeg_sound_min(int setting); | 35 | int mpeg_sound_min(int setting); |
36 | int mpeg_sound_max(int setting); | 36 | int mpeg_sound_max(int setting); |
@@ -41,6 +41,7 @@ char *mpeg_sound_unit(int setting); | |||
41 | int mpeg_sound_numdecimals(int setting); | 41 | int mpeg_sound_numdecimals(int setting); |
42 | struct mp3entry* mpeg_current_track(void); | 42 | struct mp3entry* mpeg_current_track(void); |
43 | bool mpeg_has_changed_track(void); | 43 | bool mpeg_has_changed_track(void); |
44 | int mpeg_status(void); | ||
44 | #ifdef HAVE_MAS3587F | 45 | #ifdef HAVE_MAS3587F |
45 | void mpeg_set_pitch(int percent); | 46 | void mpeg_set_pitch(int percent); |
46 | #endif | 47 | #endif |
@@ -60,4 +61,8 @@ void mpeg_set_pitch(int percent); | |||
60 | #define MPEG_SOUND_MONO_LEFT 2 | 61 | #define MPEG_SOUND_MONO_LEFT 2 |
61 | #define MPEG_SOUND_MONO_RIGHT 3 | 62 | #define MPEG_SOUND_MONO_RIGHT 3 |
62 | 63 | ||
64 | #define MPEG_STATUS_PLAY 1 | ||
65 | #define MPEG_STATUS_PAUSE 2 | ||
66 | #define MPEG_STATUS_RECORD 4 | ||
67 | |||
63 | #endif | 68 | #endif |