ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-24 16:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed AudioContext.Default to AudioContext.DefaulDevice.

Browse source 
Improved error checking code.
This commit is contained in:
the_fiddler 2009-07-17 23:00:22 +00:00
parent d74ecbc4c1
commit 10a910fe10
1 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
Source/OpenTK/Audio/AudioContext.cs
View file

@ -270,8 +270,8 @@ namespace OpenTK.Audio
} }
if (device_handle == IntPtr.Zero) if (device_handle == IntPtr.Zero)
{ {
device_name = AudioContext.Default; device_name = AudioContext.DefaultDevice;
device_handle = Alc.OpenDevice(AudioContext.Default); // try to open named default device device_handle = Alc.OpenDevice(AudioContext.DefaultDevice); // try to open named default device
} }
if (device_handle == IntPtr.Zero) if (device_handle == IntPtr.Zero)
{ {
@ -280,7 +280,7 @@ namespace OpenTK.Audio
String.IsNullOrEmpty(device) ? "default" : device)); String.IsNullOrEmpty(device) ? "default" : device));
} }
CheckForAlcErrors(); CheckErrors();
// Build the attribute list // Build the attribute list
List<int> attributes = new List<int>(); List<int> attributes = new List<int>();
@ -330,7 +330,7 @@ namespace OpenTK.Audio
throw new AudioContextException("The audio context could not be created with the specified parameters."); throw new AudioContextException("The audio context could not be created with the specified parameters.");
} }
CheckForAlcErrors(); CheckErrors();
// HACK: OpenAL SI on Linux/ALSA crashes on MakeCurrent. This hack avoids calling MakeCurrent when // HACK: OpenAL SI on Linux/ALSA crashes on MakeCurrent. This hack avoids calling MakeCurrent when
// an old OpenAL version is detect - it may affect outdated OpenAL versions different than OpenAL SI, // an old OpenAL version is detect - it may affect outdated OpenAL versions different than OpenAL SI,
@ -338,23 +338,10 @@ namespace OpenTK.Audio
if (AudioDeviceEnumerator.AvailablePlaybackDevices.Count > 0) if (AudioDeviceEnumerator.AvailablePlaybackDevices.Count > 0)
MakeCurrent(); MakeCurrent();
CheckForAlcErrors(); CheckErrors();
device_name = Alc.GetString(device_handle, AlcGetString.DeviceSpecifier); device_name = Alc.GetString(device_handle, AlcGetString.DeviceSpecifier);
int attribute_count;
Alc.GetInteger(device_handle, AlcGetInteger.AttributesSize, 1, out attribute_count);
if (attribute_count > 0)
{
int[] device_attributes = new int[attribute_count];
Alc.GetInteger(device_handle, AlcGetInteger.AllAttributes, device_attributes.Length, device_attributes);
foreach (int attr in device_attributes)
{
switch ((AlcContextAttributes)attr)
{
case AlcContextAttributes.Sync: IsSynchronized = true; break;
}
}
}
lock (audio_context_lock) lock (audio_context_lock)
{ {
@ -365,17 +352,6 @@ namespace OpenTK.Audio
#endregion --- Private Methods --- #endregion --- Private Methods ---
#region void CheckForAlcErrors()
void CheckForAlcErrors()
{
AlcError err = Alc.GetError(device_handle);
if (err != AlcError.NoError)
throw new AudioContextException("Device (" + device_handle + ") " + err.ToString());
}
#endregion
#region static void MakeCurrent(AudioContext context) #region static void MakeCurrent(AudioContext context)
/// <private /> /// <private />
@ -443,6 +419,35 @@ namespace OpenTK.Audio
#region --- Public Members --- #region --- Public Members ---
#region CheckErrors
/// <summary>
/// Checks for ALC error conditions.
/// </summary>
/// <exception cref="OutOfMemoryException">Raised when an out of memory error is detected.</exception>
/// <exception cref="AudioValueException">Raised when an invalid value is detected.</exception>
/// <exception cref="AudioDeviceException">Raised when an invalid device is detected.</exception>
/// <exception cref="AudioContextException">Raised when an invalid context is detected.</exception>
public void CheckErrors()
{
new AudioDeviceErrorChecker(device_handle).Dispose();
}
#endregion
#region CurrentError
/// <summary>Returns the ALC error code for this device.</summary>
public AlcError CurrentError
{
get
{
return Alc.GetError(device_handle);
}
}
#endregion
#region public void MakeCurrent() #region public void MakeCurrent()
/// <summary>Makes the AudioContext current in the calling thread.</summary> /// <summary>Makes the AudioContext current in the calling thread.</summary>
@ -600,7 +605,7 @@ namespace OpenTK.Audio
#endregion #endregion
#region public static IList<string> AvailableDevices #region AvailableDevices
/// <summary>Returns a list of strings containing all known playback devices.</summary> /// <summary>Returns a list of strings containing all known playback devices.</summary>
public static IList<string> AvailableDevices public static IList<string> AvailableDevices
{ {
@ -611,16 +616,18 @@ namespace OpenTK.Audio
} }
#endregion public static IList<string> AvailablePlaybackDevices #endregion public static IList<string> AvailablePlaybackDevices
#region public static string Default #region DefaultDevice
/// <summary>Returns the name of the device that will be used as playback default.</summary> /// <summary>Returns the name of the device that will be used as playback default.</summary>
public static string Default public static string DefaultDevice
{ {
get get
{ {
return AudioDeviceEnumerator.DefaultPlaybackDevice; return AudioDeviceEnumerator.DefaultPlaybackDevice;
} }
} }
#endregion public static string DefaultPlaybackDevice
#endregion
#region public string CurrentDeviceName #region public string CurrentDeviceName
/// <summary>Returns the name of the used device for the current context.</summary> /// <summary>Returns the name of the used device for the current context.</summary>