diff options
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/apps/playback.c b/apps/playback.c index 71c592b3b5..dfe0ab7300 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -1290,6 +1290,7 @@ static void audio_clear_track_entries(bool buffered_only) | |||
1290 | 1290 | ||
1291 | static void audio_stop_playback(bool resume) | 1291 | static void audio_stop_playback(bool resume) |
1292 | { | 1292 | { |
1293 | logf("stop_playback:%d", resume); | ||
1293 | paused = false; | 1294 | paused = false; |
1294 | if (playing) | 1295 | if (playing) |
1295 | playlist_update_resume_info(resume ? audio_current_track() : NULL); | 1296 | playlist_update_resume_info(resume ? audio_current_track() : NULL); |
@@ -1526,7 +1527,7 @@ static int skip_next_track(void) | |||
1526 | { | 1527 | { |
1527 | logf("Loading from disk..."); | 1528 | logf("Loading from disk..."); |
1528 | ci.reload_codec = true; | 1529 | ci.reload_codec = true; |
1529 | queue_post(&audio_queue, AUDIO_PLAY, 0); | 1530 | //queue_post(&audio_queue, AUDIO_PLAY, 0); |
1530 | return SKIP_OK_DISK; | 1531 | return SKIP_OK_DISK; |
1531 | } | 1532 | } |
1532 | 1533 | ||
@@ -2026,22 +2027,25 @@ struct mp3entry* audio_current_track(void) | |||
2026 | 2027 | ||
2027 | if (track_count > 0 && cur_ti->taginfo_ready) | 2028 | if (track_count > 0 && cur_ti->taginfo_ready) |
2028 | return (struct mp3entry *)&cur_ti->id3; | 2029 | return (struct mp3entry *)&cur_ti->id3; |
2029 | else { | ||
2030 | filename = playlist_peek(0); | ||
2031 | if (!filename) | ||
2032 | filename = "No file!"; | ||
2033 | p = strrchr(filename, '/'); | ||
2034 | if (!p) | ||
2035 | p = filename; | ||
2036 | else | ||
2037 | p++; | ||
2038 | |||
2039 | memset(&temp_id3, 0, sizeof(struct mp3entry)); | ||
2040 | strncpy(temp_id3.path, p, sizeof(temp_id3.path)-1); | ||
2041 | temp_id3.title = &temp_id3.path[0]; | ||
2042 | 2030 | ||
2043 | return &temp_id3; | 2031 | filename = playlist_peek(0); |
2044 | } | 2032 | if (!filename) |
2033 | filename = "No file!"; | ||
2034 | |||
2035 | // if (tagcache_fill_tags(&temp_id3, filename)) | ||
2036 | // return &temp_id3; | ||
2037 | |||
2038 | p = strrchr(filename, '/'); | ||
2039 | if (!p) | ||
2040 | p = filename; | ||
2041 | else | ||
2042 | p++; | ||
2043 | |||
2044 | memset(&temp_id3, 0, sizeof(struct mp3entry)); | ||
2045 | strncpy(temp_id3.path, p, sizeof(temp_id3.path)-1); | ||
2046 | temp_id3.title = &temp_id3.path[0]; | ||
2047 | |||
2048 | return &temp_id3; | ||
2045 | } | 2049 | } |
2046 | 2050 | ||
2047 | struct mp3entry* audio_next_track(void) | 2051 | struct mp3entry* audio_next_track(void) |