TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-13 19:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

playlist fix -fix for review comments (#1054)

Browse Source
This commit is contained in:
zxkmm 2023-05-24 00:28:50 +08:00 committed by GitHub
parent 9e63d80667
commit 22c9dd31bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/application/apps/ui_playlist.cpp
View File

@ -173,7 +173,7 @@ void PlaylistView::start() {
auto p = std::make_unique<FileReader>(); auto p = std::make_unique<FileReader>();
auto open_error = p->open(file_path); auto open_error = p->open(file_path);
if (open_error.is_valid()) { if (open_error.is_valid()) {
file_error("illegal grammar(176)"); file_error("Illegal grammar");
return; // Fixes TX bug if there's a file error return; // Fixes TX bug if there's a file error
} else { } else {
reader = std::move(p); reader = std::move(p);
@ -218,7 +218,7 @@ void PlaylistView::stop(const bool do_loop) {
// Notes of the logic here in case if it needed to be changed in the future: // Notes of the logic here in case if it needed to be changed in the future:
// 1. check_loop.value() is for the LOOP checkbox // 1. check_loop.value() is for the LOOP checkbox
// 2. do_loop is a part of the replay thread, not a user - control thing. // 2. do_loop is a part of the replay thread, not a user - control thing.
// 3. when (total_tracks != track_number) is true, it means that the current track is not the last track. // 3. when (total_tracks >= track_number) is true, it means that the current track is not the last track.
// Thus, (do_loop && (total_tracks != track_number)) is for the case when the start() func were called with true AND not the last track. // Thus, (do_loop && (total_tracks != track_number)) is for the case when the start() func were called with true AND not the last track.
// Which means it do loop until the last track. // Which means it do loop until the last track.
@ -236,7 +236,7 @@ void PlaylistView::stop(const bool do_loop) {
button_play.set_bitmap(&bitmap_play); button_play.set_bitmap(&bitmap_play);
} }
} else if (!check_loop.value()) { } else if (!check_loop.value()) {
if (do_loop && (total_tracks != track_number)) { if (do_loop && (total_tracks >= track_number)) {
if (playlist_db.size() > 0) { if (playlist_db.size() > 0) {
start(); start();
} else { } else {
@ -258,7 +258,7 @@ void PlaylistView::handle_replay_thread_done(const uint32_t return_code) {
stop(true); stop(true);
} else if (return_code == ReplayThread::READ_ERROR) { } else if (return_code == ReplayThread::READ_ERROR) {
stop(false); stop(false);
file_error("Illegal grammar(255)"); file_error("Replay thread read error");
} }
progressbar.set_value(0); progressbar.set_value(0);