diff options
Diffstat (limited to 'apps/playlist.c')
-rw-r--r-- | apps/playlist.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index cb9d2ba3ea..3370937a69 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -73,7 +73,7 @@ | |||
73 | #include "dir.h" | 73 | #include "dir.h" |
74 | #include "sprintf.h" | 74 | #include "sprintf.h" |
75 | #include "debug.h" | 75 | #include "debug.h" |
76 | #include "mpeg.h" | 76 | #include "audio.h" |
77 | #include "lcd.h" | 77 | #include "lcd.h" |
78 | #include "kernel.h" | 78 | #include "kernel.h" |
79 | #include "settings.h" | 79 | #include "settings.h" |
@@ -348,7 +348,7 @@ static int add_indices_to_playlist(struct playlist_info* playlist, | |||
348 | if (!buffer) | 348 | if (!buffer) |
349 | { | 349 | { |
350 | /* use mp3 buffer for maximum load speed */ | 350 | /* use mp3 buffer for maximum load speed */ |
351 | mpeg_stop(); | 351 | audio_stop(); |
352 | talk_buffer_steal(); /* we use the mp3 buffer, need to tell */ | 352 | talk_buffer_steal(); /* we use the mp3 buffer, need to tell */ |
353 | 353 | ||
354 | buffer = mp3buf; | 354 | buffer = mp3buf; |
@@ -629,7 +629,7 @@ static int add_directory_to_playlist(struct playlist_info* playlist, | |||
629 | display_playlist_count(*count, count_str); | 629 | display_playlist_count(*count, count_str); |
630 | 630 | ||
631 | if (*count == PLAYLIST_DISPLAY_COUNT) | 631 | if (*count == PLAYLIST_DISPLAY_COUNT) |
632 | mpeg_flush_and_reload_tracks(); | 632 | audio_flush_and_reload_tracks(); |
633 | } | 633 | } |
634 | 634 | ||
635 | /* let the other threads work */ | 635 | /* let the other threads work */ |
@@ -1625,7 +1625,7 @@ int playlist_start(int start_index, int offset) | |||
1625 | 1625 | ||
1626 | playlist->index = start_index; | 1626 | playlist->index = start_index; |
1627 | talk_buffer_steal(); /* will use the mp3 buffer */ | 1627 | talk_buffer_steal(); /* will use the mp3 buffer */ |
1628 | mpeg_play(offset); | 1628 | audio_play(offset); |
1629 | 1629 | ||
1630 | return 0; | 1630 | return 0; |
1631 | } | 1631 | } |
@@ -1932,7 +1932,7 @@ int playlist_insert_track(struct playlist_info* playlist, const char *filename, | |||
1932 | if (result != -1) | 1932 | if (result != -1) |
1933 | { | 1933 | { |
1934 | fsync(playlist->control_fd); | 1934 | fsync(playlist->control_fd); |
1935 | mpeg_flush_and_reload_tracks(); | 1935 | audio_flush_and_reload_tracks(); |
1936 | } | 1936 | } |
1937 | 1937 | ||
1938 | return result; | 1938 | return result; |
@@ -1970,7 +1970,7 @@ int playlist_insert_directory(struct playlist_info* playlist, | |||
1970 | fsync(playlist->control_fd); | 1970 | fsync(playlist->control_fd); |
1971 | 1971 | ||
1972 | display_playlist_count(count, count_str); | 1972 | display_playlist_count(count, count_str); |
1973 | mpeg_flush_and_reload_tracks(); | 1973 | audio_flush_and_reload_tracks(); |
1974 | 1974 | ||
1975 | return result; | 1975 | return result; |
1976 | } | 1976 | } |
@@ -2063,7 +2063,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename, | |||
2063 | display_playlist_count(count, count_str); | 2063 | display_playlist_count(count, count_str); |
2064 | 2064 | ||
2065 | if (count == PLAYLIST_DISPLAY_COUNT) | 2065 | if (count == PLAYLIST_DISPLAY_COUNT) |
2066 | mpeg_flush_and_reload_tracks(); | 2066 | audio_flush_and_reload_tracks(); |
2067 | } | 2067 | } |
2068 | } | 2068 | } |
2069 | 2069 | ||
@@ -2078,7 +2078,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename, | |||
2078 | *temp_ptr = '/'; | 2078 | *temp_ptr = '/'; |
2079 | 2079 | ||
2080 | display_playlist_count(count, count_str); | 2080 | display_playlist_count(count, count_str); |
2081 | mpeg_flush_and_reload_tracks(); | 2081 | audio_flush_and_reload_tracks(); |
2082 | 2082 | ||
2083 | return result; | 2083 | return result; |
2084 | } | 2084 | } |
@@ -2106,7 +2106,7 @@ int playlist_delete(struct playlist_info* playlist, int index) | |||
2106 | result = remove_track_from_playlist(playlist, index, true); | 2106 | result = remove_track_from_playlist(playlist, index, true); |
2107 | 2107 | ||
2108 | if (result != -1) | 2108 | if (result != -1) |
2109 | mpeg_flush_and_reload_tracks(); | 2109 | audio_flush_and_reload_tracks(); |
2110 | 2110 | ||
2111 | return result; | 2111 | return result; |
2112 | } | 2112 | } |
@@ -2194,7 +2194,7 @@ int playlist_move(struct playlist_info* playlist, int index, int new_index) | |||
2194 | } | 2194 | } |
2195 | 2195 | ||
2196 | fsync(playlist->control_fd); | 2196 | fsync(playlist->control_fd); |
2197 | mpeg_flush_and_reload_tracks(); | 2197 | audio_flush_and_reload_tracks(); |
2198 | } | 2198 | } |
2199 | } | 2199 | } |
2200 | 2200 | ||
@@ -2215,7 +2215,7 @@ int playlist_randomise(struct playlist_info* playlist, unsigned int seed, | |||
2215 | result = randomise_playlist(playlist, seed, start_current, true); | 2215 | result = randomise_playlist(playlist, seed, start_current, true); |
2216 | 2216 | ||
2217 | if (result != -1) | 2217 | if (result != -1) |
2218 | mpeg_flush_and_reload_tracks(); | 2218 | audio_flush_and_reload_tracks(); |
2219 | 2219 | ||
2220 | return result; | 2220 | return result; |
2221 | } | 2221 | } |
@@ -2233,7 +2233,7 @@ int playlist_sort(struct playlist_info* playlist, bool start_current) | |||
2233 | result = sort_playlist(playlist, start_current, true); | 2233 | result = sort_playlist(playlist, start_current, true); |
2234 | 2234 | ||
2235 | if (result != -1) | 2235 | if (result != -1) |
2236 | mpeg_flush_and_reload_tracks(); | 2236 | audio_flush_and_reload_tracks(); |
2237 | 2237 | ||
2238 | return result; | 2238 | return result; |
2239 | } | 2239 | } |