angel/mice-3ds
1
0
Fork 0
Code Issues Pull Requests Actions Releases 3 Activity

fix end of song detection

Browse Source
This commit is contained in:
Nicholas Lamicela
2025-01-24 19:55:24 -08:00
parent cf455d8381
commit 8d82a96dfa
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/main.c
View File

@@ -301,7 +301,6 @@ int main(int argc, char **argv)
struct playbackInfo_t playbackInfo = { 0 }; struct playbackInfo_t playbackInfo = { 0 };
volatile int error = 0; volatile int error = 0;
struct dirList_t dirList = { 0 }; struct dirList_t dirList = { 0 };
int doneEndOfTrack = 0;
gfxInitDefault(); gfxInitDefault();
consoleInit(GFX_TOP, &topScreenLog); consoleInit(GFX_TOP, &topScreenLog);
@@ -543,41 +542,51 @@ int main(int argc, char **argv)
changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo); changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo);
error = 0; error = 0;
doneEndOfTrack = 0;
continue; continue;
} }
} }
if (kDown & KEY_ZR && fileNum < fileMax) { if (kDown & KEY_ZR && fileNum < fileMax) {
fileNum += 1; fileNum += 1;
consoleSelect(&topScreenInfo);
consoleClear();
consoleSelect(&topScreenLog);
consoleClear();
changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo); changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo);
error = 0; error = 0;
doneEndOfTrack = 0; consoleSelect(&bottomScreen);
if(listDir(from, MAX_LIST, fileNum, dirList) < 0) err_print("Unable to list directory.");
continue; continue;
} }
if (kDown & KEY_ZL && fileNum > 0) { if (kDown & KEY_ZL && fileNum > 0) {
fileNum -= 1; fileNum -= 1;
consoleSelect(&topScreenInfo);
consoleClear();
consoleSelect(&topScreenLog);
consoleClear();
changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo); changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo);
error = 0; error = 0;
doneEndOfTrack = 0; consoleSelect(&bottomScreen);
if(listDir(from, MAX_LIST, fileNum, dirList) < 0) err_print("Unable to list directory.");
continue; continue;
} }
consoleSelect(&topScreenInfo);
printf("\033[2;0He %d d %d", error, doneEndOfTrack);
// play next song automatically // play next song automatically
if (error != -1 && doneEndOfTrack == 2) doneEndOfTrack = 0; if (error == -1) {
if (error == -1 && doneEndOfTrack == 0) doneEndOfTrack = 1; if (fileNum >= fileMax) {
if (doneEndOfTrack == 1) { error = 0;
doneEndOfTrack = 2; continue;
if (fileNum >= fileMax) continue; }
consoleSelect(&topScreenInfo);
printf("playing next");
fileNum += 1; fileNum += 1;
consoleSelect(&topScreenInfo);
consoleClear();
consoleSelect(&topScreenLog);
consoleClear();
changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo); changeFile(dirList.files[fileNum - dirList.dirNum - 1], &playbackInfo);
error = 0; error = 0;
consoleSelect(&bottomScreen);
if(listDir(from, MAX_LIST, fileNum, dirList) < 0) err_print("Unable to list directory.");
continue; continue;
} }