Macintosh-SW
/
MacLO
mirror of https://github.com/jonthysell/MacLO.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplified sound by removing sound channel creation

This commit is contained in:
Jon Thysell 2021-11-24 17:21:44 -08:00
parent e76fd25c07
commit 2f818e73b8
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Sounds.c
View File

@ -1,8 +1,6 @@
// Copyright (c) Jon Thysell <http://jonthysell.com>
// Licensed under the MIT License.
#include <GestaltEqu.h>
#include "Sounds.h"
#define SndBaseResId 8192
@ -12,23 +10,11 @@
#define DoneSndResID (RetrySndResID + 1)
#define DefaultEnabled true
#define PlaySoundsAsync true
#define PlaySoundsAsync false
void Sounds_Init(Sounds *pSounds)
{
OSErr err;
int32_t sysVersion;
pSounds->Enabled = DefaultEnabled;
pSounds->SndChannel = nil;
err = Gestalt(gestaltSystemVersion, &sysVersion);
if (err == noErr && sysVersion >= 0x0700)
{
// Only create a shared sound channel on System 7
// or above in order to cheaply support async sound
SndNewChannel(&(pSounds->SndChannel), 0, 0, nil);
}
pSounds->ClickSnd = GetResource('snd ', ClickSndResID);
if (pSounds->ClickSnd == nil)
@ -54,7 +40,7 @@ void Sounds_PlayClickSnd(const Sounds *pSounds)
if (pSounds->Enabled)
{
HLock(pSounds->ClickSnd);
SndPlay(pSounds->SndChannel, pSounds->ClickSnd, PlaySoundsAsync);
SndPlay(nil, pSounds->ClickSnd, PlaySoundsAsync);
HUnlock(pSounds->ClickSnd);
}
}
@ -64,7 +50,7 @@ void Sounds_PlayRetrySnd(const Sounds *pSounds)
if (pSounds->Enabled)
{
HLock(pSounds->RetrySnd);
SndPlay(pSounds->SndChannel, pSounds->RetrySnd, PlaySoundsAsync);
SndPlay(nil, pSounds->RetrySnd, PlaySoundsAsync);
HUnlock(pSounds->RetrySnd);
}
}
@ -74,7 +60,7 @@ void Sounds_PlayDoneSnd(const Sounds *pSounds)
if (pSounds->Enabled)
{
HLock(pSounds->DoneSnd);
SndPlay(pSounds->SndChannel, pSounds->DoneSnd, PlaySoundsAsync);
SndPlay(nil, pSounds->DoneSnd, PlaySoundsAsync);
HUnlock(pSounds->DoneSnd);
}
}

1
src/Sounds.h
View File

@ -11,7 +11,6 @@
typedef struct sSounds
{
bool Enabled;
SndChannelPtr SndChannel;
Handle ClickSnd;
Handle RetrySnd;
Handle DoneSnd;