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

Use DSP instead of CSND

Browse Source 
Signed-off-by: Mahyar Koshkouei <deltabeard@users.noreply.github.com>
This commit is contained in:
Mahyar Koshkouei
2016-11-22 23:58:44 +00:00
parent c346f60f16
commit c31c872621
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/main.c
View File

@@ -16,6 +16,7 @@
#define BUFFER_SIZE 1 * 1024 * 1024 #define BUFFER_SIZE 1 * 1024 * 1024
#define AUDIO_FOLDER "sdmc:/MUSIC/" #define AUDIO_FOLDER "sdmc:/MUSIC/"
#define CHANNEL 8
int main() int main()
{ {
@@ -27,9 +28,9 @@ int main()
gfxInitDefault(); gfxInitDefault();
consoleInit(GFX_BOTTOM, NULL); consoleInit(GFX_BOTTOM, NULL);
if(R_FAILED(csndInit())) if(R_FAILED(ndspInit()))
{ {
printf("Error %d: Could not initialize CSND.", __LINE__); printf("Error %d: Could not initialize ndsp.", __LINE__);
goto out; goto out;
} }
@@ -55,6 +56,9 @@ int main()
goto out; goto out;
} }
ndspSetOutputMode(NDSP_OUTPUT_STEREO);
ndspSetOutputCount(1);
while(aptMainLoop()) while(aptMainLoop())
{ {
u32 kDown; u32 kDown;
@@ -105,7 +109,7 @@ int main()
out: out:
puts("Exiting..."); puts("Exiting...");
csndExit(); ndspExit();
gfxExit(); gfxExit();
return 0; return 0;
} }
@@ -129,6 +133,7 @@ int playWav(const char *wav)
off_t bytesRead1; off_t bytesRead1;
off_t bytesRead2; off_t bytesRead2;
off_t size; off_t size;
ndspWaveBuf waveBuf;
if(file == NULL) if(file == NULL)
{ {
@@ -172,6 +177,12 @@ int playWav(const char *wav)
printf("Format: %s(%d), Ch: %d, Sam: %lu, bit: %lu\n", printf("Format: %s(%d), Ch: %d, Sam: %lu, bit: %lu\n",
format == 1 ? "PCM" : "Other", format, channels, sample, bitness); format == 1 ? "PCM" : "Other", format, channels, sample, bitness);
if(channels > 2)
{
puts("Error: Invalid number of channels.");
goto out;
}
/** /**
* Playing ADPCM, and 8 bit WAV files are disabled as they both sound like * Playing ADPCM, and 8 bit WAV files are disabled as they both sound like
* complete garbage. * complete garbage.
@@ -179,12 +190,12 @@ int playWav(const char *wav)
switch(bitness) switch(bitness)
{ {
case 8: case 8:
bitness = SOUND_FORMAT_8BIT; bitness = channels == 2 ? NDSP_FORMAT_STEREO_PCM8 : NDSP_FORMAT_MONO_PCM8;
puts("8bit playback disabled."); puts("8bit playback disabled.");
goto out; goto out;
case 16: case 16:
bitness = SOUND_FORMAT_16BIT; bitness = channels == 2 ? NDSP_FORMAT_STEREO_PCM16 : NDSP_FORMAT_MONO_PCM16;
break; break;
default: default:
@@ -192,6 +203,14 @@ int playWav(const char *wav)
goto out; goto out;
} }
ndspChnReset(CHANNEL);
ndspChnSetInterp(CHANNEL, NDSP_INTERP_NONE);
ndspChnSetRate(CHANNEL, sample);
ndspChnSetFormat(CHANNEL, bitness);
memset(&waveBuf, 0, sizeof(ndspWaveBuf));
waveBuf.data_vaddr = buffer1;
waveBuf.status = NDSP_WBUF_FREE;
printf("Playing %s\n", wav); printf("Playing %s\n", wav);
while((bytesRead1 = fread(buffer1, 1, size, file)) > 0) while((bytesRead1 = fread(buffer1, 1, size, file)) > 0)
@@ -201,12 +220,10 @@ int playWav(const char *wav)
if(R_FAILED(GSPGPU_FlushDataCache(buffer1, size))) if(R_FAILED(GSPGPU_FlushDataCache(buffer1, size)))
puts("Flush failed."); puts("Flush failed.");
while(status != 0) while(ndspChnIsPlaying(8))
{ {
u32 kDown; u32 kDown;
csndIsPlaying(8, &status);
hidScanInput(); hidScanInput();
kDown = hidKeysDown(); kDown = hidKeysDown();
@@ -214,12 +231,7 @@ int playWav(const char *wav)
goto out; goto out;
} }
if(csndPlaySound(8, bitness | SOUND_ONE_SHOT, sample * channels, 1, 0, ndspChnWaveBufAdd(CHANNEL, &waveBuf);
buffer1, NULL, bytesRead1) != 0)
{
printf("Error %d.\n", __LINE__);
goto out;
}
bytesRead2 = fread(buffer2, 1, size, file); bytesRead2 = fread(buffer2, 1, size, file);