ndsp sound

Author: elhobbs

Debug/prboom.log

@@ -1,4 +1,4 @@
-Build started 4/18/2015 11:28:10 AM.
+Build started 12/31/2015 8:20:03 PM.
      1>Project "C:\devl\prboom3ds\prboom.vcxproj" on node 2 (Build target(s)).
      1>Build:
          make -r 2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/

arm11/source/3ds_mix.c

@@ -1,3 +1,4 @@
+#if 0
 #include "ds_mix.h"
 #include "doomstat.h"
 #include "sounds.h"
@@ -8,6 +9,21 @@
 #include "w_wad.h"
 #include <3ds.h>
 
+#define USE_CSND
+
+#ifndef USE_CSND
+void* ndspMix_init(int channel, int speed, int channels);
+void ndsp_update(void *pmix, short *pAudioData, int count);
+int ndspMix_pos(void *pmix);
+void ndspMix_exit(void *pmix);
+void ndspMix_clear(void *pmix);
+void *_ndspMixer = 0;
+
+u64 g_sound_time;
+u64 g_paint_time;
+#endif
+
+
 extern int snd_card;
 extern boolean nosfxparm;
 
@@ -62,7 +78,6 @@ portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
 static int snd_scaletable[32][256];
 int audio_initialized = 0;
 
-#if 1
 
 static u64 sound_start;
 #define TICKS_PER_SEC 268123480.0
@@ -78,8 +93,8 @@ void mix_start() {
 	memset(c_snd_Buffer_right, 0, SND_SAMPLES);
 	//c_snd_Buffer_left[4] = c_snd_Buffer_left[5] = 0x7f;	// force a pop for debugging
 	//c_snd_Buffer_right[4] = c_snd_Buffer_right[5] = 0x7f;	// force a pop for debugging
-	GSPGPU_FlushDataCache(NULL, c_snd_Buffer_left, SND_SAMPLES);
-	GSPGPU_FlushDataCache(NULL, c_snd_Buffer_right, SND_SAMPLES);
+	GSPGPU_FlushDataCache(c_snd_Buffer_left, SND_SAMPLES);
+	GSPGPU_FlushDataCache(c_snd_Buffer_right, SND_SAMPLES);
 }
 
 
@@ -109,6 +124,8 @@ void MIX_init() {
 	u8 playing = 0;
 
 	MIX_InitScaletable();
+
+#ifdef USE_CSND
 
 	snd_Samples = SND_SAMPLES;
 	snd_Speed = 11025;
@@ -136,15 +153,29 @@ void MIX_init() {
 	csndExecCmds(true);
 
 	sound_start = svcGetSystemTick();
+#else
+	_ndspMixer = ndspMix_init(1, 32768, 2);
+	g_sound_time = g_paint_time = ndspMix_pos();
+#endif
 }
 
 void MIX_exit() {
+#ifdef USE_CSND
 	CSND_SetPlayState(0x8, 0);
 	CSND_SetPlayState(0x9, 0);
+#else
+	ndspMixer_exit(_ndspMixer);
+#endif
 }
 
 void MIX_TransferPaintBuffer(int endtime)
 {
+#ifndef USE_CSND
+	int count = endtime - paintedtime;
+
+	m_hw->update((int *)paintbuffer, count);
+
+#else
 	int 	out_idx;
 	int 	count, count1, count2, pos;
 	int 	out_mask;
@@ -185,7 +216,7 @@ void MIX_TransferPaintBuffer(int endtime)
 
 		out_idx = (out_idx + 1) & out_mask;
 	}
-
+#endif
 }
 
 void MIX_PaintChannelFrom8(channel_t *ch, byte *sfx, int count)
@@ -354,8 +385,8 @@ void MIX_Update_(void)
 	//printf("mixing %d %d %d\n", soundtime, paintedtime, endtime);
 	MIX_PaintChannels(endtime);
 	//DC_FlushRange(c_snd_Buffer, SND_SAMPLES * 2);
-	GSPGPU_FlushDataCache(NULL, c_snd_Buffer_left, SND_SAMPLES);
-	GSPGPU_FlushDataCache(NULL, c_snd_Buffer_right, SND_SAMPLES);
+	GSPGPU_FlushDataCache(c_snd_Buffer_left, SND_SAMPLES);
+	GSPGPU_FlushDataCache(c_snd_Buffer_right, SND_SAMPLES);
 }
 
 extern int snd_SfxVolume;
@@ -751,7 +782,6 @@ void S_StartSoundAtVolume(void *origin_p, int sfx_id, int volume)
 
 	I_StartSound(sfx, cnum, volume, sep, pitch, priority);
 }
-#endif
 
 void S_StartSound(void *origin, int sound_id) {
 	S_StartSoundAtVolume(origin, sound_id, snd_SfxVolume);
@@ -777,3 +807,4 @@ void S_Stop(void)
 	//so it should not make any noise while the level loads
 	mix_start();
 }
+#endif

arm11/source/3ds_sound.c

@@ -204,29 +204,7 @@ void S_Init(int sfxVolume, int musicVolume) {
 	//return;
 
 	if (csndInit() == 0) {
-#if 1
-		printf("csndInit ok!\ncsndChannels: %08x\n", csndChannels);
-#else
-		Result ret = 0;
-		Handle csndHandle;
-		u32 __channels=0;
-		printf("csndInit ok!\ncsndChannels: %08x\n", csndChannels);
-		ret = srvGetServiceHandle(&csndHandle, "csnd:SND");
-		if (ret != 0) {
-			printf("handle failed\n");
-		}
-		ret = CSND_ReleaseSoundChannels(csndHandle);
-		if (ret != 0) {
-			printf("CSND_ReleaseSoundChannels failed\n");
-		}
-		ret = CSND_AcquireSoundChannels(csndHandle, &__channels);
-		if (ret != 0) {
-			printf("CSND_AcquireSoundChannels failed\n");
-		}
-		printf("channels: %08x\n", __channels);
-		gfxFlushBuffers();
-		while (1);
-#endif
+		printf("csndInit ok!\n");
 		audio_initialized = 1;
 	}
 	else {
@@ -251,7 +229,6 @@ void S_Exit() {
 	mus_exit();
 	//flush csnd command buffers
 	csndExecCmds(true);
-	ret = csndExit();
-	printf("csndExit %d\n", ret);
+	csndExit();
 	//svcSleepThread(5000000000LL);
 }

arm11/source/MixerHardware.h

@@ -1,13 +1,13 @@
 #pragma once
-
+#include <3ds/types.h>
 class MixerHardware {
 public:
 	MixerHardware();
 	virtual ~MixerHardware();
 	virtual void flush() = 0;
 	virtual void update(int *pAudioData, int count) = 0;
 	virtual void update(short *pAudioData, int count) = 0;
-	virtual int samplepos() = 0;
+	virtual u64 samplepos() = 0;
 };
 
 inline MixerHardware::MixerHardware() {

arm11/source/Mixer_3ds.cpp

@@ -8,7 +8,7 @@ void MixerHardware3DS::init() {
 	m_bufferSize = 4096;
 
 	m_soundBuffer = (byte *)linearAlloc(m_bufferSize);
-	m_soundBufferPHY = osConvertVirtToPhys((u32)m_soundBuffer);
+	m_soundBufferPHY = osConvertVirtToPhys(m_soundBuffer);
 	m_bufferPos = 0;
 	m_soundPos = 0;
 	m_lastPos = 0;
@@ -31,7 +31,7 @@ void MixerHardware3DS::init() {
 
 void MixerHardware3DS::clear() {
 	memset(m_soundBuffer, 0, m_bufferSize);
-	GSPGPU_FlushDataCache(NULL, m_soundBuffer, m_bufferSize);
+	GSPGPU_FlushDataCache(m_soundBuffer, m_bufferSize);
 }
 
 void MixerHardware3DS::shutdown() {
@@ -49,7 +49,7 @@ byte* MixerHardware3DS::buffer() {
 #define TICKS_PER_SEC 268123480.0
 #define TICKS_PER_SEC_LL 268111856LL
 
-int MixerHardware3DS::samplepos() {
+u64 MixerHardware3DS::samplepos() {
 	u64 delta = (svcGetSystemTick() - m_start);
 	u64 samples = delta * m_speed / TICKS_PER_SEC_LL;
 
@@ -87,10 +87,10 @@ void MixerHardware3DS::update(short *pAudioData, int count)
 		outp[pos] = val>>8;
 		pos = (pos + 1) & mask;
 	}
-	GSPGPU_FlushDataCache(NULL, m_soundBuffer, m_bufferSize);
+	GSPGPU_FlushDataCache(m_soundBuffer, m_bufferSize);
 }
 
-
+#if 0
 MixerHardware3DS g_mixer(32728, 2);
 
 extern "C" void mixer_update(short *pAudioData, int count) {
@@ -113,7 +113,4 @@ extern "C" void mixer_clear() {
 	g_mixer.clear();
 }
 
-extern "C" byte* mixer_buffer() {
-	return g_mixer.buffer();
-}
-
+#endif

arm11/source/Mixer_3ds.h

@@ -15,7 +15,7 @@ class MixerHardware3DS : public MixerHardware {
 	void flush();
 	void update(int *pAudioData, int count);
 	void update(short *pAudioData, int count);
-	int samplepos();
+	u64 samplepos();
 	void clear();
 	byte *buffer();
 private: