Skip to content

Commit

Permalink
Updated the default speaker setup with two direct outs for low freque…
Browse files Browse the repository at this point in the history 
…ncies (issue #126).
  • Loading branch information
@belangeo
belangeo committed Jul 6, 2018
1 parent cca7e82 commit 3e64ea0
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 108 deletions.
6 changes: 0 additions & 6 deletions Builds/LinuxMakefile/Makefile
View file
Expand Up @@ -79,7 +79,6 @@ OBJECTS := \
$(JUCE_OBJDIR)/WinControl_d3e71eea.o \
$(JUCE_OBJDIR)/vbap_a3e71eea.o \
$(JUCE_OBJDIR)/lbap_a3e71ee0.o \
$(JUCE_OBJDIR)/fft_a3e71eef.o \
$(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
$(JUCE_OBJDIR)/juce_audio_basics_6b797ca1.o \
$(JUCE_OBJDIR)/juce_audio_devices_a742c38b.o \
Expand Down Expand Up @@ -194,11 +193,6 @@ $(JUCE_OBJDIR)/lbap_a3e71ee0.o: ../../Source/lbap.c
@echo "Compiling lbap.c"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"

$(JUCE_OBJDIR)/fft_a3e71eef.o: ../../Source/fft.c
-@mkdir -p $(JUCE_OBJDIR)
@echo "Compiling fft.c"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"

$(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
-@mkdir -p $(JUCE_OBJDIR)
@echo "Compiling BinaryData.cpp"
Expand Down
134 changes: 83 additions & 51 deletions Builds/MacOSX/default_preset/default_speaker_setup.xml
View file
@@ -1,56 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>

<SpeakerSetup Name="Dome UdeM 16 Correct" Dimension="3">
<SpeakerSetup Name="default_speaker_setup_subs.xml" Dimension="3">
<Ring>
<Speaker PositionX="-1" PositionY="0.40000000596046447754" PositionZ="0"
Azimuth="158.1985931396484375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="1" OutputPatch="8"/>
<Speaker PositionX="-0.40000000596046447754" PositionY="1" PositionZ="0"
Azimuth="111.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="2" OutputPatch="6"/>
<Speaker PositionX="0.40000000596046447754" PositionY="1" PositionZ="0"
Azimuth="68.1985931396484375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="3" OutputPatch="4"/>
<Speaker PositionX="1" PositionY="0.40000000596046447754" PositionZ="0"
Azimuth="21.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="4" OutputPatch="2"/>
<Speaker PositionX="1" PositionY="-0.40000000596046447754" PositionZ="0"
Azimuth="338.1986083984375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="5" OutputPatch="1"/>
<Speaker PositionX="0.40000000596046447754" PositionY="-1" PositionZ="0"
Azimuth="291.801422119140625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="6" OutputPatch="3"/>
<Speaker PositionX="-0.40000000596046447754" PositionY="-1" PositionZ="0"
Azimuth="248.198577880859375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="7" OutputPatch="5"/>
<Speaker PositionX="-1" PositionY="-0.40000000596046447754" PositionZ="0"
Azimuth="201.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="8" OutputPatch="7"/>
<Speaker PositionX="-0.65999996662139892578" PositionY="0" PositionZ="0.5"
Azimuth="180" Zenith="37.146686553955078125" Radius="0.82800960540771484375"
LayoutIndex="9" OutputPatch="14"/>
<Speaker PositionX="-0.32999998331069946289" PositionY="0.5" PositionZ="0.5"
Azimuth="123.42481231689453125" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="10" OutputPatch="12"/>
<Speaker PositionX="0.32999998331069946289" PositionY="0.5" PositionZ="0.5"
Azimuth="56.57518768310546875" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="11" OutputPatch="10"/>
<Speaker PositionX="0.65999996662139892578" PositionY="0" PositionZ="0.5"
Azimuth="0" Zenith="37.146686553955078125" Radius="0.82800960540771484375"
LayoutIndex="12" OutputPatch="13"/>
<Speaker PositionX="0.32999998331069946289" PositionY="-0.5" PositionZ="0.5"
Azimuth="303.4248046875" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="13" OutputPatch="9"/>
<Speaker PositionX="-0.32999998331069946289" PositionY="-0.5" PositionZ="0.5"
Azimuth="236.5751953125" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="14" OutputPatch="11"/>
<Speaker PositionX="0.0" PositionY="0.2"
PositionZ="1.0" Azimuth="90.0"
Zenith="78.69" Radius="1.0198"
LayoutIndex="15" OutputPatch="16"/>
<Speaker PositionX="0.0" PositionY="-0.2"
PositionZ="1.0" Azimuth="270.0"
Zenith="78.69" Radius="1.0198"
LayoutIndex="16" OutputPatch="15"/>
<Speaker PositionX="-0.92849999666213989258" PositionY="0.37139996886253356934"
PositionZ="0" Azimuth="158.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="1" OutputPatch="8" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.37139996886253356934" PositionY="0.92849999666213989258"
PositionZ="0" Azimuth="111.8000030517578125" Zenith="0" Radius="1"
LayoutIndex="2" OutputPatch="6" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.37139996886253356934" PositionY="0.92849999666213989258"
PositionZ="0" Azimuth="68.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="3" OutputPatch="4" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.92849999666213989258" PositionY="0.37139996886253356934"
PositionZ="0" Azimuth="21.799999237060546875" Zenith="0" Radius="1"
LayoutIndex="4" OutputPatch="2" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.92849999666213989258" PositionY="-0.37139996886253356934"
PositionZ="0" Azimuth="338.20001220703125" Zenith="0" Radius="1"
LayoutIndex="5" OutputPatch="1" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.37139996886253356934" PositionY="-0.92849999666213989258"
PositionZ="0" Azimuth="291.79998779296875" Zenith="0" Radius="1"
LayoutIndex="6" OutputPatch="3" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.37139996886253356934" PositionY="-0.92849999666213989258"
PositionZ="0" Azimuth="248.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="7" OutputPatch="5" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.92849999666213989258" PositionY="-0.37139996886253356934"
PositionZ="0" Azimuth="201.8000030517578125" Zenith="0" Radius="1"
LayoutIndex="8" OutputPatch="7" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.86599999666213989258" PositionY="0" PositionZ="0.5"
Azimuth="180" Zenith="30" Radius="1" LayoutIndex="9" OutputPatch="14"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.47699999809265136719" PositionY="0.72280001640319824219"
PositionZ="0.5" Azimuth="123.4199981689453125" Zenith="30" Radius="1"
LayoutIndex="10" OutputPatch="12" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0.47699999809265136719" PositionY="0.72280001640319824219"
PositionZ="0.5" Azimuth="56.5800018310546875" Zenith="30" Radius="1"
LayoutIndex="11" OutputPatch="10" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0.86599999666213989258" PositionY="0" PositionZ="0.5"
Azimuth="0" Zenith="30" Radius="1" LayoutIndex="12" OutputPatch="13"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.47699999809265136719" PositionY="-0.72280001640319824219"
PositionZ="0.5" Azimuth="303.420013427734375" Zenith="30" Radius="1"
LayoutIndex="13" OutputPatch="9" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="-0.47699999809265136719" PositionY="-0.72280001640319824219"
PositionZ="0.5" Azimuth="236.5800018310546875" Zenith="30" Radius="1"
LayoutIndex="14" OutputPatch="11" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0" PositionY="0.34200000762939453125" PositionZ="0.93970000743865966797"
Azimuth="90" Zenith="70" Radius="1" LayoutIndex="15" OutputPatch="16"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0" PositionY="-0.34200000762939453125" PositionZ="0.93970000743865966797"
Azimuth="270" Zenith="70" Radius="1" LayoutIndex="16" OutputPatch="15"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.98989999294281005859" PositionY="-0.98989999294281005859"
PositionZ="0" Azimuth="315" Zenith="0" Radius="1.3999999761581420898"
LayoutIndex="17" OutputPatch="17" Gain="0" HighPassCutoff="0"
DirectOut="1"/>
<Speaker PositionX="0.98989999294281005859" PositionY="0.98989999294281005859"
PositionZ="0" Azimuth="45" Zenith="0" Radius="1.3999999761581420898"
LayoutIndex="18" OutputPatch="18" Gain="0" HighPassCutoff="0"
DirectOut="1"/>
</Ring>
<triplet id1="8" id2="6" id3="12"/>
<triplet id1="8" id2="7" id3="14"/>
<triplet id1="8" id2="14" id3="12"/>
<triplet id1="6" id2="4" id3="12"/>
<triplet id1="4" id2="2" id3="10"/>
<triplet id1="4" id2="12" id3="10"/>
<triplet id1="2" id2="1" id3="13"/>
<triplet id1="2" id2="10" id3="13"/>
<triplet id1="1" id2="3" id3="9"/>
<triplet id1="1" id2="13" id3="9"/>
<triplet id1="3" id2="5" id3="9"/>
<triplet id1="5" id2="7" id3="11"/>
<triplet id1="5" id2="9" id3="11"/>
<triplet id1="7" id2="14" id3="11"/>
<triplet id1="14" id2="12" id3="16"/>
<triplet id1="14" id2="11" id3="15"/>
<triplet id1="14" id2="16" id3="15"/>
<triplet id1="12" id2="10" id3="16"/>
<triplet id1="10" id2="13" id3="16"/>
<triplet id1="13" id2="9" id3="15"/>
<triplet id1="13" id2="16" id3="15"/>
<triplet id1="9" id2="11" id3="15"/>
</SpeakerSetup>
134 changes: 83 additions & 51 deletions Resources/default_preset/default_speaker_setup.xml
View file
@@ -1,56 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>

<SpeakerSetup Name="Dome UdeM 16 Correct" Dimension="3">
<SpeakerSetup Name="default_speaker_setup_subs.xml" Dimension="3">
<Ring>
<Speaker PositionX="-1" PositionY="0.40000000596046447754" PositionZ="0"
Azimuth="158.1985931396484375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="1" OutputPatch="8"/>
<Speaker PositionX="-0.40000000596046447754" PositionY="1" PositionZ="0"
Azimuth="111.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="2" OutputPatch="6"/>
<Speaker PositionX="0.40000000596046447754" PositionY="1" PositionZ="0"
Azimuth="68.1985931396484375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="3" OutputPatch="4"/>
<Speaker PositionX="1" PositionY="0.40000000596046447754" PositionZ="0"
Azimuth="21.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="4" OutputPatch="2"/>
<Speaker PositionX="1" PositionY="-0.40000000596046447754" PositionZ="0"
Azimuth="338.1986083984375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="5" OutputPatch="1"/>
<Speaker PositionX="0.40000000596046447754" PositionY="-1" PositionZ="0"
Azimuth="291.801422119140625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="6" OutputPatch="3"/>
<Speaker PositionX="-0.40000000596046447754" PositionY="-1" PositionZ="0"
Azimuth="248.198577880859375" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="7" OutputPatch="5"/>
<Speaker PositionX="-1" PositionY="-0.40000000596046447754" PositionZ="0"
Azimuth="201.8014068603515625" Zenith="0" Radius="1.077032923698425293"
LayoutIndex="8" OutputPatch="7"/>
<Speaker PositionX="-0.65999996662139892578" PositionY="0" PositionZ="0.5"
Azimuth="180" Zenith="37.146686553955078125" Radius="0.82800960540771484375"
LayoutIndex="9" OutputPatch="14"/>
<Speaker PositionX="-0.32999998331069946289" PositionY="0.5" PositionZ="0.5"
Azimuth="123.42481231689453125" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="10" OutputPatch="12"/>
<Speaker PositionX="0.32999998331069946289" PositionY="0.5" PositionZ="0.5"
Azimuth="56.57518768310546875" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="11" OutputPatch="10"/>
<Speaker PositionX="0.65999996662139892578" PositionY="0" PositionZ="0.5"
Azimuth="0" Zenith="37.146686553955078125" Radius="0.82800960540771484375"
LayoutIndex="12" OutputPatch="13"/>
<Speaker PositionX="0.32999998331069946289" PositionY="-0.5" PositionZ="0.5"
Azimuth="303.4248046875" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="13" OutputPatch="9"/>
<Speaker PositionX="-0.32999998331069946289" PositionY="-0.5" PositionZ="0.5"
Azimuth="236.5751953125" Zenith="39.84869384765625" Radius="0.7803204655647277832"
LayoutIndex="14" OutputPatch="11"/>
<Speaker PositionX="0.0" PositionY="0.2"
PositionZ="1.0" Azimuth="90.0"
Zenith="78.69" Radius="1.0198"
LayoutIndex="15" OutputPatch="16"/>
<Speaker PositionX="0.0" PositionY="-0.2"
PositionZ="1.0" Azimuth="270.0"
Zenith="78.69" Radius="1.0198"
LayoutIndex="16" OutputPatch="15"/>
<Speaker PositionX="-0.92849999666213989258" PositionY="0.37139996886253356934"
PositionZ="0" Azimuth="158.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="1" OutputPatch="8" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.37139996886253356934" PositionY="0.92849999666213989258"
PositionZ="0" Azimuth="111.8000030517578125" Zenith="0" Radius="1"
LayoutIndex="2" OutputPatch="6" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.37139996886253356934" PositionY="0.92849999666213989258"
PositionZ="0" Azimuth="68.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="3" OutputPatch="4" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.92849999666213989258" PositionY="0.37139996886253356934"
PositionZ="0" Azimuth="21.799999237060546875" Zenith="0" Radius="1"
LayoutIndex="4" OutputPatch="2" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.92849999666213989258" PositionY="-0.37139996886253356934"
PositionZ="0" Azimuth="338.20001220703125" Zenith="0" Radius="1"
LayoutIndex="5" OutputPatch="1" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.37139996886253356934" PositionY="-0.92849999666213989258"
PositionZ="0" Azimuth="291.79998779296875" Zenith="0" Radius="1"
LayoutIndex="6" OutputPatch="3" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.37139996886253356934" PositionY="-0.92849999666213989258"
PositionZ="0" Azimuth="248.1999969482421875" Zenith="0" Radius="1"
LayoutIndex="7" OutputPatch="5" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.92849999666213989258" PositionY="-0.37139996886253356934"
PositionZ="0" Azimuth="201.8000030517578125" Zenith="0" Radius="1"
LayoutIndex="8" OutputPatch="7" Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.86599999666213989258" PositionY="0" PositionZ="0.5"
Azimuth="180" Zenith="30" Radius="1" LayoutIndex="9" OutputPatch="14"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="-0.47699999809265136719" PositionY="0.72280001640319824219"
PositionZ="0.5" Azimuth="123.4199981689453125" Zenith="30" Radius="1"
LayoutIndex="10" OutputPatch="12" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0.47699999809265136719" PositionY="0.72280001640319824219"
PositionZ="0.5" Azimuth="56.5800018310546875" Zenith="30" Radius="1"
LayoutIndex="11" OutputPatch="10" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0.86599999666213989258" PositionY="0" PositionZ="0.5"
Azimuth="0" Zenith="30" Radius="1" LayoutIndex="12" OutputPatch="13"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.47699999809265136719" PositionY="-0.72280001640319824219"
PositionZ="0.5" Azimuth="303.420013427734375" Zenith="30" Radius="1"
LayoutIndex="13" OutputPatch="9" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="-0.47699999809265136719" PositionY="-0.72280001640319824219"
PositionZ="0.5" Azimuth="236.5800018310546875" Zenith="30" Radius="1"
LayoutIndex="14" OutputPatch="11" Gain="0" HighPassCutoff="0"
DirectOut="0"/>
<Speaker PositionX="0" PositionY="0.34200000762939453125" PositionZ="0.93970000743865966797"
Azimuth="90" Zenith="70" Radius="1" LayoutIndex="15" OutputPatch="16"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0" PositionY="-0.34200000762939453125" PositionZ="0.93970000743865966797"
Azimuth="270" Zenith="70" Radius="1" LayoutIndex="16" OutputPatch="15"
Gain="0" HighPassCutoff="0" DirectOut="0"/>
<Speaker PositionX="0.98989999294281005859" PositionY="-0.98989999294281005859"
PositionZ="0" Azimuth="315" Zenith="0" Radius="1.3999999761581420898"
LayoutIndex="17" OutputPatch="17" Gain="0" HighPassCutoff="0"
DirectOut="1"/>
<Speaker PositionX="0.98989999294281005859" PositionY="0.98989999294281005859"
PositionZ="0" Azimuth="45" Zenith="0" Radius="1.3999999761581420898"
LayoutIndex="18" OutputPatch="18" Gain="0" HighPassCutoff="0"
DirectOut="1"/>
</Ring>
<triplet id1="8" id2="6" id3="12"/>
<triplet id1="8" id2="7" id3="14"/>
<triplet id1="8" id2="14" id3="12"/>
<triplet id1="6" id2="4" id3="12"/>
<triplet id1="4" id2="2" id3="10"/>
<triplet id1="4" id2="12" id3="10"/>
<triplet id1="2" id2="1" id3="13"/>
<triplet id1="2" id2="10" id3="13"/>
<triplet id1="1" id2="3" id3="9"/>
<triplet id1="1" id2="13" id3="9"/>
<triplet id1="3" id2="5" id3="9"/>
<triplet id1="5" id2="7" id3="11"/>
<triplet id1="5" id2="9" id3="11"/>
<triplet id1="7" id2="14" id3="11"/>
<triplet id1="14" id2="12" id3="16"/>
<triplet id1="14" id2="11" id3="15"/>
<triplet id1="14" id2="16" id3="15"/>
<triplet id1="12" id2="10" id3="16"/>
<triplet id1="10" id2="13" id3="16"/>
<triplet id1="13" id2="9" id3="15"/>
<triplet id1="13" id2="16" id3="15"/>
<triplet id1="9" id2="11" id3="15"/>
</SpeakerSetup>

0 comments on commit 3e64ea0

Please sign in to comment.