diff Source/Decoder.h @ 9:53f99cbc5dbd

Heavily updated GUI. Added Heller et. al. decoding. Changed gain knobs.
author martinm_home <martin.morrell@eecs.qmul.ac.uk>
date Thu, 20 Sep 2012 16:41:01 +0100
parents d967dd1eafe8
children 76e2e62635b4
line wrap: on
line diff
--- a/Source/Decoder.h	Sun Sep 16 23:25:54 2012 +0100
+++ b/Source/Decoder.h	Thu Sep 20 16:41:01 2012 +0100
@@ -20,8 +20,9 @@
 	int    ZoomMethod; //4 positions
     
     //Decoder Speaker Layout
-    int    decoderMode; //Decoder mode, set to same as number of outputs
+    int    decoderMode; //Decoder mode
     int    channelOrder; //Natural or 5.1 ordering
+    int    mode5x; //Hidden mode for 5.x decoders accessed by programs
     
     //Front Stereo Speaker Decoding & Reverb
 	double Width; //0-90 degrees
@@ -106,6 +107,7 @@
     void xySurDecode(double &w, double &x, double &y, double &z);
 	void msSurDecode(double &w, double &x, double &y, double &z);
     
+    
     //Subwoofer
     void subSignal(double &w);
     
@@ -121,4 +123,7 @@
     void quadDecoder(double &w, double &x, double &y, double &z); //Decode to LRCS
     void fiveDecoder(double &w, double &x, double &y, double &z); //Decode to 5.0
 	void fiveOneDecoder(double &w, double &x, double &y, double &z); //Decode to 5.1
+    void heller1(double &w, double &x, double &y, double &z);
+    void heller2(double &w, double &x, double &y, double &z);
+    void craven(double &w, double &x, double &y, double &z);
 };
\ No newline at end of file