From 08ba5d9dba798c3985bad425906564431b4f6c0d Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 17 Jan 2014 00:36:33 -0800
Subject: Use a proper struct for envelope properties

---
 OpenAL32/Include/alMidi.h | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to 'OpenAL32/Include')

diff --git a/OpenAL32/Include/alMidi.h b/OpenAL32/Include/alMidi.h
index b24f43a0..24e6675f 100644
--- a/OpenAL32/Include/alMidi.h
+++ b/OpenAL32/Include/alMidi.h
@@ -19,6 +19,17 @@ typedef struct ALsfmodulator {
     ALenum Dest;
 } ALsfmodulator;
 
+typedef struct ALenvelope {
+    ALint DelayTime;
+    ALint AttackTime;
+    ALint HoldTime;
+    ALint DecayTime;
+    ALint SustainAttn;
+    ALint ReleaseTime;
+    ALint KeyToHoldTime;
+    ALint KeyToDecayTime;
+} ALenvelope;
+
 
 typedef struct ALfontsound {
     volatile RefCount ref;
@@ -50,26 +61,8 @@ typedef struct ALfontsound {
         ALint Frequency;
     } VibratoLfo;
 
-    struct {
-        ALint DelayTime;
-        ALint AttackTime;
-        ALint HoldTime;
-        ALint DecayTime;
-        ALint SustainVol;
-        ALint ReleaseTime;
-        ALint KeyToHoldTime;
-        ALint KeyToDecayTime;
-    } ModEnv;
-    struct {
-        ALint DelayTime;
-        ALint AttackTime;
-        ALint HoldTime;
-        ALint DecayTime;
-        ALint SustainVol;
-        ALint ReleaseTime;
-        ALint KeyToHoldTime;
-        ALint KeyToDecayTime;
-    } VolEnv;
+    ALenvelope ModEnv;
+    ALenvelope VolEnv;
 
     ALint Attenuation;
 
-- 
cgit v1.2.3