summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALc.c4
-rw-r--r--Alc/alsa.c5
-rw-r--r--Alc/coreaudio.c37
-rw-r--r--Alc/dsound.c6
-rw-r--r--Alc/pulseaudio.c2
-rw-r--r--Alc/winmm.c8
-rw-r--r--OpenAL32/Include/alMain.h2
7 files changed, 61 insertions, 3 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 9bc2f41a..41f839e9 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1369,6 +1369,8 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
device->Flags |= DEVICE_FREQUENCY_REQUEST;
device->Frequency = frequency;
+
+ device->Flags |= DEVICE_CHANNELS_REQUEST;
if(DecomposeDevFormat(format, &device->FmtChans, &device->FmtType) == AL_FALSE)
{
free(device);
@@ -2309,6 +2311,8 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
if(device->Frequency < 8000)
device->Frequency = 8000;
+ if(ConfigValueExists(NULL, "format"))
+ device->Flags |= DEVICE_CHANNELS_REQUEST;
fmt = GetConfigValue(NULL, "format", "AL_FORMAT_STEREO16");
if(DecomposeDevFormat(GetFormatFromString(fmt),
&device->FmtChans, &device->FmtType) == AL_FALSE)
diff --git a/Alc/alsa.c b/Alc/alsa.c
index 500ab13b..2a3d55ec 100644
--- a/Alc/alsa.c
+++ b/Alc/alsa.c
@@ -612,7 +612,12 @@ static ALCboolean alsa_reset_playback(ALCdevice *device)
device->FmtChans = DevFmtMono;
if((i=psnd_pcm_hw_params_set_channels(data->pcmHandle, p, 1)) < 0)
err = "set channels";
+ else if((device->Flags&DEVICE_CHANNELS_REQUEST))
+ AL_PRINT("Failed to set requested channel config %#x, got mono instead\n", device->FmtChans);
}
+ else if((device->Flags&DEVICE_CHANNELS_REQUEST))
+ AL_PRINT("Failed to set requested channel config %#x, got stereo instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
}
if(i >= 0 && (i=psnd_pcm_hw_params_set_rate_resample(data->pcmHandle, p, 0)) < 0)
{
diff --git a/Alc/coreaudio.c b/Alc/coreaudio.c
index 2ca9802b..1d086926 100644
--- a/Alc/coreaudio.c
+++ b/Alc/coreaudio.c
@@ -172,25 +172,62 @@ static ALCboolean ca_reset_playback(ALCdevice *device)
switch(streamFormat.mChannelsPerFrame)
{
case 1:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtMono)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got mono instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtMono;
break;
case 2:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtStereo)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got stereo instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtStereo;
break;
case 4:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtQuad)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got quad instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtQuad;
break;
case 6:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtX51)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got 5.1 instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtX51;
break;
case 7:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtX61)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got 6.1 instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtX61;
break;
case 8:
+ if((device->Flags&DEVICE_CHANNELS_REQUEST) &&
+ device->FmtChans != DevFmtX71)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got 7.1 instead\n", device->FmtChans);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
device->FmtChans = DevFmtX71;
break;
default:
AL_PRINT("Unhandled channel count (%d), using stereo\n", streamFormat.mChannelsPerFrame);
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
device->FmtChans = DevFmtStereo;
streamFormat.mChannelsPerFrame = 2;
break;
diff --git a/Alc/dsound.c b/Alc/dsound.c
index 6dfbe3d6..e719d0a1 100644
--- a/Alc/dsound.c
+++ b/Alc/dsound.c
@@ -354,7 +354,7 @@ static ALCboolean DSoundResetPlayback(ALCdevice *device)
}
hr = IDirectSound_GetSpeakerConfig(pData->lpDS, &speakers);
- if(SUCCEEDED(hr) && ConfigValueExists(NULL, "format"))
+ if(FAILED(hr) || (device->Flags&DEVICE_FREQUENCY_REQUEST))
{
switch(device->FmtChans)
{
@@ -371,7 +371,9 @@ static ALCboolean DSoundResetPlayback(ALCdevice *device)
speakers = DSSPEAKER_COMBINED(DSSPEAKER_5POINT1, 0);
break;
case DevFmtX61:
- /* ??? */;
+ /* ??? */
+ AL_PRINT("6.1 not supported with DirectSound\n");
+ device->Flags &= ~DEVICE_CHANNELS_REQUEST;
break;
case DevFmtX71:
speakers = DSSPEAKER_COMBINED(DSSPEAKER_7POINT1, 0);
diff --git a/Alc/pulseaudio.c b/Alc/pulseaudio.c
index 0520e627..c92cab52 100644
--- a/Alc/pulseaudio.c
+++ b/Alc/pulseaudio.c
@@ -869,7 +869,7 @@ static ALCboolean pulse_reset_playback(ALCdevice *device) //{{{
ppa_threaded_mainloop_lock(data->loop);
- if(!ConfigValueExists(NULL, "format"))
+ if(!(device->Flags&DEVICE_CHANNELS_REQUEST))
{
pa_operation *o;
o = ppa_context_get_sink_info_by_name(data->context, data->device_name, sink_info_callback, device);
diff --git a/Alc/winmm.c b/Alc/winmm.c
index 348e764f..c985ec0e 100644
--- a/Alc/winmm.c
+++ b/Alc/winmm.c
@@ -337,7 +337,15 @@ static ALCboolean WinMMOpenPlayback(ALCdevice *pDevice, const ALCchar *deviceNam
pDevice->ExtraData = pData;
if(pDevice->FmtChans != DevFmtMono)
+ {
+ if((pDevice->Flags&DEVICE_CHANNELS_REQUEST) &&
+ pDevice->FmtChans != DevFmtStereo)
+ {
+ AL_PRINT("Failed to set requested channel config %#x, got stereo instead\n", pDevice->FmtChans);
+ pDevice->Flags &= ~DEVICE_CHANNELS_REQUEST;
+ }
pDevice->FmtChans = DevFmtStereo;
+ }
switch(pDevice->FmtType)
{
case DevFmtByte:
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index d8825305..1eb8cfe0 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -527,6 +527,8 @@ struct ALCdevice_struct
#define DEVICE_USE_HRTF (1<<1)
// Frequency was requested by the app or config file
#define DEVICE_FREQUENCY_REQUEST (1<<2)
+// Channel configuration was requested by the config file
+#define DEVICE_CHANNELS_REQUEST (1<<2)
struct ALCcontext_struct
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 20:00:17 +0000