summaryrefslogtreecommitdiff
path: root/apps/playlist_viewer.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r--apps/playlist_viewer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index f1235301cf..64d57d7d2e 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -21,7 +21,7 @@
21#include <string.h> 21#include <string.h>
22#include <sprintf.h> 22#include <sprintf.h>
23#include "playlist.h" 23#include "playlist.h"
24#include "mpeg.h" 24#include "audio.h"
25#include "screens.h" 25#include "screens.h"
26#include "status.h" 26#include "status.h"
27#include "settings.h" 27#include "settings.h"
@@ -142,7 +142,7 @@ static bool initialize(char* filename, bool reload)
142{ 142{
143 char* buffer; 143 char* buffer;
144 int buffer_size; 144 int buffer_size;
145 bool is_playing = mpeg_status() & MPEG_STATUS_PLAY; 145 bool is_playing = audio_status() & AUDIO_STATUS_PLAY;
146 146
147 if (!filename && !is_playing) 147 if (!filename && !is_playing)
148 /* Nothing is playing, exit */ 148 /* Nothing is playing, exit */
@@ -702,7 +702,7 @@ static int onplay_menu(int index)
702 case 0: 702 case 0:
703 /* delete track */ 703 /* delete track */
704 if (current) 704 if (current)
705 mpeg_stop(); 705 audio_stop();
706 706
707 playlist_delete(viewer.playlist, tracks[index].index); 707 playlist_delete(viewer.playlist, tracks[index].index);
708 708
@@ -714,7 +714,7 @@ static int onplay_menu(int index)
714 global_settings.repeat_mode == REPEAT_ALL) 714 global_settings.repeat_mode == REPEAT_ALL)
715 { 715 {
716 talk_buffer_steal(); /* will use the mp3 buffer */ 716 talk_buffer_steal(); /* will use the mp3 buffer */
717 mpeg_play(0); 717 audio_play(0);
718 viewer.current_playing_track = -1; 718 viewer.current_playing_track = -1;
719 } 719 }
720 } 720 }
@@ -838,7 +838,7 @@ bool playlist_viewer_ex(char* filename)
838 { 838 {
839 int track; 839 int track;
840 840
841 if (!viewer.playlist && !(mpeg_status() & MPEG_STATUS_PLAY)) 841 if (!viewer.playlist && !(audio_status() & AUDIO_STATUS_PLAY))
842 { 842 {
843 /* Play has stopped */ 843 /* Play has stopped */
844#ifdef HAVE_LCD_CHARCELLS 844#ifdef HAVE_LCD_CHARCELLS
@@ -954,14 +954,14 @@ bool playlist_viewer_ex(char* filename)
954 else if (!viewer.playlist) 954 else if (!viewer.playlist)
955 { 955 {
956 /* Stop current track and play new track */ 956 /* Stop current track and play new track */
957 mpeg_stop(); 957 audio_stop();
958 playlist_start(tracks[INDEX(viewer.cursor_pos)].index, 0); 958 playlist_start(tracks[INDEX(viewer.cursor_pos)].index, 0);
959 update_playlist(false); 959 update_playlist(false);
960 } 960 }
961 else 961 else
962 { 962 {
963 /* Play track from playlist on disk */ 963 /* Play track from playlist on disk */
964 mpeg_stop(); 964 audio_stop();
965 965
966 /* New playlist */ 966 /* New playlist */
967 if (playlist_set_current(viewer.playlist) < 0) 967 if (playlist_set_current(viewer.playlist) < 0)