switched back to csnd

elhobbs · Feb 14, 2016 · d0171af · d0171af
1 parent d6b3568
commit d0171af
Show file tree

Hide file tree

Showing 12 changed files with 674 additions and 32 deletions.
diff --git a/arm11/source/3ds_mix.c b/arm11/source/3ds_mix.c
@@ -76,7 +76,7 @@ typedef struct
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
 
 static int snd_scaletable[32][256];
-int audio_initialized = 0;
+extern int audio_initialized;
 
 
 static u64 sound_start;

diff --git a/arm11/source/3ds_sound.c b/arm11/source/3ds_sound.c
@@ -200,15 +200,8 @@ extern u32 csndChannels;
 void S_Init(int sfxVolume, int musicVolume) {
 	nosfxparm = 0;
 	nomusicparm = 0;
-	audio_initialized = 0;
-	//return;
 
-	if (csndInit() == 0) {
-		printf("csndInit ok!\n");
-		audio_initialized = 1;
-	}
-	else {
-		printf("csndInit failed!\n");
+	if (!audio_initialized) {
 		nosfxparm = 1;
 		nomusicparm = 1;
 		return;
@@ -229,6 +222,5 @@ void S_Exit() {
 	mus_exit();
 	//flush csnd command buffers
 	csndExecCmds(true);
-	csndExit();
 	//svcSleepThread(5000000000LL);
 }
diff --git a/arm11/source/Mixer_3ds.cpp b/arm11/source/Mixer_3ds.cpp
@@ -3,9 +3,11 @@
 #include <stdio.h>
 #include <string.h>
 
-void MixerHardware3DS::init() {
+#define MIXER_CHANNEL_NUM 31
+
+int MixerHardware3DS::init() {
 	Result ret = 0;
-	m_bufferSize = 4096;
+	m_bufferSize = (1L<<16);
 
 	m_soundBuffer = (byte *)linearAlloc(m_bufferSize);
 	m_soundBufferPHY = osConvertVirtToPhys(m_soundBuffer);
@@ -14,19 +16,21 @@ void MixerHardware3DS::init() {
 	m_lastPos = 0;
 	clear();
 
-	ret = csndPlaySound(0x10, SOUND_REPEAT | SOUND_FORMAT_8BIT, m_speed, 1.0f, 0.0f, (u32*)m_soundBuffer, (u32*)m_soundBuffer, m_bufferSize);
+	ret = csndPlaySound(MIXER_CHANNEL_NUM, SOUND_REPEAT | SOUND_FORMAT_8BIT, m_speed, 1.0f, 0.0f, (u32*)m_soundBuffer, (u32*)m_soundBuffer, m_bufferSize);
 	if (ret != 0) {
 		printf("mus init failed\n");
 	}
 	//try to start stalled channels
 	u8 playing = 0;
-	csndIsPlaying(0x10, &playing);
+	csndIsPlaying(MIXER_CHANNEL_NUM, &playing);
 	if (playing == 0) {
-		CSND_SetPlayState(0x10, 1);
+		CSND_SetPlayState(MIXER_CHANNEL_NUM, 1);
 	}
 	//flush csnd command buffers
 	csndExecCmds(true);
 	m_start = svcGetSystemTick();
+
+	return 0;
 }
 
 void MixerHardware3DS::clear() {
@@ -36,7 +40,8 @@ void MixerHardware3DS::clear() {
 
 void MixerHardware3DS::shutdown() {
 	flush();
-	CSND_SetPlayState(0x10, 0);
+	CSND_SetPlayState(MIXER_CHANNEL_NUM, 0);
+	csndExecCmds(true);
 }
 
 void MixerHardware3DS::flush() {
@@ -90,8 +95,8 @@ void MixerHardware3DS::update(short *pAudioData, int count)
 	GSPGPU_FlushDataCache(m_soundBuffer, m_bufferSize);
 }
 
-#if 0
-MixerHardware3DS g_mixer(32728, 2);
+#if 1
+MixerHardware3DS g_mixer(32728, 1);
 
 extern "C" void mixer_update(short *pAudioData, int count) {
 	g_mixer.update(pAudioData, count);
@@ -101,8 +106,8 @@ extern "C" int mixer_pos() {
 	return g_mixer.samplepos();
 }
 
-extern "C" void mixer_init() {
-	g_mixer.init();
+extern "C" int mixer_init() {
+	return g_mixer.init();
 }
 
 extern "C" void mixer_exit() {

diff --git a/arm11/source/Mixer_3ds.h b/arm11/source/Mixer_3ds.h
@@ -10,7 +10,7 @@ class MixerHardware3DS : public MixerHardware {
 	MixerHardware3DS(int speed, int channels);
 	~MixerHardware3DS();
 
-	void init();
+	int init();
 	void shutdown();
 	void flush();
 	void update(int *pAudioData, int count);

diff --git a/arm11/source/Mixer_dsp.cpp b/arm11/source/Mixer_dsp.cpp
@@ -1,9 +1,10 @@
+#if 0
 #include "Mixer_dsp.h"
 #include <3ds.h>
 #include <stdio.h>
 #include <string.h>
 
-static int audio_initialized = 0;
+extern int audio_initialized;
 
 extern "C" void Pause(u32 ms);
 
@@ -315,7 +316,7 @@ extern "C" void ndspMix_flush(void *pmix) {
 	mix->flush();
 }
 
-#if 1
+#if 0
 MixerHardwareDSP g_mixer(16, 32728, 2);
 
 extern "C" void mixer_update(short *pAudioData, int count) {
@@ -338,4 +339,5 @@ extern "C" void mixer_clear() {
 	g_mixer.clear();
 }
 
-#endif
+#endif
+#endif
diff --git a/arm11/source/dsp_mix.c b/arm11/source/dsp_mix.c
@@ -65,7 +65,7 @@ typedef struct
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
 
 static int snd_scaletable[32][256];
-int audio_initialized = 0;
+extern int audio_initialized;
 
 
 static u64 sound_start;

diff --git a/arm11/source/hw_mix.c b/arm11/source/hw_mix.c
@@ -1,4 +1,4 @@
-#if 1
+#if 0
 #include "doomstat.h"
 #include "sounds.h"
 #include "s_sound.h"
@@ -52,7 +52,7 @@ typedef struct
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
 
 static int snd_scaletable[32][256];
-int audio_initialized = 0;
+extern int audio_initialized;
 
 void MIX_InitScaletable(void)
 {
@@ -116,7 +116,7 @@ void I_StopSound(channel_t *c) {
 		}
 		i++;
 		svcSleepThread(500000);
-		//printf("-----: %2d %8s %d %08x %d\n", c-channel, c->sfxinfo->name, (int)(c->wavebuf.status), c->wavebuf.data_vaddr, i);
+		printf("-----: %2d %8s %lld %lld\n", c-channel, c->sfxinfo->name, c->end, soundpos());
 	}
 
 	if (c->wavebuf.data_vaddr) {
@@ -436,7 +436,7 @@ int I_StartSound(sfxinfo_t *sfx, int cnum, int vol, int sep, int pitch, int prio
 	ch->left = ((256 - sep) * vol) / 15;
 	ch->right = ((sep)* vol) / 15;
 	ch->pos = 0;
-	//printf("start: %2d %8s %d %d\n",cnum, sfx->name,ch->left, ch->right);
+	printf("start: %2d %8s %d %d\n",cnum, sfx->name,ch->left, ch->right);
 
 	ldata = (byte *)linearAlloc(len);