diff options
-rw-r--r-- | apps/playback.c | 9 | ||||
-rw-r--r-- | apps/tagtree.c | 11 | ||||
-rw-r--r-- | docs/CREDITS | 1 |
3 files changed, 18 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c index e71e06b92c..e33a4ac507 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -2013,6 +2013,15 @@ static void audio_thread(void) | |||
2013 | LOGFQUEUE("audio < Q_AUDIO_FF_REWIND"); | 2013 | LOGFQUEUE("audio < Q_AUDIO_FF_REWIND"); |
2014 | if (!playing) | 2014 | if (!playing) |
2015 | break; | 2015 | break; |
2016 | |||
2017 | if ((long)ev.data == 0) | ||
2018 | { | ||
2019 | /* About to restart the track - send track finish | ||
2020 | events if not already done. */ | ||
2021 | if (thistrack_id3 == audio_current_track()) | ||
2022 | send_event(PLAYBACK_EVENT_TRACK_FINISH, thistrack_id3); | ||
2023 | } | ||
2024 | |||
2016 | if (automatic_skip) | 2025 | if (automatic_skip) |
2017 | { | 2026 | { |
2018 | /* An automatic track skip is in progress. Finalize it, | 2027 | /* An automatic track skip is in progress. Finalize it, |
diff --git a/apps/tagtree.c b/apps/tagtree.c index fa88a5941b..ecc9f44d4d 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -722,10 +722,15 @@ static void tagtree_track_finish_event(void *data) | |||
722 | } | 722 | } |
723 | tagcache_idx--; | 723 | tagcache_idx--; |
724 | 724 | ||
725 | /* Don't process unplayed tracks. */ | 725 | /* Don't process unplayed tracks, or tracks interrupted within the |
726 | if (id3->elapsed == 0) | 726 | first 15 seconds. */ |
727 | if (id3->elapsed == 0 | ||
728 | #if CONFIG_CODEC == SWCODEC /* HWCODEC doesn't have automatic_skip */ | ||
729 | || (id3->elapsed < 15 * 1000 && !automatic_skip) | ||
730 | #endif | ||
731 | ) | ||
727 | { | 732 | { |
728 | logf("not logging unplayed track"); | 733 | logf("not logging unplayed or skipped track"); |
729 | return; | 734 | return; |
730 | } | 735 | } |
731 | 736 | ||
diff --git a/docs/CREDITS b/docs/CREDITS index 9bbfc70d9b..88b2948ee6 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -584,6 +584,7 @@ Ante Maretic | |||
584 | Benjamin Brown | 584 | Benjamin Brown |
585 | Uwe Wiebach | 585 | Uwe Wiebach |
586 | Mikhail Titov | 586 | Mikhail Titov |
587 | Dave Slusher | ||
587 | 588 | ||
588 | The libmad team | 589 | The libmad team |
589 | The wavpack team | 590 | The wavpack team |