2 files changed, 15 insertions, 15 deletions
diff --git a/al/eax/api.cpp b/al/eax/api.cpp
index 1eb5b20d..f0809df1 100644
--- a/al/eax/api.cpp
+++ b/al/eax/api.cpp
@@ -269,7 +269,8 @@ const GUID EAX_RINGMODULATOR_EFFECT =
 };
 
 
-const GUID EAXCONTEXT_DEFAULTPRIMARYFXSLOTID = EAXPROPERTYID_EAX40_FXSlot0;
+const GUID EAX40CONTEXT_DEFAULTPRIMARYFXSLOTID = EAXPROPERTYID_EAX40_FXSlot0;
+const GUID EAX50CONTEXT_DEFAULTPRIMARYFXSLOTID = EAXPROPERTYID_EAX50_FXSlot0;
 
 const EAX40ACTIVEFXSLOTS EAX40SOURCE_DEFAULTACTIVEFXSLOTID = EAX40ACTIVEFXSLOTS
 {{
diff --git a/al/eax/api.h b/al/eax/api.h
index a436acb2..3d78c90b 100644
--- a/al/eax/api.h
+++ b/al/eax/api.h
@@ -287,21 +287,19 @@ extern const GUID EAXPROPERTYID_EAX40_Context;
 extern const GUID EAXPROPERTYID_EAX50_Context;
 
 // EAX50
-enum : unsigned long
-{
-    HEADPHONES = 0,
-    SPEAKERS_2,
-    SPEAKERS_4,
-    SPEAKERS_5,	// 5.1 speakers
-    SPEAKERS_6, // 6.1 speakers
-    SPEAKERS_7, // 7.1 speakers
-};
+constexpr auto HEADPHONES = 0UL;
+constexpr auto SPEAKERS_2 = 1UL;
+constexpr auto SPEAKERS_4 = 2UL;
+constexpr auto SPEAKERS_5 = 3UL; // 5.1 speakers
+constexpr auto SPEAKERS_6 = 4UL; // 6.1 speakers
+constexpr auto SPEAKERS_7 = 5UL; // 7.1 speakers
+
+constexpr auto EAXCONTEXT_MINSPEAKERCONFIG = HEADPHONES;
+constexpr auto EAXCONTEXT_MAXSPEAKERCONFIG = SPEAKERS_7;
 
 // EAX50
-enum : unsigned long {
-    EAX_40 = 5, // EAX 4.0
-    EAX_50 = 6, // EAX 5.0
-};
+constexpr auto EAX_40 = 5UL; // EAX 4.0
+constexpr auto EAX_50 = 6UL; // EAX 5.0
 
 constexpr auto EAXCONTEXT_MINEAXSESSION = EAX_40;
 constexpr auto EAXCONTEXT_MAXEAXSESSION = EAX_50;
@@ -370,7 +368,8 @@ extern const GUID EAXPROPERTYID_EAX50_FXSlot2;
 extern const GUID EAXPROPERTYID_EAX40_FXSlot3;
 extern const GUID EAXPROPERTYID_EAX50_FXSlot3;
 
-extern const GUID EAXCONTEXT_DEFAULTPRIMARYFXSLOTID;
+extern const GUID EAX40CONTEXT_DEFAULTPRIMARYFXSLOTID;
+extern const GUID EAX50CONTEXT_DEFAULTPRIMARYFXSLOTID;
 
 enum EAXFXSLOT_PROPERTY : unsigned int {
     EAXFXSLOT_PARAMETER = 0,