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

Put playback in separate thread (WIP)

Browse Source 
Selecting a file is possible whilst music is playing.
Additionally fixes #19, an issue where the Home would not appear whilst
music is playing.

TODO:
Remove printf from playback module.
Fix pause and stop.
Display errors properly using errno.

Signed-off-by: Mahyar Koshkouei <deltabeard@users.noreply.github.com>
This commit is contained in:
Mahyar Koshkouei
2017-02-09 17:14:10 +00:00
parent 4933cf554e
commit a06e17a66a
6 changed files with 103 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -51,7 +51,7 @@ EXTRA_OUTPUT_FILES :=
LIBRARY_DIRS := $(DEVKITPRO)/libctru $(DEVKITPRO)/portlibs/armv6k
LIBRARIES := mpg123 opusfile opus ogg ctru m
BUILD_FLAGS :=
BUILD_FLAGS := -Os
RUN_FLAGS :=
VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))

12
source/all.h
View File

@@ -11,6 +11,9 @@
do { fprintf(stderr, "\nError %d:%s(): %s %s\n", __LINE__, __func__, \
err, strerror(errno)); } while (0)
#define delete(ptr) \
free(ptr); ptr = NULL
struct decoder_fn
{
int (* init)(const char* file);
@@ -20,3 +23,12 @@ struct decoder_fn
uint64_t (* decode)(void*);
void (* exit)(void);
};
/* Controls playback status */
struct playback_t
{
bool stop;
bool pause;
char* file;
int err;
};

59
source/main.c
View File

@@ -26,6 +26,8 @@ int main(int argc, char **argv)
int fileMax;
int fileNum = 0;
int from = 0;
static Thread playbackThread = NULL;
struct playback_t playbackInfo;
gfxInitDefault();
sdmcInit();
@@ -66,6 +68,7 @@ int main(int argc, char **argv)
kDown = hidKeysDown();
kHeld = hidKeysHeld();
/* Exit ctrmus */
if(kDown & KEY_START)
break;
@@ -77,6 +80,18 @@ int main(int argc, char **argv)
if(kDown)
mill = osGetTime();
if((kHeld & KEY_L) && (kDown & KEY_R))
{
printf("Stopping? %p\n", &playbackInfo);
playbackInfo.stop = true;
}
if(kDown & KEY_X)
{
playbackInfo.pause = !playbackInfo.pause;
printf("Pausing?");
}
if((kDown & KEY_UP ||
((kHeld & KEY_UP) && (osGetTime() - mill > 500))) &&
fileNum > 0)
@@ -110,7 +125,7 @@ int main(int argc, char **argv)
* is selected.
*/
if((kDown & KEY_B) ||
((kDown & (KEY_A | KEY_R)) && (from == 0 && fileNum == 0)))
((kDown & KEY_A) && (from == 0 && fileNum == 0)))
{
if(chdir("..") != 0)
err_print("chdir");
@@ -125,7 +140,7 @@ int main(int argc, char **argv)
continue;
}
if(kDown & (KEY_A | KEY_R))
if(kDown & KEY_A)
{
int audioFileNum = 0;
DIR *dp;
@@ -160,7 +175,7 @@ int main(int argc, char **argv)
}
consoleSelect(&topScreen);
playFile(ep->d_name);
changeFile(ep->d_name, &playbackThread, &playbackInfo);
consoleSelect(&bottomScreen);
if(closedir(dp) != 0)
@@ -178,6 +193,10 @@ int main(int argc, char **argv)
out:
puts("Exiting...");
/* TODO: Stop all threads */
playbackInfo.stop = true;
threadJoin(playbackThread, 5 * 1000 * 1000);
threadFree(playbackThread);
gfxExit();
sdmcExit();
@@ -200,6 +219,40 @@ err:
goto out;
}
static int changeFile(const char* ep_file, Thread* playbackThread, struct playback_t* playbackInfoIn)
{
s32 prio;
Thread thread = *playbackThread;
struct playback_t playbackInfo = *playbackInfoIn;
printf("struct: %p, %p\n", playbackInfoIn, &playbackInfo);
/* If music is playing, stop it */
if(thread != NULL)
{
/* Tell the thread to stop playback before we join it */
playbackInfo.stop = true;
puts("Stopping");
/* Wait 5 seconds for playback to stop */
threadJoin(thread, 5 * 1000 * 1000);
threadFree(thread);
/* free allocated file string */
delete(playbackInfo.file);
}
memset(&playbackInfo, 0, sizeof(playbackInfo));
playbackInfo.file = strdup(ep_file);
printf("file: %s\n", ep_file);
printf("file: %s\n", playbackInfo.file);
svcGetThreadPriority(&prio, CUR_THREAD_HANDLE);
thread = threadCreate(playFile, &playbackInfo, 32 * 1024, prio - 1,
-2, false);
return 0;
}
/**
* List current directory.
*

2
source/main.h
View File

@@ -13,6 +13,8 @@
/* Maximum number of lines that can be displayed */
#define MAX_LIST 27
static int changeFile(const char* ep_file, Thread* thread, struct playback_t* playbackInfo);
/**
* Get number of files in current working folder
*

71
source/playback.c
View File

@@ -9,17 +9,21 @@
#include "playback.h"
#include "wav.h"
int playFile(const char* file)
void playFile(void* playbackInfoIn)
{
struct decoder_fn decoder;
struct playback_t* playbackInfo = playbackInfoIn;
int16_t* buffer1 = NULL;
int16_t* buffer2 = NULL;
ndspWaveBuf waveBuf[2];
bool playing = true;
bool lastbuf = false;
int ret;
int ret = -1;
const char* file = playbackInfo->file;
switch(getFileType(file))
printf("info: %p,%p\n", playbackInfo, playbackInfoIn);
switch(errno = getFileType(file))
{
case FILE_TYPE_WAV:
setWav(&decoder);
@@ -38,8 +42,8 @@ int playFile(const char* file)
break;
default:
printf("Unsupported File type.\n");
return 0;
playbackInfo->err = errno;
return;
}
if(R_FAILED(ndspInit()))
@@ -89,8 +93,6 @@ int playFile(const char* file)
while(playing == false || ndspChnIsPlaying(CHANNEL) == true)
{
u32 kDown;
/* Number of bytes read from file.
* Static only for the purposes of the printf debug at the bottom.
*/
@@ -100,17 +102,20 @@ int playFile(const char* file)
gfxFlushBuffers();
gspWaitForVBlank();
hidScanInput();
kDown = hidKeysDown();
//svcSleepThread(100 * 1000);
if(kDown & KEY_B)
break;
if(kDown & (KEY_A | KEY_R))
if(playbackInfo->stop == true)
{
playing = !playing;
ndspChnSetPaused(CHANNEL, !ndspChnIsPaused(CHANNEL));
printf("\33[2K\r%s", playing == false ? "Paused" : "");
puts("Stop recieved");
break;
}
if(playbackInfo->pause != ndspChnIsPaused(CHANNEL))
{
puts("Toggle");
/* TODO: Change playing to paused */
playing = !playbackInfo->pause;
ndspChnSetPaused(CHANNEL, playbackInfo->pause);
}
if(playing == false || lastbuf == true)
@@ -157,7 +162,7 @@ out:
ndspExit();
linearFree(buffer1);
linearFree(buffer2);
return 0;
return;
}
/**
@@ -172,18 +177,14 @@ int getFileType(const char *file)
int fileSig = 0;
enum file_types file_type = FILE_TYPE_ERROR;
/* Failure opening file */
if(ftest == NULL)
{
err_print("Opening file failed.");
printf("file: %s\n", file);
return -1;
}
return -errno;
if(fread(&fileSig, 4, 1, ftest) == 0)
{
err_print("Unable to read file.");
fclose(ftest);
return -1;
return -errno;
}
switch(fileSig)
@@ -191,43 +192,32 @@ int getFileType(const char *file)
// "RIFF"
case 0x46464952:
if(fseek(ftest, 4, SEEK_CUR) != 0)
{
err_print("Unable to seek.");
break;
}
return -errno;
// "WAVE"
// Check required as AVI file format also uses "RIFF".
if(fread(&fileSig, 4, 1, ftest) == 0)
{
err_print("Unable to read potential WAV file.");
break;
}
return -errno;
if(fileSig != 0x45564157)
break;
file_type = FILE_TYPE_WAV;
printf("File type is WAV.");
break;
// "fLaC"
case 0x43614c66:
file_type = FILE_TYPE_FLAC;
printf("File type is FLAC.");
break;
// "OggS"
case 0x5367674f:
if(isOpus(file) == 0)
{
printf("\nFile type is Opus.");
file_type = FILE_TYPE_OPUS;
}
else
{
file_type = FILE_TYPE_OGG;
printf("\nUnsupported audio in OGG container.");
return -ENOTSUP;
}
break;
@@ -241,12 +231,13 @@ int getFileType(const char *file)
(fileSig << 16) == 0xFAFF0000 ||
(fileSig << 8) == 0x33444900)
{
puts("File type is MP3.");
file_type = FILE_TYPE_MP3;
break;
}
printf("Unknown magic number: %#010x\n.", fileSig);
/* TODO: Add this again at some point */
//printf("Unknown magic number: %#010x\n.", fileSig);
return -ENOTSUP;
}
fclose(ftest);

2
source/playback.h
View File

@@ -7,7 +7,7 @@ enum file_types {
FILE_TYPE_MP3
};
int playFile(const char* file);
void playFile(void* playbackInfoIn);
/**
* Obtains file type.