Use enums to specify the default channel configuration and sample type

2 files changed, 11 insertions, 7 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 57d8fc94..0c47818e 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -2485,8 +2485,8 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
     InitUIntMap(&device->FilterMap, ~0);
 
     //Set output format
-    device->FmtChans = DevFmtStereo;
-    device->FmtType = DevFmtFloat;
+    device->FmtChans = DevFmtChannelsDefault;
+    device->FmtType = DevFmtTypeDefault;
     device->Frequency = DEFAULT_OUTPUT_RATE;
     device->NumUpdates = 4;
     device->UpdateSize = 1024;
@@ -2747,9 +2747,9 @@ ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceN
     device->NumUpdates = 0;
     device->UpdateSize = 0;
 
-    device->Frequency = 44100;
-    device->FmtChans = DevFmtStereo;
-    device->FmtType = DevFmtShort;
+    device->Frequency = DEFAULT_OUTPUT_RATE;
+    device->FmtChans = DevFmtChannelsDefault;
+    device->FmtType = DevFmtTypeDefault;
 
     ConfigValueUInt(NULL, "sources", &device->MaxNoOfSources);
     if(device->MaxNoOfSources == 0) device->MaxNoOfSources = 256;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 3b5e00bb..cdcb6421 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -515,7 +515,9 @@ enum DevFmtType {
     DevFmtUShort = ALC_UNSIGNED_SHORT_SOFT,
     DevFmtInt    = ALC_INT_SOFT,
     DevFmtUInt   = ALC_UNSIGNED_INT_SOFT,
-    DevFmtFloat  = ALC_FLOAT_SOFT
+    DevFmtFloat  = ALC_FLOAT_SOFT,
+
+    DevFmtTypeDefault = DevFmtFloat
 };
 enum DevFmtChannels {
     DevFmtMono   = ALC_MONO_SOFT,
@@ -526,7 +528,9 @@ enum DevFmtChannels {
     DevFmtX71    = ALC_7POINT1_SOFT,
 
     /* Similar to 5.1, except using the side channels instead of back */
-    DevFmtX51Side = 0x80000000 | ALC_5POINT1_SOFT
+    DevFmtX51Side = 0x80000000,
+
+    DevFmtChannelsDefault = DevFmtStereo
 };
 
 ALuint BytesFromDevFmt(enum DevFmtType type);