nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

update macsound to support 'volume' interface parameter

Browse Source
This commit is contained in:
nhmall
2023-02-05 11:32:12 -05:00
parent d3430bed9f
commit 5034f7f936
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/macsound/macsound.m
+33 -9
View File
@@ -76,9 +76,15 @@ static int32_t affiliation[number_of_se_entries + number_of_sa2_entries + EXTRA_
static NSString *soundstring[number_of_se_entries + number_of_sa2_entries + EXTRA_SOUNDS]; static NSString *soundstring[number_of_se_entries + number_of_sa2_entries + EXTRA_SOUNDS];
static NSSound *seSound[number_of_se_entries + number_of_sa2_entries + EXTRA_SOUNDS]; static NSSound *seSound[number_of_se_entries + number_of_sa2_entries + EXTRA_SOUNDS];
#ifdef SND_SOUNDEFFECS_AUTOMAP
#define AUTOMAPONLY
#else
#define AUTOMAPONLY UNUSED
#endif
/* fulfill SOUND_TRIGGER_SOUNDEFFECTS */ /* fulfill SOUND_TRIGGER_SOUNDEFFECTS */
static void static void
macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED) macsound_soundeffect(char *desc AUTOMAPONLY, int32_t seid AUTOMAPONLY, int vol AUTOMAPONLY)
{ {
#ifdef SND_SOUNDEFFECTS_AUTOMAP #ifdef SND_SOUNDEFFECTS_AUTOMAP
@@ -92,6 +98,10 @@ macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED)
char buf[1024]; char buf[1024];
const char *soundname; const char *soundname;
float fvolume = (float) vol / 100.00;
if (fvolume < 0.1 || fvolume > 1.0)
fvolume = 1.0;
if (seid <= se_zero_invalid || seid >= number_of_se_entries) if (seid <= se_zero_invalid || seid >= number_of_se_entries)
return; return;
@@ -105,6 +115,8 @@ macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED)
if (affiliation[seid]) { if (affiliation[seid]) {
if ([seSound[seid] isPlaying]) if ([seSound[seid] isPlaying])
[seSound[seid] stop]; [seSound[seid] stop];
if ([seSound[seid] volume] != fvolume)
[seSound[seid] setVolume:fvolume];
[seSound[seid] play]; [seSound[seid] play];
} }
#endif #endif
@@ -112,18 +124,28 @@ macsound_soundeffect(char *desc UNUSED, int32_t seid, int volume UNUSED)
#define WAVEMUSIC_SOUNDS #define WAVEMUSIC_SOUNDS
#ifdef WAVEMUSIC_SOUNDS
#define WAVEMUSICONLY
#else
#define WAVEMUSICONLY UNUSED
#endif
/* This is the number of sound_ files that support WAVEMUSIC_SOUNDS */ /* This is the number of sound_ files that support WAVEMUSIC_SOUNDS */
static const int wavemusic_sound_count = EXTRA_SOUNDS; static const int wavemusic_sound_count = EXTRA_SOUNDS;
/* fulfill SOUND_TRIGGER_HEROMUSIC */ /* fulfill SOUND_TRIGGER_HEROMUSIC */
static void macsound_hero_playnotes(int32_t instrument, static void macsound_hero_playnotes(int32_t instrument WAVEMUSICONLY,
const char *str, int32_t vol UNUSED) const char *str WAVEMUSICONLY, int32_t vol WAVEMUSICONLY)
{ {
#ifdef WAVEMUSIC_SOUNDS #ifdef WAVEMUSIC_SOUNDS
uint32_t pseudo_seid, pseudo_seid_base = 0; uint32_t pseudo_seid, pseudo_seid_base = 0;
boolean has_note_variations = FALSE; boolean has_note_variations = FALSE;
char resourcename[120], *end_of_res = 0; char resourcename[120], *end_of_res = 0;
const char *c = 0; const char *c = 0;
float fvolume = (float) vol / 100.00;
if (fvolume < 0.1 || fvolume > 1.0)
fvolume = 1.0;
if (!str) if (!str)
return; return;
@@ -204,6 +226,8 @@ static void macsound_hero_playnotes(int32_t instrument,
if (affiliation[pseudo_seid]) { if (affiliation[pseudo_seid]) {
if ([seSound[pseudo_seid] isPlaying]) if ([seSound[pseudo_seid] isPlaying])
[seSound[pseudo_seid] stop]; [seSound[pseudo_seid] stop];
if ([seSound[pseudo_seid] volume] != fvolume)
[seSound[pseudo_seid] setVolume:fvolume];
[seSound[pseudo_seid] play]; [seSound[pseudo_seid] play];
if (i < notecount - 1) { if (i < notecount - 1) {
/* more notes to follow */ /* more notes to follow */
@@ -281,15 +305,15 @@ macsound_play_usersound(char *filename UNUSED, int volume UNUSED, int idx UNUSED
} }
static int static int
affiliate(int32_t seid, const char *soundname) affiliate(int32_t id, const char *soundname)
{ {
if (!soundname || seid <= se_zero_invalid || seid >= SIZE(affiliation)) if (!soundname || id <= se_zero_invalid || id >= SIZE(affiliation))
return 0; return 0;
if (!affiliation[seid]) { if (!affiliation[id]) {
affiliation[seid] = seid; affiliation[id] = id;
soundstring[seid] = [NSString stringWithUTF8String:soundname]; soundstring[id] = [NSString stringWithUTF8String:soundname];
seSound[seid] = [NSSound soundNamed:soundstring[seid]]; seSound[id] = [NSSound soundNamed:soundstring[id]];
} }
return 1; return 1;
} }