np2/win9x/soundmng.cpp - diff

Return to soundmng.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/soundmng.cpp between versions 1.3 and 1.13

version 1.3, 2003/10/26 08:59:53	version 1.13, 2007/01/08 01:16:59
Line 6	Line 6
#include "soundmng.h"	#include "soundmng.h"
#include "extromio.h"	#include "extromio.h"
#include "sound.h"	#include "sound.h"
	#include "juliet.h"
#if defined(VERMOUTH_LIB)	#if defined(VERMOUTH_LIB)
#include "vermouth.h"	#include "vermouth.h"
#endif	#endif
	#if defined(MT32SOUND_DLL)
	#include "mt32snd.h"
	#endif

	#if !defined(_WIN64)
	#define SOUNDBUFFERALIGN (1 << 2)
	#else
	#define SOUNDBUFFERALIGN (1 << 3)
	#endif

	#if !defined(_WIN64)
#ifdef __cplusplus	#ifdef __cplusplus
extern "C" {	extern "C" {
#endif	#endif
Line 17 void __fastcall satuation_s16mmx(SINT16	Line 28 void __fastcall satuation_s16mmx(SINT16
#ifdef __cplusplus	#ifdef __cplusplus
}	}
#endif	#endif
	#endif


#if 1	#if 1
Line 36 void __fastcall satuation_s16mmx(SINT16	Line 48 void __fastcall satuation_s16mmx(SINT16
static LPDIRECTSOUND pDSound;	static LPDIRECTSOUND pDSound;
static LPDIRECTSOUNDBUFFER pDSData3;	static LPDIRECTSOUNDBUFFER pDSData3;
static UINT dsstreambytes;	static UINT dsstreambytes;
static BYTE dsstreamevent;	static UINT8 dsstreamevent;
static LPDIRECTSOUNDBUFFER pDSwave3[SOUND_MAXPCM];	static LPDIRECTSOUNDBUFFER pDSwave3[SOUND_MAXPCM];
static BYTE mute;	static UINT mute;
static void (PARTSCALL fnmix)(SINT16 dst,	static void (PARTSCALL fnmix)(SINT16 dst,
const SINT32 *src, UINT size);	const SINT32 *src, UINT size);

Line 49 static void (PARTSCALL *fnmix)(SINT16	Line 61 static void (PARTSCALL *fnmix)(SINT16

// ---- directsound	// ---- directsound

static BOOL dsoundcreate(void) {	static BRESULT dsoundcreate(void) {

// DirectSoundの初期化	// DirectSoundの初期化
if (FAILED(DirectSoundCreate(0, &pDSound, 0))) {	if (FAILED(DirectSoundCreate(0, &pDSound, 0))) {
Line 74 UINT soundmng_create(UINT rate, UINT ms)	Line 86 UINT soundmng_create(UINT rate, UINT ms)
UINT samples;	UINT samples;
DSBUFFERDESC dsbdesc;	DSBUFFERDESC dsbdesc;
PCMWAVEFORMAT pcmwf;	PCMWAVEFORMAT pcmwf;
#if defined(VERMOUTH_LIB)	int i;
UINT num;
#endif

if ((pDSound == NULL) \|\|	if ((pDSound == NULL) \|\|
(rate != 11025) && (rate != 22050) && (rate != 44100)) {	(rate != 11025) && (rate != 22050) && (rate != 44100)) {
goto stcre_err1;	goto stcre_err1;
}	}
if (ms < 50) {	if (ms < 40) {
ms = 50;	ms = 40;
}	}
else if (ms > 1000) {	else if (ms > 1000) {
ms = 1000;	ms = 1000;
}	}

// キーボード表示のディレイ設定	// キーボード表示のディレイ設定
// keydispr_delayinit((BYTE)((ms * 10 + 563) / 564));	// keydispr_delayinit((UINT8)((ms * 10 + 563) / 564));

samples = (rate * ms) / 2000;	samples = (rate * ms) / 2000;
samples = (samples + 3) & (~3);	samples = (samples + SOUNDBUFFERALIGN - 1) & (~(SOUNDBUFFERALIGN - 1));
dsstreambytes = samples * 2 * sizeof(SINT16);	dsstreambytes = samples * 2 * sizeof(SINT16);
soundmng_setreverse(FALSE);	soundmng_setreverse(FALSE);

Line 105 UINT soundmng_create(UINT rate, UINT ms)	Line 115 UINT soundmng_create(UINT rate, UINT ms)
pcmwf.wf.nBlockAlign = 2 * sizeof(SINT16);	pcmwf.wf.nBlockAlign = 2 * sizeof(SINT16);
pcmwf.wf.nAvgBytesPerSec = rate * 2 * sizeof(SINT16);	pcmwf.wf.nAvgBytesPerSec = rate * 2 * sizeof(SINT16);

ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));	for (i=0; i<2; i++) {
dsbdesc.dwSize = DSBUFFERDESC_SIZE;	ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));
dsbdesc.dwFlags = DSBCAPS_CTRLPAN \| DSBCAPS_CTRLVOLUME \|	dsbdesc.dwSize = i ? sizeof(dsbdesc) : DSBUFFERDESC_SIZE;
	dsbdesc.dwFlags = DSBCAPS_CTRLPAN \| DSBCAPS_CTRLVOLUME \|
DSBCAPS_CTRLFREQUENCY \|	DSBCAPS_CTRLFREQUENCY \|
DSBCAPS_STICKYFOCUS \| DSBCAPS_GETCURRENTPOSITION2;	DSBCAPS_STICKYFOCUS \| DSBCAPS_GETCURRENTPOSITION2;
dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;	dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
dsbdesc.dwBufferBytes = dsstreambytes * 2;	dsbdesc.dwBufferBytes = dsstreambytes * 2;
if (FAILED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {	if (SUCCEEDED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {
	break;
	}
	}
	if (i >= 2) {
goto stcre_err2;	goto stcre_err2;
}	}

#if defined(VERMOUTH_LIB)	#if defined(VERMOUTH_LIB)
vermouth_module = midimod_create(rate);	vermouth_module = midimod_create(rate);
for (num=0; num<128; num++) {	midimod_loadall(vermouth_module);
midimod_loadprogram(vermouth_module, num);
midimod_loadrhythm(vermouth_module, num);
}
#endif	#endif
dsstreamevent = (BYTE)-1;	#if defined(MT32SOUND_DLL)
soundmng_reset();	mt32sound_setrate(rate);
	#endif
	dsstreamevent = (UINT8)-1;
return(samples);	return(samples);

stcre_err2:	stcre_err2:
Line 151 void soundmng_reset(void) {	Line 165 void soundmng_reset(void) {
}	}
pDSData3->Unlock(blockptr1, blocksize1, blockptr2, blocksize2);	pDSData3->Unlock(blockptr1, blocksize1, blockptr2, blocksize2);
pDSData3->SetCurrentPosition(0);	pDSData3->SetCurrentPosition(0);
dsstreamevent = (BYTE)-1;	dsstreamevent = (UINT8)-1;
}	}
}	}

Line 162 void soundmng_destroy(void) {	Line 176 void soundmng_destroy(void) {
midimod_destroy(vermouth_module);	midimod_destroy(vermouth_module);
vermouth_module = NULL;	vermouth_module = NULL;
#endif	#endif
	#if defined(MT32SOUND_DLL)
	mt32sound_setrate(0);
	#endif
pDSData3->Stop();	pDSData3->Stop();
pDSData3->Release();	pDSData3->Release();
pDSData3 = NULL;	pDSData3 = NULL;
Line 178 static void streamenable(BOOL play) {	Line 195 static void streamenable(BOOL play) {
pDSData3->Stop();	pDSData3->Stop();
}	}
}	}
	juliet_YMF288Enable(play);
}	}

void soundmng_play(void) {	void soundmng_play(void) {
Line 251 void soundmng_sync(void) {	Line 269 void soundmng_sync(void) {
void soundmng_setreverse(BOOL reverse) {	void soundmng_setreverse(BOOL reverse) {

if (!reverse) {	if (!reverse) {
	#if !defined(_WIN64)
if (mmxflag) {	if (mmxflag) {
fnmix = satuation_s16;	fnmix = satuation_s16;
}	}
else {	else {
fnmix = satuation_s16mmx;	fnmix = satuation_s16mmx;
}	}
	#else
	fnmix = satuation_s16;
	#endif
}	}
else {	else {
fnmix = satuation_s16x;	fnmix = satuation_s16x;
Line 301 static void pcmstop(void) {	Line 323 static void pcmstop(void) {
}	}
}	}

void soundmng_pcmload(UINT num, const char *filename, UINT type) {	void soundmng_pcmload(UINT num, const OEMCHAR *filename, UINT type) {

EXTROMH erh;	EXTROMH erh;
RIFF_HEADER riff;	RIFF_HEADER riff;
Line 412 void soundmng_pcmvolume(UINT num, int vo	Line 434 void soundmng_pcmvolume(UINT num, int vo
}	}
}	}

BOOL soundmng_pcmplay(UINT num, BOOL loop) {	BRESULT soundmng_pcmplay(UINT num, BOOL loop) {

LPDIRECTSOUNDBUFFER dsbuf;	LPDIRECTSOUNDBUFFER dsbuf;

Line 442 void soundmng_pcmstop(UINT num) {	Line 464 void soundmng_pcmstop(UINT num) {

// ----	// ----

BOOL soundmng_initialize(void) {	BRESULT soundmng_initialize(void) {

if (dsoundcreate() != SUCCESS) {	if (dsoundcreate() != SUCCESS) {
goto smcre_err;	goto smcre_err;
}	}
pcmcreate();	pcmcreate();
	#if defined(MT32SOUND_DLL)
	mt32sound_initialize();
	#endif
return(SUCCESS);	return(SUCCESS);

smcre_err:	smcre_err:
Line 457 smcre_err:	Line 482 smcre_err:

void soundmng_deinitialize(void) {	void soundmng_deinitialize(void) {

	#if defined(MT32SOUND_DLL)
	mt32sound_deinitialize();
	#endif
pcmdestroy();	pcmdestroy();
soundmng_destroy();	soundmng_destroy();
RELEASE(pDSound);	RELEASE(pDSound);
Line 465 void soundmng_deinitialize(void) {	Line 493 void soundmng_deinitialize(void) {

// ----	// ----

void soundmng_enable(void) {	void soundmng_enable(UINT proc) {

if (mute) {	if (!(mute & (1 << proc))) {
mute = 0;	return;
	}
	mute &= ~(1 << proc);
	if (!mute) {
soundmng_reset();	soundmng_reset();
streamenable(TRUE);	streamenable(TRUE);
}	}
}	}

void soundmng_disable(void) {	void soundmng_disable(UINT proc) {

if (!mute) {	if (!mute) {
mute = 1;
streamenable(FALSE);	streamenable(FALSE);
pcmstop();	pcmstop();
}	}
	mute \|= 1 << proc;
}	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.3
changed lines
	Added in v.1.13