empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAM: Clean up before merge

Browse source
This commit is contained in:
tomcw 2015-04-09 22:54:26 +01:00
parent feccde41bf
commit c052d10d2f
6 changed files with 80 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ApplewinExpress9.00.vcproj
View file

@ -686,6 +686,14 @@
RelativePath=".\source\Riff.h"
>
</File>
<File
RelativePath=".\source\SAM.cpp"
>
</File>
<File
RelativePath=".\source\SAM.h"
>
</File>
<File
RelativePath=".\source\SaveState.cpp"
>

16
source/SAM.cpp
View file

@ -53,17 +53,16 @@ static BYTE __stdcall IOWrite_SAM(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULON
// audio samples are being written to the SAM.
//
// Whilst very unusual, it is possible to intermingle use of SAM and the apple
// speaker. This is crudely supported with g_quieterSpeaker making the Apple
// speaker. This is crudely supported with g_bQuieterSpeaker making the Apple
// speaker produce quieter clicks which will be crudely intermingled
// with the SAM data. The mute gets reset after the speaker code detects
// silence.
byte mb_res;
if (soundtype != SOUND_WAVE)
return MemReadFloatingBus(nCyclesLeft);
if (soundtype == SOUND_WAVE)
{
// use existing speaker code to bring timing up to date
mb_res = SpkrToggle(pc, addr, bWrite, d, nCyclesLeft);
BYTE res = SpkrToggle(pc, addr, bWrite, d, nCyclesLeft);
// The DAC in the SAM uses unsigned 8 bit samples
// The WAV data that g_nSpeakerData is loaded into is a signed short
@ -83,12 +82,9 @@ static BYTE __stdcall IOWrite_SAM(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULON
// make speaker quieter so eg: a metronome click through the
// Apple speaker is softer vs. the analogue SAM output.
g_quieterSpeaker = 1;
}
else
mb_res = MemReadFloatingBus(nCyclesLeft);
g_bQuieterSpeaker = true;
return mb_res;
return res;
}
void ConfigureSAM(LPBYTE pCxRomPeripheral, UINT uSlot)

3
source/SAM.h
View file

@ -1,2 +1,3 @@
// SAM speech card (8 bit DAC):
#pragma once
void ConfigureSAM(LPBYTE pCxRomPeripheral, UINT uSlot);

12
source/Speaker.cpp
View file

@ -73,7 +73,7 @@ DWORD soundtype = SOUND_WAVE;
double g_fClksPerSpkrSample; // Setup in SetClksPerSpkrSample()
// Allow temporary quietening of speaker (8 bit DAC)
UINT g_quieterSpeaker = 0;
bool g_bQuieterSpeaker = false;
// Globals
static DWORD lastcyclenum = 0;
@ -444,20 +444,22 @@ BYTE __stdcall SpkrToggle (WORD, WORD, BYTE, BYTE, ULONG nCyclesLeft)
UpdateSpkr();
if (g_bQuieterSpeaker)
{
// quieten the speaker if 8 bit DAC in use
// g_nSpeakerData = ~g_nSpeakerData;
if (g_quieterSpeaker)
if (g_nSpeakerData == (SPKR_DATA_INIT >> 2))
g_nSpeakerData = ~g_nSpeakerData;
else
g_nSpeakerData = SPKR_DATA_INIT>>2;
}
else
{
if (g_nSpeakerData == SPKR_DATA_INIT)
g_nSpeakerData = ~g_nSpeakerData;
else
g_nSpeakerData = SPKR_DATA_INIT;
}
}
else if (soundtype != SOUND_NONE)
{
@ -1002,7 +1004,7 @@ static void Spkr_SetActive(bool bActive)
// Called by SpkrUpdate() after 0.2s of speaker inactivity
g_bSpkrRecentlyActive = false;
SpeakerVoice.bRecentlyActive = false;
g_quieterSpeaker = 0; // undo any muting (for 8 bit DAC)
g_bQuieterSpeaker = 0; // undo any muting (for 8 bit DAC)
}
}

4
source/Speaker.h
View file

@ -7,7 +7,7 @@
extern DWORD soundtype;
extern double g_fClksPerSpkrSample;
extern UINT g_quieterSpeaker;
extern bool g_bQuieterSpeaker;
extern short g_nSpeakerData;
void SpkrDestroy ();
@ -30,5 +30,3 @@ DWORD SpkrGetSnapshot(SS_IO_Speaker* pSS);
DWORD SpkrSetSnapshot(SS_IO_Speaker* pSS);
BYTE __stdcall SpkrToggle (WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft);