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

Add showControls, error handling, optimisations

Browse Source 
Add a function to show button mappings using L + LEFT.
Added preliminary error handling that will be improved later to
determine playback issues.
Music is not stopped when an unsupported file is selected.
Some other minor modifications.

TODO:
Pause/play status does not show currently.
Obtain error status of playback thread.

Signed-off-by: Mahyar Koshkouei <deltabeard@users.noreply.github.com>
This commit is contained in:
Mahyar Koshkouei
2017-02-10 11:41:01 +00:00
parent 888c4a1505
commit 5b433f2396
6 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/main.c
View File

@@ -78,12 +78,27 @@ int main(int argc, char **argv)
if(kDown)
mill = osGetTime();
if((kHeld & KEY_L) && (kDown & (KEY_R | KEY_UP)))
if(kHeld & KEY_L)
{
togglePlayback();
continue;
/* Pause/Play */
if(kDown & (KEY_R | KEY_UP))
{
consoleSelect(&topScreen);
printf("\r%s", togglePlayback() == true ? "Paused" : "");
consoleSelect(&bottomScreen);
continue;
}
/* Show controls */
else if(kDown & KEY_LEFT)
{
consoleSelect(&topScreen);
showControls();
consoleSelect(&bottomScreen);
continue;
}
}
/* Stop */
if(kDown & KEY_X)
{
stopPlayback();
@@ -217,12 +232,28 @@ err:
goto out;
}
static void showControls(void)
{
printf("Button mappings:\n"
"Pause: L+R or L+Up\n"
"Stop: X\n"
"A: Open File\n"
"B: Go up folder\n"
"Start: Exit\n");
}
static int changeFile(const char* ep_file)
{
s32 prio;
static Thread thread = NULL;
static char* file = NULL;
if(ep_file != NULL && getFileType(ep_file) < 0)
{
puts("Unsupported file.");
return -1;
}
/**
* If music is playing, stop it. Only one playback thread should be playing
* at any time.
@@ -231,7 +262,6 @@ static int changeFile(const char* ep_file)
{
/* Tell the thread to stop playback before we join it */
stopPlayback();
puts("Stopping");
threadJoin(thread, U64_MAX);
threadFree(thread);