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

main: fix autoplaying with directory in list (#83)

Browse Source
This commit is contained in:
Narayan
2025-10-10 03:07:35 -07:00
committed by GitHub
parent 227000e7e3
commit 909effaaef
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/main.c
View File

@@ -139,7 +139,7 @@ static int cmpstringp(const void *p1, const void *p2)
} }
/** /**
* Store the list of files and folders in current director to an array. * Store the list of files and folders in current directory to an array.
*/ */
static int getDir(struct dirList_t* dirList) static int getDir(struct dirList_t* dirList)
{ {
@@ -589,7 +589,8 @@ int main(int argc, char **argv)
keyRComboPressed = false; keyRComboPressed = false;
} }
bool goToNextFile = (kDown & KEY_ZR) || keyRActivation; bool goToNextFile = (kDown & KEY_ZR) || keyRActivation;
if (goToNextFile && fileNum < fileMax) { // check that next entry is a file
if (goToNextFile && fileNum < fileMax && dirList.dirNum < fileNum+1) {
fileNum += 1; fileNum += 1;
if(fileNum >= MAX_LIST && fileMax - fileNum >= 0 && if(fileNum >= MAX_LIST && fileMax - fileNum >= 0 &&
from < fileMax - MAX_LIST) from < fileMax - MAX_LIST)
@@ -613,8 +614,8 @@ int main(int argc, char **argv)
keyLComboPressed = false; keyLComboPressed = false;
} }
bool goToPrevFile = (kDown & KEY_ZL) || keyLActivation; bool goToPrevFile = (kDown & KEY_ZL) || keyLActivation;
// don't go to ../ // don't go to ../ and check that previous entry is a file
if (goToPrevFile && fileNum > 1) { if (goToPrevFile && fileNum > 1 && dirList.dirNum < fileNum-1) {
fileNum -= 1; fileNum -= 1;
if(fileMax - fileNum > MAX_LIST-2 && from != 0) if(fileMax - fileNum > MAX_LIST-2 && from != 0)
from--; from--;
@@ -631,7 +632,8 @@ int main(int argc, char **argv)
// play next song automatically // play next song automatically
if (error == -1) { if (error == -1) {
if (fileNum >= fileMax) { // don't try to play folders
if (fileNum >= fileMax || dirList.dirNum >= fileNum) {
error = 0; error = 0;
continue; continue;
} }