Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-10-12 17:28:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from kichikuou/mixer

Browse Source 
SystemService can only access mixers specified in ini
This commit is contained in:
Nunuhara Cabbage
2023-07-13 16:58:47 -07:00
committed by GitHub
parent fcf26a9ca7 a536912b38
commit 192e65a827
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio_mixer.c
+9 -7
View File
@@ -666,19 +666,21 @@ void mixer_init(void)
int mixer_get_numof(void)
{
return nr_mixers;
// Return the number of mixers specified in System40.ini, even if
// xsystem4 added more mixers.
return config.mixer_nr_channels;
}
const char *mixer_get_name(int n)
{
if (n < 0 || n >= nr_mixers)
if (n < 0 || n >= config.mixer_nr_channels)
return NULL;
return mixers[n].name;
}
int mixer_set_name(int n, const char *name)
{
if (n < 0 || n >= nr_mixers)
if (n < 0 || n >= config.mixer_nr_channels)
return 0;
free(mixers[n].name);
mixers[n].name = strdup(name);
@@ -687,7 +689,7 @@ int mixer_set_name(int n, const char *name)
int mixer_get_volume(int n, int *volume)
{
if (n < 0 || n >= nr_mixers) {
if (n < 0 || n >= config.mixer_nr_channels) {
return 0;
}
SDL_LockAudioDevice(audio_device);
@@ -698,7 +700,7 @@ int mixer_get_volume(int n, int *volume)
int mixer_set_volume(int n, int volume)
{
if (n < 0 || n >= nr_mixers)
if (n < 0 || n >= config.mixer_nr_channels)
return 0;
SDL_LockAudioDevice(audio_device);
mixers[n].mixer.gain = clamp(0.0f, 1.0f, (float)volume / 100.0f);
@@ -707,7 +709,7 @@ int mixer_set_volume(int n, int volume)
}
int mixer_get_mute(int n, int *mute)
{
if (n < 0 || n >= nr_mixers)
if (n < 0 || n >= config.mixer_nr_channels)
return 0;
*mute = mixers[n].muted;
return 1;
@@ -715,7 +717,7 @@ int mixer_get_mute(int n, int *mute)
int mixer_set_mute(int n, int mute)
{
if (n < 0 || n >= nr_mixers)
if (n < 0 || n >= config.mixer_nr_channels)
return 0;
mixers[n].muted = !!mute;
return 1;