doohoyi/LibPdIntegrationExamples
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug where we were hard-coded to always select the soundcard's maximum number of available channels, regardless of the project setting.

Browse source
This commit is contained in:
Niall Moody 2021-10-24 16:45:00 +01:00
parent 5f77830404
commit ff774f3e45
1 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
Assets/Scripts/LibPdInstance.cs
View file

@ -586,41 +586,18 @@ public class LibPdInstance : MonoBehaviour
libpd_set_instance(instance); libpd_set_instance(instance);
//Initialise audio. //Initialise audio.
int numSpeakers = 2; int requestedNumSpeakers = GetNumSpeakers(AudioSettings.speakerMode);
int availableNumSpeakers = GetNumSpeakers(AudioSettings.driverCapabilities);
if(AudioSettings.driverCapabilities != AudioSettings.speakerMode) if(requestedNumSpeakers > availableNumSpeakers)
Debug.LogWarning("LibPdInstance Warning: Soundcard driver capabilities do match the selected speaker mode. Using speaker mode: " + AudioSettings.driverCapabilities);
switch(AudioSettings.driverCapabilities)
{ {
case AudioSpeakerMode.Mono: Debug.LogWarning("LibPdInstance Warning: Soundcard does not support speaker mode: " + AudioSettings.speakerMode + " Using mode: " + AudioSettings.driverCapabilities + " instead.");
numSpeakers = 1;
break; requestedNumSpeakers = availableNumSpeakers;
case AudioSpeakerMode.Stereo:
numSpeakers = 2;
break;
case AudioSpeakerMode.Quad:
numSpeakers = 4;
break;
case AudioSpeakerMode.Surround:
numSpeakers = 5;
break;
case AudioSpeakerMode.Mode5point1:
numSpeakers = 6;
break;
case AudioSpeakerMode.Mode7point1:
numSpeakers = 8;
break;
case AudioSpeakerMode.Prologic:
//TODO: If I understand the Unity docs correctly, it will be
//impossible for us to spatialise patches if speakerMode is set
//to Prologic. So this option may not be particularly useful.
numSpeakers = 2;
break;
} }
int err = libpd_init_audio(numSpeakers, int err = libpd_init_audio(requestedNumSpeakers,
numSpeakers, requestedNumSpeakers,
AudioSettings.outputSampleRate); AudioSettings.outputSampleRate);
if(err != 0) if(err != 0)
{ {
@ -1220,5 +1197,42 @@ public class LibPdInstance : MonoBehaviour
return retval; return retval;
} }
//--------------------------------------------------------------------------
/// Helper method. Returns the number of speakers for a given speakerMode.
int GetNumSpeakers(AudioSpeakerMode mode)
{
int retval = 2;
switch(mode)
{
case AudioSpeakerMode.Mono:
retval = 1;
break;
case AudioSpeakerMode.Stereo:
retval = 2;
break;
case AudioSpeakerMode.Quad:
retval = 4;
break;
case AudioSpeakerMode.Surround:
retval = 5;
break;
case AudioSpeakerMode.Mode5point1:
retval = 6;
break;
case AudioSpeakerMode.Mode7point1:
retval = 8;
break;
case AudioSpeakerMode.Prologic:
//TODO: If I understand the Unity docs correctly, it will be
//impossible for us to spatialise patches if speakerMode is set
//to Prologic. So this option may not be particularly useful.
retval = 2;
break;
}
return retval;
}
#endregion #endregion
} }