diff -Nru iem-plugin-suite-1.11.0/AllRADecoder/AllRADecoder.jucer iem-plugin-suite-1.11.1/AllRADecoder/AllRADecoder.jucer --- iem-plugin-suite-1.11.0/AllRADecoder/AllRADecoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/AllRADecoder/AllRADecoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ @@ -70,6 +70,8 @@ file="Source/LoudspeakerTableComponent.h"/> + diff -Nru iem-plugin-suite-1.11.0/AllRADecoder/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/AllRADecoder/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/AllRADecoder/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/AllRADecoder/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -579,7 +579,7 @@ const int result = NewtonApple_hull_3D(points, triangles); if (result != 1) { - return Result::fail("ERROR: An error occurred! The layout might be broken somehow."); + return Result::fail("ERROR: An error occurred! The layout might be broken somehow. Try adding additional loudspeakers (e.g. imaginary ones) or make small changes to the coordinates."); } // normalise normal vectors @@ -643,8 +643,8 @@ if (! points[i].isImaginary) { const int channel = points[i].channel; - if (channel < 1 || channel > 64) - return Result::fail("ERROR 8: A channel number is smaller than 1 or greater than 64."); + if (channel < 1) + return Result::fail("ERROR 8: A channel number is smaller than 1."); if (routing.contains(channel)) return Result::fail("ERROR 9: Channel number duplicates: a channel number may occur only once."); @@ -662,8 +662,8 @@ if (! isLayoutReady) return Result::fail("Layout not ready!"); - const int N = roundToInt(*decoderOrder) + 1; - const auto ambisonicWeights = ReferenceCountedDecoder::Weights (roundToInt (*weights)); + const int N = roundToInt (decoderOrder->load()) + 1; + const auto ambisonicWeights = ReferenceCountedDecoder::Weights (roundToInt (weights->load())); const int nCoeffs = square(N+1); const int nLsps = (int) points.size(); const int nRealLsps = nLsps - imaginaryFlags.countNumberOfSetBits(); diff -Nru iem-plugin-suite-1.11.0/AllRADecoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/AllRADecoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/AllRADecoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/AllRADecoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -140,12 +140,12 @@ private: //============================================================================== // list of used audio parameters - float* inputOrderSetting; - float* useSN3D; - float* decoderOrder; - float* exportDecoder; - float* exportLayout; - float* weights; + std::atomic* inputOrderSetting; + std::atomic* useSN3D; + std::atomic* decoderOrder; + std::atomic* exportDecoder; + std::atomic* exportLayout; + std::atomic* weights; ValueTree loudspeakers {"Loudspeakers"}; diff -Nru iem-plugin-suite-1.11.0/BinauralDecoder/BinauralDecoder.jucer iem-plugin-suite-1.11.1/BinauralDecoder/BinauralDecoder.jucer --- iem-plugin-suite-1.11.0/BinauralDecoder/BinauralDecoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/BinauralDecoder/BinauralDecoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/BinauralDecoder/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/BinauralDecoder/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/BinauralDecoder/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/BinauralDecoder/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -128,15 +128,12 @@ { checkInputAndOutput(this, *inputOrderSetting, 0, true); - stereoTemp.setSize(2, samplesPerBlock); - ProcessSpec convSpec; convSpec.sampleRate = sampleRate; convSpec.maximumBlockSize = samplesPerBlock; convSpec.numChannels = 2; // convolve two channels (which actually point two one and the same input channel) EQ.prepare(convSpec); - } void BinauralDecoderAudioProcessor::releaseResources() @@ -166,8 +163,6 @@ for (int ch = 1; ch < nCh; ++ch) buffer.applyGain(ch, 0, buffer.getNumSamples(), sn3d2n3d[ch]); - AudioBlock tempBlock (stereoTemp); - FloatVectorOperations::clear((float*) accumMid, fftLength + 2); FloatVectorOperations::clear((float*) accumSide, fftLength + 2); @@ -342,6 +337,12 @@ order = tmpOrder; } + //get number of mid- and side-channels + nSideCh = order * (order + 1) / 2; + nMidCh = square(order + 1) - nSideCh; //nMidCh = nCh - nSideCh; //nCh should be equalt to (order+1)^2 + + if (order < 1) + return; AudioBuffer resampledIRs; bool useResampled = false; @@ -429,10 +430,6 @@ fftwf_execute(fftForward); FloatVectorOperations::copy(irsFrequencyDomain.getWritePointer(i), (float*)out, 2 * (fftLength / 2 + 1)); } - - //get number of mid- and side-channels - nSideCh = order * (order + 1) / 2; - nMidCh = square(order + 1) - nSideCh; //nMidCh = nCh - nSideCh; //nCh should be equalt to (order+1)^2 } diff -Nru iem-plugin-suite-1.11.0/BinauralDecoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/BinauralDecoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/BinauralDecoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/BinauralDecoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -75,9 +75,9 @@ private: // list of used audio parameters - float* inputOrderSetting; - float* useSN3D; - float* applyHeadphoneEq; + std::atomic* inputOrderSetting; + std::atomic* useSN3D; + std::atomic* applyHeadphoneEq; Convolution EQ; @@ -94,7 +94,7 @@ fftwf_plan fftForward, fftBackwardMid, fftBackwardSide; bool fftwWasPlanned = false; - AudioBuffer stereoSum, stereoTemp; + AudioBuffer stereoSum; AudioBuffer overlapBuffer; AudioBuffer irs[7]; diff -Nru iem-plugin-suite-1.11.0/ChangeLog.md iem-plugin-suite-1.11.1/ChangeLog.md --- iem-plugin-suite-1.11.0/ChangeLog.md 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/ChangeLog.md 2020-04-02 15:28:39.000000000 +0000 @@ -3,6 +3,19 @@ Please note, that breaking changes are marked with `!!BREAKING CHANGE!!`. They might lead to an unexpected behaviour and might not be compatible with your previous projects without making some adaptions. See the [Breaking changes article](https://plugins.iem.at/docs/breakingchanges/) for more information. +## v1.11.1 +- general changes + - standalones: prevents crashes when there's no audio input device + - smaller bug fixes +- plug-in specific changes + - **AllRA**Decoder + - removed the 64 channel number limit for loudspeakers layouts with more than 64 loudspeakers + - **Simple**Decoder + - decoder configuration is now stored within the plug-in state when saving a session, so no need to provide the decoder file when sharing projects + - added decoder presets for standard layouts and IEM studios + -**Energy**Visualizer + - sending RMS values with OSCAddressPattern "/RMS" + ## v1.11.0 - general changes - new standalone versions with JACK support on linux and macOS diff -Nru iem-plugin-suite-1.11.0/_configurationFiles/22_2_NHK.json iem-plugin-suite-1.11.1/_configurationFiles/22_2_NHK.json --- iem-plugin-suite-1.11.0/_configurationFiles/22_2_NHK.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/_configurationFiles/22_2_NHK.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,1621 @@ +{ + "Decoder": { + "Name": "22.2 NHK", + "Description": "AllRAD-decoder for a 22.2 loudspeaker layout with stereo subwoofers.", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.03310225531458854675, + 0.02213085815310478210, + 0.00329327187500894070, + 0.04935869947075843811, + 0.04125791415572166443, + 0.00255896523594856262, + -0.02850615978240966797, + 0.00575093459337949753, + 0.03669725731015205383, + 0.05019125342369079590, + 0.00513867987319827080, + -0.01335488446056842804, + -0.00450558494776487350, + -0.02932209335267543793, + 0.00460679316893219948, + 0.01573733240365982056, + 0.04703781008720397949, + 0.00646721711382269859, + -0.01879251003265380859, + -0.00215430627577006817, + 0.01429620943963527679, + -0.00470704445615410805, + -0.01608021929860115051, + 0.00204958114773035049, + -0.00567290885373950005, + 0.03457100316882133484, + 0.00612456072121858597, + -0.01729719899594783783, + -0.00269874488003551960, + 0.00501938676461577415, + 0.00175738334655761719, + 0.01036491803824901581, + -0.00222560041584074497, + -0.00459609273821115494, + -0.00073744246037676930, + -0.02093969471752643585, + 0.01837057247757911682, + 0.00447601685300469398, + -0.01178452372550964355, + -0.00180258171167224646, + 0.00439758365973830223, + 0.00009518604201730341, + -0.00249111512675881386, + -0.00006455284892581403, + 0.00299044325947761536, + -0.00030597543809562922, + 0.00249541760422289371, + -0.00274001993238925934, + -0.02680098079144954681, + 0.00422561680898070335, + 0.00232662656344473362, + -0.00560644594952464104, + -0.00037271037581376731, + 0.00138937833253294230, + -0.00120641395915299654, + 0.00010149936861125752, + 0.00176326511427760124, + 0.00104016705881804228, + -0.00139844650402665138, + -0.00056882231729105115, + 0.00040503434138372540, + 0.00485470378771424294, + -0.00347903952933847904, + -0.02393191121518611908 + ], + [ + 0.03309301659464836121, + -0.02212361618876457214, + 0.00328899337910115719, + 0.04934812337160110474, + -0.04124686121940612793, + -0.00255928095430135727, + -0.02850653789937496185, + 0.00574380299076437950, + 0.03669396042823791504, + -0.05018157139420509338, + -0.00513959629461169243, + 0.01335685979574918747, + -0.00450403336435556412, + -0.02933005802333354950, + 0.00459884013980627060, + 0.01574186049401760101, + -0.04703379794955253601, + -0.00646815355867147446, + 0.01880022697150707245, + 0.00215713935904204845, + 0.01430578995496034622, + -0.00470890058204531670, + -0.01608968339860439301, + 0.00204071169719099998, + -0.00566331483423709869, + -0.03457401320338249207, + -0.00612479401752352715, + 0.01730943657457828522, + 0.00270431488752365112, + -0.00502449972555041313, + 0.00176314439158886671, + 0.01037637051194906235, + -0.00222897226922214031, + -0.00460127880796790123, + -0.00074678566306829453, + -0.02092973515391349792, + -0.01837885379791259766, + -0.00447535607963800430, + 0.01179682184010744095, + 0.00180944753810763359, + -0.00440491316840052605, + -0.00009698337089503184, + -0.00249536125920712948, + -0.00005543903898796998, + 0.00299534620717167854, + -0.00030934464302845299, + 0.00249732891097664833, + -0.00274913990870118141, + -0.02679499238729476929, + -0.00423528999090194702, + -0.00232533505186438560, + 0.00561390444636344910, + 0.00037955498555675149, + -0.00139474088791757822, + 0.00120588857680559158, + -0.00010055641905637458, + 0.00175938988104462624, + 0.00104154692962765694, + -0.00138959125615656376, + -0.00057026813738048077, + 0.00040225358679890633, + 0.00486244214698672295, + -0.00348754227161407471, + -0.02393197081983089447 + ], + [ + 0.01853341981768608093, + 0.00000157802560352138, + 0.00149224337656050920, + 0.03110158629715442657, + 0.00000327604311678442, + 0.00000157362205754907, + -0.01819522865116596222, + 0.00306447059847414494, + 0.03300305455923080444, + 0.00000494017558594351, + 0.00000388089893021970, + -0.00000038127546986289, + -0.00261855730786919594, + -0.02337793260812759399, + 0.00366533990018069744, + 0.03311257064342498779, + 0.00000651329173706472, + 0.00000648836248728912, + 0.00000012177025610072, + -0.00000235419065575115, + 0.01346801966428756714, + -0.00382639002054929733, + -0.02090241201221942902, + 0.00398839497938752174, + 0.03189145401120185852, + 0.00000793791332398541, + 0.00000902326064533554, + 0.00000121429718547006, + -0.00000477270123155904, + -0.00000131080525989091, + 0.00242834654636681080, + 0.01552049722522497177, + -0.00361467548646032810, + -0.01809289865195751190, + 0.00407429039478302002, + 0.02964567206799983978, + 0.00000910795370145934, + 0.00001117921601689886, + 0.00000249679033004213, + -0.00000677494927003863, + -0.00000371126316167647, + 0.00000196014457287674, + -0.00825008191168308258, + 0.00278108986094594002, + 0.01228373777121305466, + -0.00316750677302479744, + -0.01501799840480089188, + 0.00395779125392436981, + 0.02664165943861007690, + 0.00000986565009952756, + 0.00001272884946956765, + 0.00000355492170456273, + -0.00000810846995591419, + -0.00000646405214865808, + 0.00000283495023722935, + 0.00000279332812169741, + -0.00131282838992774487, + -0.00856814533472061157, + 0.00201104604639112949, + 0.00925428885966539383, + -0.00256119272671639919, + -0.01180896814912557602, + 0.00367458420805633068, + 0.02313372865319252014 + ], + [ + 0.12118127197027206421, + 0.07807104289531707764, + -0.08137162774801254272, + -0.09684120118618011475, + -0.09999740123748779297, + -0.02849675342440605164, + 0.00138857949059456587, + 0.03787555545568466187, + 0.00619027763605117798, + 0.06057235971093177795, + 0.02979528345167636871, + -0.01885635964572429657, + -0.00896285567432641983, + 0.01268242113292217255, + 0.01244819723069667816, + 0.04712467268109321594, + -0.01013410557061433792, + -0.00688927294686436653, + 0.01094559580087661743, + 0.00147408689372241497, + 0.01400792039930820465, + 0.00317332241684198380, + -0.00443966314196586609, + -0.02453578449785709381, + -0.04583415389060974121, + -0.01059280335903167725, + -0.01111993473023176193, + -0.00007676894892938435, + 0.00965042784810066223, + 0.00733115710318088531, + 0.00550902029499411583, + -0.00002727697392401751, + -0.00426260847598314285, + -0.00091730413259938359, + 0.00937419757246971130, + 0.02081814594566822052, + 0.00486718025058507919, + 0.00961506366729736328, + -0.00342602492310106754, + -0.01249435357749462128, + -0.00649188086390495300, + 0.00302884262055158615, + -0.00229972903616726398, + -0.00932174175977706909, + -0.00373574648983776569, + -0.00362058868631720543, + 0.00047208412433974445, + 0.00371843390166759491, + -0.00463593937456607819, + 0.00270209251902997494, + -0.00000847924911795417, + 0.00171152956318110228, + 0.00453044380992650986, + -0.00030973431421443820, + -0.00284763518720865250, + -0.00130445451941341162, + -0.00277726142667233944, + -0.00137810886371880770, + 0.00085899647092446685, + 0.00646687019616365433, + 0.00813213456422090530, + 0.00435270648449659348, + -0.00492006400600075722, + 0.00442133285105228424 + ], + [ + 0.12118364870548248291, + -0.07807558029890060425, + -0.08138324320316314697, + -0.09683643281459808350, + 0.09999712556600570679, + 0.02849839255213737488, + 0.00139313517138361931, + 0.03788735717535018921, + 0.00617882423102855682, + -0.06056344881653785706, + -0.02980021201074123383, + 0.01885871030390262604, + -0.00896942894905805588, + 0.01268371939659118652, + 0.01243626698851585388, + 0.04713245108723640442, + 0.01012587826699018478, + 0.00689991191029548645, + -0.01094727590680122375, + -0.00146799674257636070, + 0.01402355264872312546, + 0.00317806960083544254, + -0.00444233836606144905, + -0.02452692948281764984, + -0.04583295434713363647, + 0.01059421896934509277, + 0.01110695488750934601, + 0.00007938260387163609, + -0.00965782068669795990, + -0.00733615597710013390, + 0.00550429383292794228, + -0.00003763919812627137, + -0.00426531815901398659, + -0.00090935698244720697, + 0.00937287323176860809, + 0.02081602811813354492, + -0.00486803613603115082, + -0.00960677675902843475, + 0.00341564696282148361, + 0.01250351872295141220, + 0.00649224221706390381, + -0.00302624935284256935, + -0.00228945142589509487, + -0.00932517368346452713, + -0.00372885400429368019, + -0.00362278008833527565, + 0.00046583981020376086, + 0.00371170276775956154, + -0.00463876128196716309, + -0.00269702752120792866, + 0.00000987034400168341, + -0.00170053949113935232, + -0.00453664176166057587, + 0.00030660282936878502, + 0.00285009364597499371, + 0.00129490485414862633, + -0.00278982869349420071, + -0.00138758076354861259, + 0.00086694670608267188, + 0.00646185036748647690, + 0.00813829060643911362, + 0.00434663658961653709, + -0.00491241272538900375, + 0.00442379293963313103 + ], + [ + 0.03239376097917556763, + 0.04422052577137947083, + 0.00695387832820415497, + 0.02880400605499744415, + 0.04852158576250076294, + 0.01235512923449277878, + -0.02877842448651790619, + 0.00605393154546618462, + -0.02107596769928932190, + 0.00884793326258659363, + 0.01217826083302497864, + -0.02754659019410610199, + -0.01119821611791849136, + -0.01899878308176994324, + -0.00949344318360090256, + -0.04788357391953468323, + -0.02935169078409671783, + -0.00328151672147214413, + -0.02497593127191066742, + -0.01356180850416421890, + 0.01649706065654754639, + -0.00663654366508126259, + 0.00854114256799221039, + -0.01498617418110370636, + -0.02950791083276271820, + -0.03257958218455314636, + -0.01356818340718746185, + -0.00681114383041858673, + -0.01000530831515789032, + 0.01236012764275074005, + 0.00854095350950956345, + 0.00976802408695220947, + 0.00788411404937505722, + 0.01856858655810356140, + -0.00301538431085646152, + 0.00516654085367918015, + -0.01157952193170785904, + -0.00684985844418406487, + 0.00655257655307650566, + 0.00227851769886910915, + 0.01013792399317026138, + 0.00739157525822520256, + -0.00641359621658921242, + 0.00353106344118714333, + -0.00149057304952293634, + 0.00935558881610631943, + 0.01250044442713260651, + 0.00937040429562330246, + 0.02104253694415092468, + 0.00525809125974774361, + 0.00480114389210939407, + 0.00918602850288152695, + 0.00642223702743649483, + 0.00428482471033930779, + 0.00334119237959384918, + -0.00359263876453042030, + -0.00270127831026911736, + -0.00369075755588710308, + -0.00298791145905852318, + -0.00499613955616950989, + 0.00089805043535307050, + 0.00303671881556510925, + 0.00758116133511066437, + 0.01491875015199184418 + ], + [ + 0.03240429982542991638, + -0.04423142597079277039, + 0.00694913230836391449, + 0.02881555259227752686, + -0.04853393137454986572, + -0.01235094293951988220, + -0.02878836356103420258, + 0.00604408653452992439, + -0.02107239328324794769, + -0.00886146072298288345, + -0.01216388028115034103, + 0.02755512297153472900, + -0.01119278743863105774, + -0.01900498569011688232, + -0.00950185954570770264, + -0.04788179695606231689, + 0.02933120913803577423, + 0.00330292084254324436, + 0.02498103864490985870, + 0.01356172561645507812, + 0.01650167070329189301, + -0.00662725232541561127, + 0.00854433700442314148, + -0.01498022116720676422, + -0.02951555512845516205, + 0.03256776556372642517, + 0.01357894856482744217, + 0.00680852355435490608, + 0.00999787729233503342, + -0.01236360520124435425, + 0.00854001939296722412, + 0.00976572558283805847, + 0.00789691135287284851, + 0.01857132092118263245, + -0.00299264071509242058, + 0.00513805216178297997, + 0.01159810647368431091, + 0.00684008374810218811, + -0.00655629346147179604, + -0.00229694764129817486, + -0.01013209391385316849, + -0.00739711336791515350, + -0.00641156360507011414, + 0.00352561310864984989, + -0.00149835483171045780, + 0.00936123821884393692, + 0.01249741017818450928, + 0.00939283799380064011, + 0.02101179957389831543, + -0.00522341299802064896, + -0.00482024066150188446, + -0.00918650440871715546, + -0.00644074054434895515, + -0.00427029794082045555, + -0.00333912228234112263, + 0.00359185691922903061, + -0.00270316959358751774, + -0.00368203083053231239, + -0.00300179258920252323, + -0.00499422615393996239, + 0.00088821270037442446, + 0.00303125986829400063, + 0.00758860772475600243, + 0.01491698529571294785 + ], + [ + 0.11320815980434417725, + -0.00000302678904517961, + -0.08640217781066894531, + -0.11564314365386962891, + 0.00000764343712944537, + -0.00000698986059433082, + 0.00620642350986599922, + 0.06042741239070892334, + 0.08872661739587783813, + -0.00001044098189595388, + 0.00001114455335482489, + 0.00000513300210513989, + -0.00116868526674807072, + 0.01712112128734588623, + -0.03334476798772811890, + -0.06916483491659164429, + 0.00001024911853164667, + -0.00001310186598857399, + -0.00000440136500401422, + 0.00000027210737130190, + 0.01521136611700057983, + -0.00855285022407770157, + -0.01512971241027116776, + 0.02247256971895694733, + 0.04912601038813591003, + -0.00000762519448471721, + 0.00001328607322648168, + -0.00000064649896103219, + -0.00000072064295864038, + 0.00000435168112744577, + 0.00013261711865197867, + -0.00789953954517841339, + -0.00176238594576716423, + 0.00449204863980412483, + -0.01346852630376815796, + -0.02715717256069183350, + 0.00000382212601834908, + -0.00001195802997244755, + 0.00000739042206987506, + 0.00000117436184154940, + -0.00000833850754133891, + -0.00000376336811314104, + -0.00661393534392118454, + -0.00551876751706004143, + 0.01083910651504993439, + 0.00942686107009649277, + 0.00317075592465698719, + 0.00073457823600620031, + 0.01004129182547330856, + -0.00000031512138320977, + 0.00000954299866862129, + -0.00001278098443435738, + -0.00000115541365630634, + 0.00001021342905005440, + 0.00000264064919974771, + 0.00000091356218945293, + -0.00178405072074383497, + 0.00560761149972677231, + 0.00070212059654295444, + -0.00814006663858890533, + -0.01186436694115400314, + -0.00236002868041396141, + 0.00716022402048110962, + -0.00024326800485141575 + ], + [ + 0.12102497369050979614, + 0.11477577686309814453, + -0.08304928988218307495, + -0.01723389700055122375, + -0.01011852547526359558, + -0.03914003074169158936, + 0.00304927444085478783, + 0.01004061009734869003, + -0.10242468118667602539, + -0.07510413229465484619, + -0.00978098437190055847, + -0.02546575665473937988, + -0.00768516073003411293, + -0.00548628438264131546, + 0.03649863600730895996, + 0.01407257094979286194, + 0.01135615631937980652, + 0.02211514115333557129, + 0.00272454461082816124, + -0.00089080724865198135, + 0.01232680212706327438, + 0.00326031143777072430, + 0.00511698704212903976, + 0.01070878840982913971, + 0.04933306947350502014, + 0.02400941587984561920, + 0.01370012480765581131, + 0.00110072700772434473, + 0.00652111135423183441, + 0.00743640633299946785, + 0.00508429994806647301, + 0.00591764692217111588, + 0.01104772090911865234, + 0.00037555117160081863, + -0.01441853120923042297, + -0.00860813260078430176, + -0.00393183389678597450, + -0.00432269228622317314, + 0.00110732985194772482, + 0.01104066334664821625, + 0.00293282256461679935, + 0.00565836951136589050, + -0.00172208633739501238, + -0.00564944976940751076, + -0.00601623998954892159, + -0.00642779469490051270, + 0.00342666078358888626, + -0.01123249158263206482, + -0.00688037322834134102, + 0.00368668627925217152, + -0.00785307493060827255, + 0.00047028998960740864, + -0.00480525614693760872, + -0.00510504143312573433, + -0.00233471719548106194, + 0.00068994209868833423, + -0.00224527204409241676, + -0.00148216297384351492, + -0.00323048024438321590, + -0.00544178532436490059, + -0.01087999809533357620, + -0.00252493144944310188, + -0.00010722524893935770, + 0.00047246369649656117 + ], + [ + 0.12101804465055465698, + -0.11476867645978927612, + -0.08304852247238159180, + -0.01722818799316883087, + 0.01011285372078418732, + 0.03913991153240203857, + 0.00305179692804813385, + 0.01004218123853206635, + -0.10242519527673721313, + 0.07511141896247863770, + 0.00977601669728755951, + 0.02546193078160285950, + -0.00767989736050367355, + -0.00548042915761470795, + 0.03649460896849632263, + 0.01407164894044399261, + -0.01136145275086164474, + -0.02210596576333045959, + -0.00273149018175899982, + 0.00088769494323059916, + 0.01232782378792762756, + 0.00324839726090431213, + 0.00511136325076222420, + 0.01070540584623813629, + 0.04934294149279594421, + -0.02401684038341045380, + -0.01370403729379177094, + -0.00109002331737428904, + -0.00650728307664394379, + -0.00744476728141307831, + 0.00508039398118853569, + 0.00591966090723872185, + 0.01104756724089384079, + 0.00037424592301249504, + -0.01440785638988018036, + -0.00861788168549537659, + 0.00394269824028015137, + 0.00431659119203686714, + -0.00111479067709296942, + -0.01104546803981065750, + -0.00293217645958065987, + -0.00565041461959481239, + -0.00173149944748729467, + -0.00565498322248458862, + -0.00602011382579803467, + -0.00641823327168822289, + 0.00343794538639485836, + -0.01124369353055953979, + -0.00688273832201957703, + -0.00368951121345162392, + 0.00786620564758777618, + -0.00047629678738303483, + 0.00479673827067017555, + 0.00510751921683549881, + 0.00234134518541395664, + -0.00068597594508901238, + -0.00224431813694536686, + -0.00146976823452860117, + -0.00322874588891863823, + -0.00543785886839032173, + -0.01088554505258798599, + -0.00254106777720153332, + -0.00010471042332937941, + 0.00048062860150821507 + ], + [ + 0.03823474794626235962, + 0.03187474980950355530, + 0.04089117422699928284, + 0.03427171707153320312, + 0.03653768450021743774, + 0.04081404581665992737, + 0.01189336646348237991, + 0.04275364056229591370, + 0.00325565971434116364, + 0.02218830399215221405, + 0.04993490129709243774, + 0.02536705508828163147, + -0.01420121919363737106, + 0.02482498250901699066, + 0.00301166996359825134, + -0.01602412201464176178, + 0.00490671582520008087, + 0.02999027818441390991, + 0.03650078549981117249, + 0.00373037299141287804, + -0.01845825649797916412, + 0.00175561464857310057, + 0.00000049981491656581, + -0.02379847690463066101, + -0.01914730481803417206, + -0.00574001949280500412, + 0.00516914296895265579, + 0.02142363972961902618, + 0.01339192502200603485, + -0.00648570014163851738, + -0.00841861125081777573, + -0.00743031501770019531, + -0.00225081387907266617, + -0.02044946886599063873, + -0.02678047493100166321, + -0.01271659694612026215, + -0.00854636449366807938, + -0.00868586171418428421, + 0.00127533054910600185, + 0.00764723354950547218, + 0.00072201585862785578, + -0.00486515415832400322, + -0.00027963044703938067, + -0.00406514061614871025, + -0.00155360694043338299, + -0.01120263524353504181, + -0.02044701389968395233, + -0.01618387550115585327, + -0.00454626558348536491, + -0.00652281939983367920, + -0.01076653320342302322, + -0.00749076716601848602, + -0.00239693326875567436, + 0.00137506844475865364, + 0.00048401401727460325, + -0.00102192722260951996, + 0.00072872545570135117, + 0.00012669610441662371, + 0.00048412196338176727, + -0.00444584200158715248, + -0.00871635042130947113, + -0.00963514018803834915, + -0.00486033363267779350, + 0.00103001715615391731 + ], + [ + 0.03822791576385498047, + -0.03186966478824615479, + 0.04088449105620384216, + 0.03426788374781608582, + -0.03653265908360481262, + -0.04080950468778610229, + 0.01188989076763391495, + 0.04275313764810562134, + 0.00325486692599952221, + -0.02218409255146980286, + -0.04993303492665290833, + -0.02536479942500591278, + -0.01420719083398580551, + 0.02483038790524005890, + 0.00301250279881060123, + -0.01602375134825706482, + -0.00490302639082074165, + -0.02998798340559005737, + -0.03650434687733650208, + -0.00372582348063588142, + -0.01847072876989841461, + 0.00176017137710005045, + 0.00000587770318816183, + -0.02380034886300563812, + -0.01914648525416851044, + 0.00574311986565589905, + -0.00516308331862092018, + -0.02142616547644138336, + -0.01339503191411495209, + 0.00649569928646087646, + -0.00843247398734092712, + -0.00743417441844940186, + -0.00224194396287202835, + -0.02044957503676414490, + -0.02678380534052848816, + -0.01271522045135498047, + 0.00854803062975406647, + 0.00869627017527818680, + -0.00127208884805440903, + -0.00765171553939580917, + -0.00072013773024082184, + 0.00487778894603252411, + -0.00028629839653149247, + -0.00407550763338804245, + -0.00154729292262345552, + -0.01119642145931720734, + -0.02044899575412273407, + -0.01618505455553531647, + -0.00454480201005935669, + 0.00652313837781548500, + 0.01077846996486186981, + 0.00749965710565447807, + 0.00239360216073691845, + -0.00137783808168023825, + -0.00047965475823730230, + 0.00103314779698848724, + 0.00073176372097805142, + 0.00011957731476286426, + 0.00048437964869663119, + -0.00443928549066185951, + -0.00870899297297000885, + -0.00963459815829992294, + -0.00485669262707233429, + 0.00102971738670021296 + ], + [ + 0.04416621848940849304, + -0.00000196840733224235, + 0.04441894218325614929, + 0.05566719919443130493, + -0.00000332029890159902, + -0.00000162266655934218, + 0.00802783016115427017, + 0.06569921970367431641, + 0.04400639608502388000, + -0.00000364653647011437, + -0.00000282796668216179, + -0.00000009451760973889, + -0.01984800957143306732, + 0.03262102603912353516, + 0.05616516619920730591, + 0.03198552876710891724, + -0.00000311281064568902, + -0.00000269574957201257, + -0.00000079875667324814, + 0.00000067332200615056, + -0.01875725574791431427, + -0.00337755866348743439, + 0.03541867807507514954, + 0.04231523722410202026, + 0.02121961861848831177, + -0.00000214405281440122, + -0.00000121517462048359, + -0.00000086875400029385, + 0.00000022306319635845, + 0.00000056103021961462, + -0.00414814334362745285, + -0.01206964347511529922, + 0.00798735953867435455, + 0.02917726151645183563, + 0.02824143320322036743, + 0.01239884924143552780, + -0.00000123533948226395, + 0.00000105947685824503, + 0.00000018554118241809, + -0.00000060809873048129, + 0.00000069488305598497, + 0.00000001441140540237, + 0.00244903960265219212, + -0.00228783464990556240, + -0.00173095404170453548, + 0.00994849111884832382, + 0.01965933479368686676, + 0.01611355692148208618, + 0.00572343263775110245, + -0.00000072502302828070, + 0.00000314748376695206, + 0.00000240639587900660, + -0.00000136172241127497, + 0.00000028975142640775, + 0.00000066525188913147, + -0.00000120427637284592, + -0.00065475510200485587, + 0.00315915746614336967, + 0.00284748314879834652, + 0.00251126196235418320, + 0.00693463068455457687, + 0.01041267439723014832, + 0.00686440058052539825, + 0.00109652744140475988 + ], + [ + 0.07281720638275146484, + 0.00000479510708828457, + 0.11256048083305358887, + 0.00000158623981860728, + 0.00000262338312495558, + 0.00000748489901525318, + 0.11455319076776504517, + 0.00000166379084021173, + -0.00000170267958310433, + 0.00000758178020987543, + 0.00000451263395007118, + 0.00000681224310028483, + 0.09189040958881378174, + -0.00000050595411948962, + -0.00000308924268210831, + -0.00000076674194815496, + -0.00000292071240437508, + 0.00001504963165643858, + 0.00000436275331594516, + 0.00000361774209522991, + 0.05685766041278839111, + -0.00000425718644692097, + -0.00000344748195857392, + -0.00000150183529967762, + 0.00000384549684895319, + -0.00000103230252079811, + -0.00000655638314128737, + 0.00001840779259509873, + 0.00000157421288804471, + 0.00000069087155907255, + 0.02194879762828350067, + -0.00000763839307182934, + -0.00000242998362409708, + -0.00000179261314769974, + 0.00000840832399262581, + 0.00000162672517944884, + 0.00000109700692974002, + -0.00000224292762140976, + -0.00000952730351855280, + 0.00001382416758133331, + -0.00000273904629466415, + 0.00000057070320735875, + -0.00341858575120568275, + -0.00000867986818775535, + -0.00000061376175608530, + -0.00000127483770029357, + 0.00001176234582089819, + 0.00000408288269682089, + -0.00000074871593369608, + -0.00000251556730290758, + 0.00000284353677670879, + -0.00000298471513815457, + -0.00000977909439825453, + 0.00000187434784493234, + -0.00000629932992524118, + 0.00000355144538843888, + -0.01525186095386743546, + -0.00000672792975819902, + 0.00000085505195102087, + -0.00000008109199001183, + 0.00001135606271418510, + 0.00000681638539390406, + -0.00000182859673714120, + -0.00000030995465749584 + ], + [ + 0.04255681112408638000, + 0.04173205420374870300, + 0.04346428066492080688, + -0.03260423988103866577, + -0.03937913849949836731, + 0.04838372394442558289, + 0.00908870156854391098, + -0.04135344177484512329, + -0.01176848635077476501, + 0.00809266697615385056, + -0.05251901596784591675, + 0.02256275899708271027, + -0.01829426735639572144, + -0.02511933818459510803, + -0.01044798828661441803, + 0.02822538092732429504, + 0.01356768235564231873, + 0.01632467471063137054, + -0.03641969338059425354, + -0.00429996335878968239, + -0.01866151578724384308, + -0.00311706238426268101, + 0.00066450319718569517, + 0.03606395423412322998, + -0.01393706444650888443, + -0.01132219750434160233, + 0.01430916599929332733, + 0.01998918130993843079, + -0.01139316800981760025, + -0.00946002360433340073, + -0.00531163858249783516, + 0.00666854996234178543, + 0.00821592286229133606, + 0.02238329127430915833, + -0.02186447009444236755, + -0.00355935981497168541, + 0.00067853479413315654, + -0.01525670103728771210, + 0.00354918185621500015, + 0.01601615920662879944, + 0.00055392348440364003, + -0.00086133641889318824, + 0.00169973995070904493, + 0.00450497027486562729, + 0.00485236942768096924, + 0.00415507657453417778, + -0.02004948817193508148, + -0.00128066120669245720, + 0.00642480840906500816, + 0.00256504514254629612, + 0.00234015495516359806, + -0.01016800384968519211, + -0.00661959685385227203, + 0.00773026188835501671, + -0.00104010058566927910, + 0.00334537657909095287, + -0.00026996177621185780, + 0.00068530446151271462, + -0.00250769080594182014, + -0.00163134676404297352, + -0.01165615394711494446, + 0.00466040754690766335, + 0.00732497591525316238, + -0.00113260210491716862 + ], + [ + 0.04257141426205635071, + -0.04174359142780303955, + 0.04347521066665649414, + -0.03262184560298919678, + 0.03938955441117286682, + -0.04839505255222320557, + 0.00907947029918432236, + -0.04137481003999710083, + -0.01176173239946365356, + -0.00809803884476423264, + 0.05253594368696212769, + -0.02256058901548385620, + -0.01831789687275886536, + -0.02512573823332786560, + -0.01043687388300895691, + 0.02821734733879566193, + -0.01355526223778724670, + -0.01633682288229465485, + 0.03642925620079040527, + 0.00431525940075516701, + -0.01867849752306938171, + -0.00310342013835906982, + 0.00067347654839977622, + 0.03605738654732704163, + -0.01392675563693046570, + 0.01130340341478586197, + -0.01429543178528547287, + -0.01999925449490547180, + 0.01138660591095685959, + 0.00947435852140188217, + -0.00531075987964868546, + 0.00668587349355220795, + 0.00821567419916391373, + 0.02238157205283641815, + -0.02185708656907081604, + -0.00355823175050318241, + -0.00066876353230327368, + 0.01523929182440042496, + -0.00354460417293012142, + -0.01601284556090831757, + -0.00056559278164058924, + 0.00086713751079514623, + 0.00170818588230758905, + 0.00450738565996289253, + 0.00484438287094235420, + 0.00415645306929945946, + -0.02004782855510711670, + -0.00128087343182414770, + 0.00641181739047169685, + -0.00256273522973060608, + -0.00232900679111480713, + 0.01016344223171472549, + 0.00661271484568715096, + -0.00771739613264799118, + 0.00103950570337474346, + -0.00333954370580613613, + -0.00026695750420913100, + 0.00067421921994537115, + -0.00251012342050671577, + -0.00162596325390040874, + -0.01165342703461647034, + 0.00465370528399944305, + 0.00731671648100018501, + -0.00112236768472939730 + ], + [ + 0.04146321862936019897, + 0.05115205422043800354, + 0.04280475899577140808, + 0.00543248094618320465, + 0.01005687471479177475, + 0.06237914413213729858, + 0.00977543648332357407, + 0.00422528292983770370, + -0.03881517797708511353, + -0.02622063457965850830, + 0.00899330340325832367, + 0.03412314504384994507, + -0.01728373952209949493, + -0.00146694970317184925, + -0.05197246372699737549, + -0.01252603624016046524, + -0.01252782158553600311, + -0.03745229542255401611, + -0.00047491249279119074, + 0.00029487765277735889, + -0.01861651800572872162, + -0.00442963140085339546, + -0.03637790679931640625, + -0.01230998057872056961, + 0.01533244457095861435, + 0.00714616989716887474, + -0.01314484886825084686, + -0.02982755005359649658, + -0.00701938150450587273, + -0.01100792922079563141, + -0.00609066197648644447, + -0.00175154802855104208, + -0.01177202817052602768, + -0.00153063470497727394, + 0.02318283542990684509, + 0.01049940939992666245, + 0.00731982337310910225, + 0.01162811648100614548, + -0.00315893930383026600, + -0.01388078741729259491, + -0.00426121382042765617, + -0.00438014091923832893, + 0.00118607981130480766, + 0.00211049313656985760, + 0.00024263488012365997, + 0.00737468153238296509, + 0.02015557140111923218, + 0.01149313244968652725, + -0.00194662902504205704, + 0.00055830151541158557, + 0.00814121309667825699, + 0.01093912869691848755, + 0.00616821506991982460, + -0.00422541471198201180, + 0.00204135640524327755, + 0.00125386530999094248, + -0.00005853497350472026, + 0.00244656740687787533, + -0.00100075290538370609, + 0.00586561812087893486, + 0.01086379773914813995, + 0.00358152389526367188, + -0.00383815472014248371, + -0.00397027423605322838 + ], + [ + 0.04146879911422729492, + -0.05115505680441856384, + 0.04281285405158996582, + 0.00542806135490536690, + -0.01005000434815883636, + -0.06238571181893348694, + 0.00978205259889364243, + 0.00421982677653431892, + -0.03881289809942245483, + 0.02621347270905971527, + -0.00898331310600042343, + -0.03413049504160881042, + -0.01728084683418273926, + -0.00146799080539494753, + -0.05197319015860557556, + -0.01251959241926670074, + 0.01252331584692001343, + 0.03744679316878318787, + 0.00047967347200028598, + -0.00029802307835780084, + -0.01861553266644477844, + -0.00442415662109851837, + -0.03638226166367530823, + -0.01230059936642646790, + 0.01532245147973299026, + -0.00713590672239661217, + 0.01314011123031377792, + 0.02982696518301963806, + 0.00701426528394222260, + 0.01100881770253181458, + -0.00608609383925795555, + -0.00174418662209063768, + -0.01177495345473289490, + -0.00152615038678050041, + 0.02317313849925994873, + 0.01049686968326568604, + -0.00731882173568010330, + -0.01161735318601131439, + 0.00315957167185842991, + 0.01388146635144948959, + 0.00425209524109959602, + 0.00437660422176122665, + 0.00119645532686263323, + 0.00211410527117550373, + 0.00024265093088615686, + 0.00737013574689626694, + 0.02015086263418197632, + 0.01149354781955480576, + -0.00193792022764682770, + -0.00056498055346310139, + -0.00814465247094631195, + -0.01093358825892210007, + -0.00616080360487103462, + 0.00422636093571782112, + -0.00204605516046285629, + -0.00126840907614678144, + -0.00004962267848895863, + 0.00244696461595594883, + -0.00100462068803608418, + 0.00585822062566876411, + 0.01086187828332185745, + 0.00358784082345664501, + -0.00382868479937314987, + -0.00397066259756684303 + ], + [ + 0.05298346653580665588, + 0.00000848548370413482, + 0.04969559237360954285, + -0.06773263961076736450, + -0.00001280817923543509, + 0.00000739041797714890, + 0.00232456275261938572, + -0.07484346628189086914, + 0.05077829211950302124, + 0.00001095926836569561, + -0.00001211442395288032, + -0.00000034558905781523, + -0.02827247977256774902, + -0.02899013645946979523, + 0.06227054819464683533, + -0.03125916421413421631, + -0.00000452411268270225, + 0.00001039404924085829, + -0.00000168355029472878, + -0.00000479839854961028, + -0.01931094750761985779, + 0.01323632895946502686, + 0.03513285145163536072, + -0.04206258431077003479, + 0.01366549450904130936, + -0.00000241708198700508, + -0.00000222398398364021, + 0.00000285380247078137, + 0.00000584206600251491, + -0.00000164754078468832, + 0.00212561874650418758, + 0.01545732095837593079, + 0.00318697653710842133, + -0.02978770248591899872, + 0.02102696336805820465, + -0.00089506176300346851, + 0.00000593861386732897, + -0.00000779416677687550, + 0.00000024601811787761, + -0.00000194711083167931, + 0.00000392816127714468, + 0.00000394288008465082, + 0.00654366286471486092, + -0.00288687227293848991, + -0.00469856802374124527, + -0.01050878595560789108, + 0.01889660768210887909, + -0.00408558826893568039, + -0.00595616362988948822, + -0.00000440360463471734, + 0.00001370260360999964, + -0.00000684525002725422, + -0.00000230854175242712, + -0.00000103199010936805, + -0.00000220993888433441, + 0.00000569973417441361, + -0.00263694999739527702, + -0.00844548083841800690, + 0.00427753711119294167, + -0.00219392520375549793, + 0.01103174686431884766, + -0.00735001778230071068, + -0.00617626123130321503, + 0.00750808184966444969 + ], + [ + 0.08860497921705245972, + -0.00000747947433410445, + -0.09977780282497406006, + 0.04842934012413024902, + -0.00001293482728215167, + 0.00000538772383151809, + 0.04328290000557899475, + -0.05197134613990783691, + 0.04557596892118453979, + -0.00001370072186546167, + 0.00000957633892539889, + 0.00000180435790753108, + 0.00683208042755723000, + 0.01767544820904731750, + -0.05371300131082534790, + 0.03699811547994613647, + -0.00001022499054670334, + 0.00000986349914455786, + 0.00000326969097841356, + -0.00000304119248539791, + -0.01430520042777061462, + 0.01165596395730972290, + 0.02682796493172645569, + -0.04622834920883178711, + 0.02413720823824405670, + -0.00000406403114538989, + 0.00000627687859378057, + 0.00000426427141064778, + -0.00000792049377196236, + -0.00000396203677155427, + -0.00088764715474098921, + -0.01052875909954309464, + 0.00174345017876476049, + 0.02753023430705070496, + -0.03072325326502323151, + 0.01232710387557744980, + 0.00000190461673810205, + -0.00000058965662219634, + 0.00000399669670514413, + -0.00001052573588822270, + -0.00000150046832914086, + 0.00001006257843982894, + 0.00668386043980717659, + -0.00419794535264372826, + -0.00603555468842387199, + -0.00458329962566494942, + 0.01942573301494121552, + -0.01488498784601688385, + 0.00483621750026941299, + 0.00000508786524733296, + -0.00000780161190050421, + 0.00000482265113532776, + -0.00000688650425217929, + 0.00000236881874116079, + 0.00001211616290675011, + -0.00000824065227789106, + 0.00038853811565786600, + 0.00730463443323969841, + -0.00439881859347224236, + -0.00122335250489413738, + -0.00513854529708623886, + 0.00827761180698871613, + -0.00464855739846825600, + 0.00082823954289779067 + ], + [ + 0.08972264081239700317, + 0.04567824304103851318, + -0.09954756498336791992, + 0.03031627275049686432, + 0.04928301647305488586, + -0.04801107570528984070, + 0.04095518216490745544, + -0.03178725019097328186, + -0.00765838101506233215, + 0.02013937197625637054, + -0.05819375067949295044, + 0.01464220322668552399, + 0.00837755575776100159, + 0.00964654795825481415, + 0.00698326714336872101, + -0.02661720104515552521, + -0.00526029150933027267, + -0.02792088873684406281, + 0.02928539924323558807, + 0.01271451357752084732, + -0.01297695469111204147, + 0.00813990551978349686, + -0.00073583144694566727, + 0.03071047551929950714, + -0.01917571760714054108, + -0.00897552911192178726, + 0.00369363953359425068, + 0.02053070999681949615, + 0.00160265271551907063, + -0.01051816251128911972, + -0.00324103306047618389, + -0.00594761734828352928, + -0.00274786259979009628, + -0.01475491095334291458, + 0.02472115866839885712, + -0.00479494687169790268, + -0.00212221173569560051, + 0.01087632123380899429, + 0.00213136756792664528, + -0.00720088230445981026, + -0.00655756937339901924, + -0.00370339886285364628, + 0.00713589088991284370, + -0.00407300284132361412, + 0.00042535894317552447, + -0.00073499255813658237, + -0.01574602164328098297, + 0.00771573791280388832, + 0.00018010413623414934, + -0.00004315430123824626, + 0.00297173531726002693, + -0.00573941646143794060, + -0.00499340100213885307, + 0.00026016548508778214, + -0.00421499833464622498, + 0.00602487241849303246, + 0.00170039106160402298, + 0.00541046401485800743, + 0.00220571411773562431, + 0.00107139104511588812, + 0.00377531629055738449, + -0.00708660529926419258, + 0.00021930043294560164, + -0.00196873885579407215 + ], + [ + 0.08972083032131195068, + -0.04567986726760864258, + -0.09954183548688888550, + 0.03031749650835990906, + -0.04928637295961380005, + 0.04801104962825775146, + 0.04094434529542922974, + -0.03178620710968971252, + -0.00765990233048796654, + -0.02013917639851570129, + 0.05819743126630783081, + -0.01463609561324119568, + 0.00838930625468492508, + 0.00964179541915655136, + 0.00698654539883136749, + -0.02661913819611072540, + 0.00526091270148754120, + 0.02792080491781234741, + -0.02928473241627216339, + -0.01272528991103172302, + -0.01298376545310020447, + 0.00814526341855525970, + -0.00073598034214228392, + 0.03071626834571361542, + -0.01917336508631706238, + 0.00897043012082576752, + -0.00369631219655275345, + -0.02053183317184448242, + -0.00160801503807306290, + 0.01052524428814649582, + -0.00323860393837094307, + -0.00595047883689403534, + -0.00275407102890312672, + -0.01475845556706190109, + 0.02472428046166896820, + -0.00479073682799935341, + 0.00211225450038909912, + -0.01087698154151439667, + -0.00213006837293505669, + 0.00720300106331706047, + 0.00656223343685269356, + 0.00370388152077794075, + 0.00713067315518856049, + -0.00407098513096570969, + 0.00043130785343237221, + -0.00073967204662039876, + -0.01575363241136074066, + 0.00771688064560294151, + 0.00017789939010981470, + 0.00003728080992004834, + -0.00297193648293614388, + 0.00574553618207573891, + 0.00499623967334628105, + -0.00025990590802393854, + 0.00421429518610239029, + -0.00602429592981934547, + 0.00171170593239367008, + 0.00540549727156758308, + 0.00220836931839585304, + 0.00107919692527502775, + 0.00377938733436167240, + -0.00709370849654078484, + 0.00022295613598544151, + -0.00197907793335616589 + ], + [ + 0.02, + 0.0115470054, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + [ + 0.02, + -0.0115470054, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + ], + "Routing": [ + 1, + 2, + 3, + 5, + 6, + 7, + 8, + 9, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 4, + 10 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/_configurationFiles/test2.json iem-plugin-suite-1.11.1/_configurationFiles/test2.json --- iem-plugin-suite-1.11.0/_configurationFiles/test2.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/_configurationFiles/test2.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,2304 @@ +{ + "Name": "All-Round Ambisonic decoder (AllRAD) and loudspeaker layout", + "Description": "This configuration file was created with the IEM AllRADecoder v0.9.0 plug-in. 5 Mar 2020 1:06:56pm", + "Decoder": { + "Name": "Decoder", + "Description": "A 3rd order Ambisonics decoder using the AllRAD approach.", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.05588595941662788, + 0.05624393001198769, + 0.003875514725223184, + 0.07015314698219299, + 0.08478108048439026, + 0.004114632494747639, + -0.04902807623147964, + 0.006289353128522635, + 0.01938566751778126, + 0.06793809682130814, + 0.007723529357463121, + -0.03282753750681877, + -0.005503132939338684, + -0.04474736377596855, + 0.003475068369880319, + -0.0320444293320179 + ], + [ + 0.0264704879373312, + -0.0213692095130682, + 0.005662362091243267, + 0.03845001757144928, + -0.03885365650057793, + -0.005789558403193951, + -0.02525434084236622, + 0.01007944531738758, + 0.02418126538395882, + -0.04447747021913528, + -0.01187579892575741, + 0.01511264871805906, + -0.01011373102664948, + -0.02771918661892414, + 0.006960021331906319, + 0.002188149373978376 + ], + [ + 0.01933258771896362, + -0.0008464163984172046, + -0.001860313583165407, + 0.03259001299738884, + -0.001770412200130522, + 0.0004225292068440467, + -0.02030394598841667, + -0.003956491593271494, + 0.03428269922733307, + -0.002607956994324923, + 0.001046888879500329, + 0.0005956689710728824, + 0.00381830707192421, + -0.02745127305388451, + -0.004802800714969635, + 0.03363940492272377 + ], + [ + 0.01776948757469654, + 0.02047121524810791, + 0.0003787875757552683, + -0.02185925282537937, + -0.03124638460576534, + -5.790283466922119e-6, + -0.01897000707685947, + -0.001112786470912397, + 0.001997522544115782, + 0.02332856506109238, + -0.0008418533252552152, + -0.0177492406219244, + -0.000809444347396493, + 0.01890044845640659, + 0.001962010050192475, + 0.01940859295427799 + ], + [ + 0.04241939634084702, + -0.04204484447836876, + -0.009969224222004414, + -0.05416798964142799, + 0.06493974477052689, + 0.01366023812443018, + -0.03793790936470032, + 0.01394544448703527, + 0.01666382886469364, + -0.05401812121272087, + -0.02128294669091702, + 0.0253269225358963, + 0.01598629541695118, + 0.03629085421562195, + -0.0004588997398968786, + 0.02400687336921692 + ], + [ + 0.0219880361109972, + 0.005925095174461603, + -0.03290925174951553, + -0.01539776753634214, + -0.004558974876999855, + -0.0115984845906496, + 0.03120008669793606, + 0.0282602496445179, + 0.006780007854104042, + 0.002561062574386597, + 0.01017071586102247, + 0.01584894582629204, + -0.02194433473050594, + -0.03491663187742233, + -0.01373657491058111, + -0.003156826831400394 + ], + [ + 0.02588550932705402, + 0.01820009760558605, + -0.02277412265539169, + 0.03202303871512413, + 0.02787472307682037, + -0.01989006623625755, + -0.004824969917535782, + -0.03540103882551193, + 0.01639603637158871, + 0.02641041949391365, + -0.03478103131055832, + 0.00496385246515274, + 0.0248369537293911, + 0.00970908161252737, + -0.02086294628679752, + 0.00009375310037285089 + ], + [ + 0.003382740542292595, + 0.002482302952557802, + 0.005250439513474703, + 0.0005419485969468951, + 0.0004988115397281945, + 0.004956616088747978, + 0.005336592439562082, + 0.001086067873984575, + -0.001105045550502837, + -0.0004471018037293106, + 0.001179488725028932, + 0.006944029591977596, + 0.004109721630811691, + 0.001530194189399481, + -0.002599602099508047, + -0.0003216400218661875 + ], + [ + 0.01022809371352196, + 0.002803432289510965, + 0.01312754768878222, + -0.01114883273839951, + -0.004063849803060293, + 0.00445949099957943, + 0.007742684334516525, + -0.01808914355933666, + 0.007359429728239775, + 0.004197962116450071, + -0.007476340979337692, + 0.004157540388405323, + -0.001107605523429811, + -0.01756932586431503, + 0.01385631319135427, + -0.004280933178961277 + ], + [ + 0.07454980909824371, + 0.102015808224678, + -0.04828206077218056, + 0.02953098714351654, + 0.05072483420372009, + -0.07663366198539734, + -0.02446339093148708, + -0.01627951487898827, + -0.07550808787345886, + -0.04153645783662796, + -0.02907850220799446, + 0.002114250790327787, + 0.03833876922726631, + -0.007639505434781313, + 0.06237329915165901, + -0.05598068982362747 + ], + [ + 0.01761310361325741, + 0.005374602973461151, + -0.01006640680134296, + 0.02754624933004379, + 0.01074375864118338, + -0.003481066785752773, + -0.01212433818727732, + -0.01992515102028847, + 0.02607654221355915, + 0.0149706332013011, + -0.008088007569313049, + -0.002536908024922013, + 0.01669279858469963, + -0.009832259267568588, + -0.02199055813252926, + 0.0221807099878788 + ], + [ + 0.03155196830630302, + 0.02255541644990444, + -0.0421081930398941, + -0.02053511515259743, + -0.01593650504946709, + -0.03873932361602783, + 0.02859496884047985, + 0.03357809409499168, + -0.0001962483220268041, + 0.005056671798229218, + 0.03109859861433506, + 0.04192941263318062, + -0.00370292249135673, + -0.0330970399081707, + 0.002141973935067654, + 0.003510677022859454 + ], + [ + 0.01154173351824284, + -0.01598836854100227, + -0.01086648367345333, + 0.003382156137377024, + -0.006154945120215416, + 0.01915680803358555, + -0.0009473176905885339, + -0.003655425272881985, + -0.01331348996609449, + 0.009749029763042927, + 0.007780032232403755, + -0.007512550335377455, + 0.01101424358785152, + 0.0007345500052906573, + 0.01880748942494392, + -0.007785377558320761 + ], + [ + 0.02149865031242371, + -0.02160509675741196, + -0.02570619247853756, + 0.01329128351062536, + -0.01702483557164669, + 0.03251643106341362, + 0.01151426136493683, + -0.0194309763610363, + -0.008055159822106361, + -0.002167922677472234, + 0.02850763872265816, + -0.02732585184276104, + 0.007511481177061796, + 0.01523998565971851, + 0.01442400086671114, + -0.01318469271063805 + ], + [ + 0.04837166145443916, + -0.04678908362984657, + 0.03582495078444481, + -0.05182420834898949, + 0.05867286771535873, + -0.0435599647462368, + -0.01861998625099659, + -0.04641124978661537, + 0.006161070894449949, + -0.03425478935241699, + 0.06141088157892227, + -0.001504144980572164, + -0.04195057228207588, + 0.00164554372895509, + 0.004171594046056271, + 0.02530083991587162 + ], + [ + 0.02286130748689175, + 0.02554287016391754, + -0.02093147858977318, + -0.01839945279061794, + -0.02358903735876083, + -0.02978601865470409, + -0.003463853383436799, + 0.02153567411005497, + -0.008306697010993958, + 0.003737750696018338, + 0.03221791237592697, + 0.009781192056834698, + 0.02360123954713345, + -0.006997975986450911, + 0.01099353935569525, + 0.01666612736880779 + ], + [ + 0.04564693197607994, + 0.07256616652011871, + -0.005618592258542776, + -0.01441239286214113, + -0.02851337566971779, + -0.01044331025332212, + -0.03805418312549591, + 0.004113420844078064, + -0.06870590895414352, + -0.05752099305391312, + 0.00893192645162344, + -0.04053571447730064, + 0.009029107168316841, + 0.0085159782320261, + 0.00944287795573473, + 0.03865319862961769 + ], + [ + 0.003359029069542885, + 0.0003196847683284432, + 0.005737246479839087, + -0.0007324161706492305, + -0.00007180462125688791, + 0.0007042338256724179, + 0.007201262749731541, + -0.001609001192264259, + 0.00007936703332234174, + 9.834971024247352e-6, + -0.0001864870719145983, + 0.001152213080786169, + 0.008164769969880581, + -0.002621620427817106, + 0.000204960597329773, + -8.542509931430686e-6 + ], + [ + 0.0647733062505722, + 0.09321623295545578, + 0.03019827231764793, + 0.0317942202091217, + 0.05521297454833984, + 0.05054539069533348, + -0.03717312589287758, + 0.01791616156697273, + -0.07189840078353882, + -0.04185634478926659, + 0.03339008614420891, + -0.02410899102687836, + -0.03317535296082497, + -0.008017421700060368, + -0.04113004729151726, + -0.06185043603181839 + ], + [ + 0.005055633373558521, + -0.00004606851143762469, + -0.008536824956536293, + 0.001665796036832035, + -0.00005022781260777265, + 0.0000934398703975603, + 0.01046860497444868, + -0.003609989769756794, + 0.0003262566751800478, + -0.00002669853165571112, + 0.0001245064340764657, + -0.0001335742708761245, + -0.01144961267709732, + 0.005762060172855854, + -0.0008311282726936042, + 0.00005545436579268426 + ], + [ + 0.02734036557376385, + -0.02652751095592976, + 0.03534047678112984, + -0.01138362195342779, + 0.01402509119361639, + -0.04191335663199425, + 0.02240695245563984, + -0.01844726875424385, + -0.01391815859824419, + 0.005358620546758175, + 0.02548170648515224, + -0.03986490517854691, + 0.002206437522545457, + -0.01836271025240421, + -0.02423750981688499, + 0.01192389708012342 + ], + [ + 0.005566194653511047, + -0.003165441798046231, + 0.008550673723220825, + 0.002877657301723957, + -0.002097418764606118, + -0.006238142028450966, + 0.008495308458805084, + 0.005644460208714008, + -0.0001660963898757473, + -0.0006449862266890705, + -0.004828569479286671, + -0.00856576394289732, + 0.006262532901018858, + 0.007692749612033367, + -0.0004104480904061347, + -0.000768823956605047 + ], + [ + 0.04619345441460609, + -0.06148375570774078, + -0.01777200028300285, + 0.03998733684420586, + -0.06450764834880829, + 0.02737309038639069, + -0.03606732189655304, + -0.02064035274088383, + -0.02912212908267975, + -0.008640434592962265, + 0.03545385226607323, + 0.03190570324659348, + 0.02695862948894501, + -0.01841690205037594, + 0.01017473358660936, + -0.06123070046305656 + ], + [ + 0.01797292940318584, + 0.0009937881259247661, + 0.01937129907310009, + 0.02342210151255131, + 0.00149851047899574, + 0.00150208396371454, + 0.003952867817133665, + 0.03191167861223221, + 0.01909521035850048, + 0.001583408564329147, + 0.002632354618981481, + 0.001233233488164842, + -0.01321711111813784, + 0.02006939239799976, + 0.02999941073358059, + 0.01467697229236364 + ], + [ + 0.05806823447346687, + 0.0005973225343041122, + 0.009347615763545036, + -0.09174708276987076, + -0.001467712689191103, + -0.006263985764235258, + -0.05339701473712921, + -0.01814956776797771, + 0.08256210386753082, + 0.00199089664965868, + 0.01346583757549524, + -0.003000220283865929, + -0.01460554264485836, + 0.06165972352027893, + 0.01959012448787689, + -0.06208546832203865 + ], + [ + 0.003886595368385315, + -0.001861872500739992, + 0.006432481575757265, + 0.00003810866110143252, + -0.00003985578587162308, + -0.003956091590225697, + 0.007563038263469934, + 0.00007576461212011054, + -0.0005776191828772426, + 0.0001705761242192239, + -0.00009459180728299543, + -0.006125051062554121, + 0.007722506299614906, + 0.0001050316932378337, + -0.001445215893909335, + -0.0000286391605186509 + ], + [ + 0.07716375589370728, + -0.01396388188004494, + -0.06665320694446564, + -0.100225992500782, + 0.02082413248717785, + 0.01359139010310173, + -0.008843288756906986, + 0.1024156361818314, + 0.07167550176382065, + -0.01927413046360016, + -0.02122165635228157, + -0.002960206242278218, + 0.0513477548956871, + -0.02600972913205624, + -0.07879737764596939, + -0.04049172624945641 + ], + [ + 0.02873549424111843, + -0.005479045677930117, + 0.02969750948250294, + -0.03718670085072517, + 0.008611090481281281, + -0.007342275697737932, + 0.004556122701615095, + -0.04761981219053268, + 0.0293409489095211, + -0.009046647697687149, + 0.01347094401717186, + -0.004344984889030457, + -0.0195156168192625, + -0.02649234235286713, + 0.04263247549533844, + -0.02105235308408737 + ], + [ + 0.004647484980523586, + 0.001267844811081886, + 0.007879636250436306, + 0.0005792142474092543, + 0.0001813495910027996, + 0.002762698102742434, + 0.00974283367395401, + 0.001262174570001662, + -0.0001652632636250928, + -0.0000129803429445019, + 0.0004646337474696338, + 0.004446185659617186, + 0.01079211011528969, + 0.002031479263678193, + -0.0004242610884830356, + -0.00003810941052506678 + ], + [ + 0.000893749063834548, + 0.0001534877083031461, + -0.001534988754428923, + 0.00008800816431175917, + 0.00002360396865697112, + -0.0003390246420167387, + 0.001948411110788584, + -0.0001944490650203079, + -0.00001400784276484046, + -1.976782471047045e-7, + -0.00006146691885078326, + 0.0005569609347730875, + -0.002247520489618182, + 0.000319585669785738, + 0.00003644213211373426, + -4.80401922686724e-6 + ], + [ + 0.009206049144268036, + 0.009599721990525723, + 0.01249497104436159, + 0.0005389283178374171, + 0.0006769202300347388, + 0.01662344299256802, + 0.00880056619644165, + 0.0009633684530854225, + -0.00638206209987402, + -0.004050880204886198, + 0.001415760139934719, + 0.01813830062747002, + 0.001281818142160773, + 0.001116222469136119, + -0.01292034517973661, + -0.0006071390816941857 + ], + [ + 0.005390127655118704, + -0.0006771550979465246, + -0.008701560087502003, + 0.003088476601988077, + -0.0005823636893182993, + 0.001370492158457637, + 0.009698984213173389, + -0.006382444407790899, + 0.001065426622517407, + -0.0003502464387565851, + 0.00138780998531729, + -0.001963675720617175, + -0.009038001298904419, + 0.009465210139751434, + -0.002585913287475705, + 0.0003125681832898408 + ], + [ + 0.007626209408044815, + 0.0004460471100173891, + -0.01134336180984974, + 0.006403859239071608, + 0.0002690211404114962, + -0.0009602425270713866, + 0.01039992552250624, + -0.01217635720968246, + 0.00332276476547122, + 0.00002319574923603795, + -0.000745489087421447, + 0.001490294234827161, + -0.006268685217946768, + 0.01574254967272282, + -0.007396006491035223, + 0.001598822651430964 + ], + [ + 0.02571826055645943, + -0.01001033280044794, + -0.03914947062730789, + -0.01435940712690353, + 0.00693642208352685, + 0.01931475847959518, + 0.03869132697582245, + 0.0264471098780632, + 0.004041913896799088, + -0.003739099251106381, + -0.01490603014826775, + -0.02587981149554253, + -0.0298397745937109, + -0.03290560096502304, + -0.007797828409820795, + -0.001015495974570513 + ], + [ + 0.0290195569396019, + 0.02172486111521721, + 0.02908765897154808, + 0.03202725574374199, + 0.02986210957169533, + 0.02763753943145275, + 0.002794915810227394, + 0.03922052681446075, + 0.01249244343489408, + 0.02508994564414024, + 0.04248432815074921, + 0.01519994623959064, + -0.02081340178847313, + 0.01916773803532124, + 0.01583972759544849, + -0.004081975668668747 + ], + [ + 0.01517682708799839, + 0.01790318638086319, + 0.009773189201951027, + -0.01572092436254025, + -0.02350763231515884, + 0.01475644018501043, + -0.009038928896188736, + -0.01253593806177378, + -0.002930960152298212, + 0.01273024175316095, + -0.02195332199335098, + -0.00387709797360003, + -0.01526101771742105, + 0.004161511547863483, + -0.003433223580941558, + 0.01836183480918407 + ], + [ + 0.02637272700667381, + -0.02941029146313667, + 0.03162671998143196, + 0.008860417641699314, + -0.01268959976732731, + -0.04363883659243584, + 0.01476929895579815, + 0.01303389016538858, + -0.01882086880505085, + 0.009951646439731121, + -0.02136657387018204, + -0.03601470589637756, + -0.007245517801493406, + 0.01034738961607218, + -0.03158863261342049, + -0.01228966005146503 + ], + [ + 0.0008736408199183643, + 0.00001015745692711789, + -0.001507323933765292, + -0.0001072738887160085, + 4.128296779981611e-7, + -0.00002278795545862522, + 0.001930879196152091, + 0.0002384894760325551, + 9.849354682955891e-6, + -3.811179851709312e-7, + -1.03985018995445e-6, + 0.00003831645517493598, + -0.002258137334138155, + -0.0003956241416744888, + -0.0000258671188930748, + -8.896178087525186e-7 + ], + [ + 0.0006178420153446496, + 0.00007863670907681808, + 0.001066329306922853, + 2.943695847079653e-7, + -7.150524083954224e-7, + 0.0001750046794768423, + 0.001366842654533684, + 7.178567216215015e-7, + -7.125530828488991e-6, + -6.852248475297529e-7, + -1.874634676823916e-6, + 0.0002907605667132884, + 0.001600027550011873, + 1.349940816908202e-6, + -0.00001874154622782953, + 1.374646672047675e-7 + ], + [ + 0.006704412400722504, + 0.004218350630253553, + -0.009962849318981171, + 0.003799140220507979, + 0.002977634314447641, + -0.007931428961455822, + 0.009118617512285709, + -0.007296768948435783, + -0.0005085458396933973, + 0.0006288384902291, + -0.006634389515966177, + 0.01006459258496761, + -0.005487017333507538, + 0.00959973968565464, + 0.0009792627533897758, + -0.001396063948050141 + ], + [ + 0.0009718704968690872, + 0.0001819015888031572, + -0.001670775702223182, + 0.00001497129414929077, + 7.274672952917172e-6, + -0.0004030468699056655, + 0.002124813385307789, + -0.00003271857349318452, + -0.000021149864551262, + -2.066753268081811e-6, + -0.00001888576662167907, + 0.0006652415031567216, + -0.002457828726619482, + 0.00005287521707941778, + 0.00005537252582143992, + -2.051346882581129e-6 + ], + [ + 0.006543250288814306, + 0.004224618896842003, + 0.008028198033571243, + -0.006578677799552679, + -0.005444791167974472, + 0.006672477815300226, + 0.003873781533911824, + -0.01020885817706585, + 0.002591303316876292, + 0.004475190304219723, + -0.009971966966986656, + 0.006058068946003914, + -0.002298689913004637, + -0.008939690887928009, + 0.004528190940618515, + 0.0004203842545393854 + ], + [ + 0.001655902247875929, + 0.0002086546155624092, + -0.002839121734723449, + -0.0002640917082317173, + -0.00002790985126921441, + -0.0004613699566107243, + 0.003591119544580579, + 0.0005843284307047725, + 9.801666237763129e-6, + 1.258383804270125e-6, + 0.0000731120744603686, + 0.0007591157918795943, + -0.004119386896491051, + -0.0009623633231967688, + -0.0000256820821959991, + -1.551749619466136e-6 + ], + [ + 0.02950846217572689, + 0.01859905384480953, + 0.02185747586190701, + -0.0399845726788044, + -0.03173566609621048, + 0.01637939922511578, + -0.01174356881529093, + -0.03687778115272522, + 0.02633323706686497, + 0.03504877164959908, + -0.03179002553224564, + -0.001185993896797299, + -0.02693906985223293, + -0.0001364823110634461, + 0.02836998552083969, + -0.008685761131346226 + ], + [ + 0.01731151342391968, + -0.006027258932590485, + 0.009862170554697514, + 0.02694674022495747, + -0.01181567925959826, + -0.004472368862479925, + -0.01176551543176174, + 0.01924041472375393, + 0.02532386407256126, + -0.01623490825295448, + -0.01002952922135592, + 0.001835532835684717, + -0.01597040891647339, + -0.009597656317055225, + 0.02067967131733894, + 0.02138731442391872 + ], + [ + 0.009196599945425987, + 0.006931380368769169, + 0.01392445247620344, + -0.002484254771843553, + -0.002407786203548312, + 0.01340078841894865, + 0.01336746476590633, + -0.004787526559084654, + -0.002884512301534414, + -0.0009046203340403736, + -0.005422726273536682, + 0.01783745177090168, + 0.009128990583121777, + -0.006338702980428934, + -0.006526682991534472, + 0.001600985880941153 + ], + [ + 0.02310051769018173, + -0.03566509485244751, + -0.003611590946093202, + -0.01445518806576729, + 0.02833606861531734, + 0.007057372014969587, + -0.02159335650503635, + 0.001939789508469403, + -0.02910059504210949, + 0.01617588475346565, + -0.004510538186877966, + 0.02463167905807495, + 0.005806644912809134, + 0.01028213370591402, + 0.007607389241456985, + 0.03725770488381386 + ], + [ + 0.004157603718340397, + 0.004392486065626144, + 0.005487417802214622, + -0.00137317564804107, + -0.001878602895885706, + 0.007435838226228952, + 0.003486601868644357, + -0.002318010432645679, + -0.002697792137041688, + -0.001381345558911562, + -0.003729243762791157, + 0.007719184271991253, + -0.0002352833398617804, + -0.002392041496932507, + -0.005372978281229734, + 0.001797598553821445 + ], + [ + 0.009187748655676842, + 0.01367437746375799, + 0.002991171786561608, + -0.007097188849002123, + -0.01355644222348928, + 0.005662305280566216, + -0.008610285818576813, + -0.002836116123944521, + -0.009504653513431549, + -0.002200044458732009, + -0.006327673327177763, + -0.009412158280611038, + -0.005769180599600077, + 0.005025683902204037, + -0.004697810858488083, + 0.01692124642431736 + ], + [ + 0.01411562599241734, + 0.006633991841226816, + -0.01853503100574017, + 0.01354927010834217, + 0.007747172843664885, + -0.01102244853973389, + 0.01165403425693512, + -0.02275517955422401, + 0.005847913678735495, + 0.005556827876716852, + -0.0150730861350894, + 0.01107276231050491, + 0.0007945323013700545, + 0.02338854782283306, + -0.0115747582167387, + 0.0008996961987577379 + ], + [ + 0.001279243966564536, + 0.0004632622876670212, + 0.001913092564791441, + -0.001005650963634253, + -0.0004757493443321437, + 0.000887993723154068, + 0.001771387527696788, + -0.001937864464707673, + 0.0003966895455960184, + 0.0003258017532061785, + -0.001077338703908026, + 0.001160107553005219, + 0.00107792706694454, + -0.00255544250831008, + 0.000905164226423949, + -0.00007964944961713627 + ], + [ + 0.03373373299837112, + -0.04371065646409988, + 0.02116575837135315, + 0.02776443958282471, + -0.04496562108397484, + -0.03405534476041794, + -0.01839942298829556, + 0.02065428346395493, + -0.02067718468606472, + -0.006743507925421, + -0.03819398954510689, + 0.008491256274282932, + -0.02816730365157127, + -0.006610109470784664, + -0.01964782178401947, + -0.04336246475577354 + ], + [ + 0.05947262421250343, + -0.08916044980287552, + 0.03405141457915306, + -0.0004880441119894385, + -0.00006478307477664202, + -0.05972684547305107, + -0.03110670298337936, + -0.00340252835303545, + -0.08107399195432663, + 0.06626642495393753, + 0.006334879901260138, + 0.01965343207120895, + -0.03704938665032387, + -0.003587980987504125, + -0.05821884423494339, + -0.001163016422651708 + ], + [ + 0.004597504623234272, + 0.001269902335479856, + -0.00750937033444643, + 0.00215703179128468, + 0.0007658523973077536, + -0.002660955302417278, + 0.008582677692174911, + -0.004521964583545923, + 0.0004163985722698271, + 0.0002882056869566441, + -0.001887585502117872, + 0.004031813703477383, + -0.008349234238266945, + 0.006855966988950968, + -0.001028625876642764, + -0.00001943186725839041 + ], + [ + 0.0188746266067028, + 0.0130291311070323, + -0.02912875078618526, + 0.0008486120495945215, + 0.0007517010089941323, + -0.02529920823872089, + 0.02944700792431831, + -0.001676467247307301, + -0.00565864285454154, + -0.002242260845378041, + -0.001711294869892299, + 0.03404846042394638, + -0.02307267673313618, + 0.002322256797924638, + 0.01267679408192635, + -0.0005005041602998972 + ], + [ + 0.007629694417119026, + -0.0023523208219558, + 0.01177498418837786, + 0.005188705865293741, + -0.002059633610770106, + -0.004615049809217453, + 0.01183765567839146, + 0.01024875976145267, + 0.001740630017593503, + -0.001188156893476844, + -0.004727610386908054, + -0.0062964609824121, + 0.008983041159808636, + 0.01413313578814268, + 0.004049124661833048, + 0.0002771404979284853 + ], + [ + 0.008003332652151585, + -0.001805458101443946, + -0.005002297926694155, + 0.0126348864287138, + -0.003602039068937302, + 0.001568977953866124, + -0.005141464993357658, + -0.01004224363714457, + 0.01252298895269632, + -0.005133006256073713, + 0.003655848558992147, + 0.0003273429756518453, + 0.008323497138917446, + -0.003671455197036266, + -0.01155669987201691, + 0.01166525576263666 + ], + [ + 0.003619099035859108, + -0.001333502936176956, + 0.006007969379425049, + 0.001012147520668805, + -0.0004547656280919909, + -0.002844672882929444, + 0.007107778917998075, + 0.002165712649002671, + -0.0001502104569226503, + -0.0000268211751972558, + -0.001146378926932812, + -0.004430590663105249, + 0.007327946834266186, + 0.003389039076864719, + -0.0003747047740034759, + -0.0001242718280991539 + ], + [ + 0.03028636425733566, + -0.04815344884991646, + -0.01525829266756773, + 0.0006655886536464095, + -0.001235361909493804, + 0.03014605864882469, + -0.02195056341588497, + -0.0006278270157054067, + -0.04752893000841141, + 0.04345270991325378, + 0.001486621331423521, + 0.02023861929774284, + 0.02429762855172157, + -0.0003113601414952427, + 0.03397763520479202, + -0.001465746317990124 + ], + [ + 0.01799183525145054, + 0.01735996641218662, + 0.01975860260426998, + -0.01522874739021063, + -0.01878814958035946, + 0.02421198412775993, + 0.005186738446354866, + -0.02054646611213684, + -0.00207008863799274, + 0.008902210742235184, + -0.02957648597657681, + 0.01669625751674175, + -0.01108008716255426, + -0.0128823472186923, + -0.004248995799571276, + 0.01171260699629784 + ], + [ + 0.002366744447499514, + -0.0003641304501798004, + -0.004064307082444429, + 0.0001427481911377981, + -0.0000415863687521778, + 0.0008035129285417497, + 0.005157760344445705, + -0.0003133386780973524, + -0.00002218012195953634, + -3.433473011682509e-6, + 0.0001073298772098497, + -0.001318147289566696, + -0.005947768688201904, + 0.0005099470727145672, + 0.0000576933307456784, + -8.97753761819331e-6 + ], + [ + 0.05536859855055809, + -0.05674357712268829, + -0.06025026738643646, + -0.03376613184809685, + 0.04270589724183083, + 0.07436712086200714, + 0.01880569010972977, + 0.0423814095556736, + -0.0219949334859848, + -0.002579656895250082, + -0.05902182683348656, + -0.04856259375810623, + 0.02093124948441982, + -0.02392295561730862, + 0.03276333212852478, + 0.03154009580612183 + ], + [ + 0.006623321678489447, + 0.0003915148845408112, + 0.01104677189141512, + 0.002669684123247862, + 0.0002114554081344977, + 0.0008324592490680516, + 0.01320285815745592, + 0.005711751990020275, + 0.000619809259660542, + 0.00008627055649412796, + 0.0005263544153422117, + 0.00129056756850332, + 0.01385504566133022, + 0.008938996121287346, + 0.001556834788061678, + 0.0001271066867047921 + ], + [ + 0.01890364289283752, + -0.0105202067643404, + -0.02985342033207417, + 0.004579457920044661, + -0.002952795475721359, + 0.02095910161733627, + 0.03176269307732582, + -0.009229534305632114, + -0.002987140556797385, + 0.0006740860408172011, + 0.006923846900463104, + -0.02936580963432789, + -0.02737215161323547, + 0.01316089648753405, + 0.006824673153460026, + -0.001144608249887824 + ], + [ + 0.007390670478343964, + -0.001830589142628014, + 0.01232417300343513, + -0.002350067952647805, + 0.0007759512518532574, + -0.003906564321368933, + 0.01473149750381708, + -0.004990741610527039, + 0.0002499014954082668, + -0.0002294156729476526, + 0.001932260813191533, + -0.006092121824622154, + 0.01548528298735619, + -0.007725436240434647, + 0.0006090006208978593, + 0.00004239620466250926 + ], + [ + 0.009580596350133419, + 0.007565001957118511, + 0.01361427642405033, + 0.005042745266109705, + 0.004909920506179333, + 0.01367495954036713, + 0.01102214585989714, + 0.00924982875585556, + -0.002229115925729275, + 0.0002870742173399776, + 0.01049149874597788, + 0.01616700179874897, + 0.004297832492738962, + 0.01122987829148769, + -0.004591347184032202, + -0.002993182046338916 + ], + [ + 0.002521273447200656, + 0.001327724196016788, + 0.004142466932535172, + 0.00006281368405325338, + 0.00005365518882172182, + 0.002810699166730046, + 0.00479231309145689, + 0.000128382453112863, + -0.0004312270903028548, + -0.0001274776732316241, + 0.0001305235200561583, + 0.004325045272707939, + 0.004752709064632654, + 0.000186476347153075, + -0.00107841903809458, + -0.00003006749102496542 + ], + [ + 0.008317979052662849, + -0.004609160125255585, + -0.01179765444248915, + 0.006502620875835419, + -0.004466305952519178, + 0.008388333953917027, + 0.009474056772887707, + -0.01181439869105816, + 0.001609848230145872, + -0.002541965106502175, + 0.009551533497869968, + -0.01001488510519266, + -0.003496528137475252, + 0.01406987570226192, + -0.003414763603359461, + -0.0006275178748182952 + ], + [ + 0.004556383471935987, + 0.001654194202274084, + 0.007514739409089088, + -0.001535327988676727, + -0.0006987248780205846, + 0.003510169452056289, + 0.00876898504793644, + -0.003248232649639249, + -0.00002934985059255268, + 0.0001437397149857134, + -0.001742166583426297, + 0.005423456896096468, + 0.008837434463202953, + -0.004995393101125956, + -0.00007849661778891459, + 0.0001461464125895873 + ], + [ + 0.007152064703404903, + -0.001153445686213672, + 0.009792794473469257, + 0.007299603428691626, + -0.001510665751993656, + -0.002010792959481478, + 0.007083924952894449, + 0.01277666632086039, + 0.004643197637051344, + -0.00138885376509279, + -0.003097283421084285, + -0.002213755855336785, + 0.001345547498203814, + 0.0142180547118187, + 0.009526494890451431, + 0.00274518271908164 + ], + [ + 0.02678301744163036, + 0.02521315775811672, + -0.01319390814751387, + -0.03429184854030609, + -0.03891362249851227, + -0.01578951254487038, + -0.02125919610261917, + 0.02143540047109127, + 0.01202116161584854, + 0.03283333778381348, + 0.02840103395283222, + -0.01256142556667328, + 0.02380705624818802, + 0.01695876754820347, + -0.008650142699480057, + 0.01175958104431629 + ], + [ + 0.0001838084281189367, + 3.110111720161512e-6, + -0.0003183464286848903, + 1.577134753460996e-6, + 3.445115126510245e-8, + -6.954004220460774e-6, + 0.0004109341534785926, + -3.526368800521595e-6, + -2.523378306307222e-8, + -8.191973488447246e-11, + -9.114371124496756e-8, + 0.00001163522847491549, + -0.0004861363850068301, + 5.900213636778062e-6, + 6.675831798474974e-8, + -4.985391544032325e-10 + ], + [ + 0.004249240271747112, + 0.004143477417528629, + -0.004948191344738007, + 0.003435767255723476, + 0.004275693092495203, + -0.006208777893334627, + 0.001728771138004959, + -0.005131334532052279, + -0.0007904438534751534, + 0.001659529283642769, + -0.007532518822699785, + 0.004875446669757366, + 0.002649061847478151, + 0.004000259097665548, + 0.001422428758814931, + -0.002909555099904537 + ], + [ + 0.005650760605931282, + 0.002956485608592629, + 0.008641202002763748, + -0.003313487162813544, + -0.002239771420136094, + 0.005771982483565807, + 0.008488010615110397, + -0.006504936143755913, + 0.0002108443586621433, + 0.000860891945194453, + -0.005143564660102129, + 0.007799426559358835, + 0.00608832249417901, + -0.008871663361787796, + 0.0005138839478604496, + 0.0006898597348481417 + ], + [ + 0.02151693589985371, + 0.03071987070143223, + 0.0171490516513586, + -0.008441491983830929, + -0.01554500591009855, + 0.03064648993313313, + -0.006734991446137428, + -0.007815344259142876, + -0.02549468912184238, + -0.01775986514985561, + -0.01646016538143158, + 0.004000511486083269, + -0.02026600949466228, + 0.00004299171632737853, + -0.02939083054661751, + 0.0197555311024189 + ], + [ + 0.03247740119695663, + -0.02094469778239727, + 0.03353248909115791, + 0.03665961697697639, + -0.02999434433877468, + -0.02679930627346039, + 0.006043856497853994, + 0.04583852365612984, + 0.01811571791768074, + -0.02768034487962723, + -0.04251260310411453, + -0.01576005294919014, + -0.01894344575703144, + 0.02490752935409546, + 0.02463448420166969, + 0.001131287310272455 + ], + [ + 0.01061492506414652, + 0.003215562785044312, + 0.01531426329165697, + 0.009169985540211201, + 0.003540522884577513, + 0.005925038363784552, + 0.01300227921456099, + 0.01679299399256706, + 0.00451800087466836, + 0.002704140031710267, + 0.007602071855217218, + 0.007268161978572607, + 0.006305395159870386, + 0.02039686590433121, + 0.009602565318346024, + 0.001829951303079724 + ], + [ + 0.03912117704749107, + -0.01410369388759136, + -0.04162843897938728, + 0.04602329060435295, + -0.01948168687522411, + 0.01720527373254299, + 0.007919369265437126, + -0.06198654323816299, + 0.0260944552719593, + -0.01535799540579319, + 0.0273460615426302, + -0.007543332874774933, + 0.0278270747512579, + 0.03845431283116341, + -0.04182139039039612, + 0.008072989992797375 + ], + [ + 0.01522418577224016, + -0.01009600516408682, + -0.007091144099831581, + 0.02270437218248844, + -0.01894559897482395, + 0.006015634629875422, + -0.01255977246910334, + -0.01341501902788877, + 0.0171180609613657, + -0.02343704737722874, + 0.01319756358861923, + 0.005456781014800072, + 0.01301218196749687, + -0.012236631475389, + -0.01174383237957954, + 0.007745390757918358 + ], + [ + 0.01003441866487265, + 0.0002483850985299796, + 0.01591801270842552, + -0.006420935969799757, + -0.0001417449675500393, + 0.000530396297108382, + 0.01708426512777805, + -0.01295790169388056, + 0.002685058396309614, + 0.00003649240898084827, + -0.0003670473524834961, + 0.0008237216388806701, + 0.01490005664527416, + -0.01851888746023178, + 0.006320528220385313, + -0.001089941943064332 + ], + [ + 0.01705331727862358, + 0.006766575388610363, + 0.009730645455420017, + 0.02631720714271069, + 0.01306315418332815, + 0.005241320002824068, + -0.0115693612024188, + 0.0187440924346447, + 0.02413058653473854, + 0.01759564317762852, + 0.01153609342873096, + -0.001746354158967733, + -0.01572519727051258, + -0.00945928692817688, + 0.01942260935902596, + 0.01952352002263069 + ], + [ + 0.005249082576483488, + -0.000867669063154608, + 0.008962992578744888, + 0.0006358448881655931, + -0.0001060830327332951, + -0.001896951231174171, + 0.01124453078955412, + 0.001398316118866205, + -0.00008523154247086495, + 0.00001000582687993301, + -0.0002732496650423855, + -0.003068311139941216, + 0.01274128630757332, + 0.002282064175233245, + -0.0002183189935749397, + -0.00001644947951717768 + ], + [ + 0.01156054716557264, + -0.006028907373547554, + 0.01610043831169605, + -0.009540596976876259, + 0.006676231045275927, + -0.01039252337068319, + 0.01250874623656273, + -0.01678121462464333, + 0.002932899631559849, + -0.004551111720502377, + 0.01331502664834261, + -0.01141708809882402, + 0.004544785711914301, + -0.0191064290702343, + 0.006177256815135479, + 0.0009792818455025554 + ], + [ + 0.005355225410312414, + 0.002088159555569291, + 0.008700218982994556, + 0.002183530246838927, + 0.001043269294314086, + 0.004365036729723215, + 0.009824588894844055, + 0.004553941078484058, + 0.0000607153087912593, + 0.000255386607022956, + 0.002566061913967133, + 0.006586581002920866, + 0.009346004575490952, + 0.006846714299172163, + 0.0001434298319509253, + -0.0002082689170492813 + ] + ], + "Routing": [ + 1, + 2, + 3, + 4, + 5, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86 + ] + }, + "LoudspeakerLayout": { + "Name": "A loudspeaker layout", + "Loudspeakers": [ + { + "Azimuth": 30.0, + "Elevation": 0.0, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 1, + "Gain": 1.0 + }, + { + "Azimuth": -30.0, + "Elevation": 0.0, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 2, + "Gain": 1.0 + }, + { + "Azimuth": 0.0, + "Elevation": 0.0, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 3, + "Gain": 1.0 + }, + { + "Azimuth": 130.0, + "Elevation": 0.0, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 4, + "Gain": 1.0 + }, + { + "Azimuth": -130.0, + "Elevation": 0.0, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 5, + "Gain": 1.0 + }, + { + "Azimuth": 0.0, + "Elevation": 90.0, + "Radius": 1.0, + "IsImaginary": true, + "Channel": 6, + "Gain": 0.0 + }, + { + "Azimuth": 0.0, + "Elevation": -90.0, + "Radius": 1.0, + "IsImaginary": true, + "Channel": 7, + "Gain": 0.0 + }, + { + "Azimuth": 156.343505859375, + "Elevation": -77.32920837402344, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 8, + "Gain": 1.0 + }, + { + "Azimuth": 35.94946670532227, + "Elevation": -28.65211486816406, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 9, + "Gain": 1.0 + }, + { + "Azimuth": 67.89724731445312, + "Elevation": 64.504638671875, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 10, + "Gain": 1.0 + }, + { + "Azimuth": 159.0580902099609, + "Elevation": 54.68124389648438, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 11, + "Gain": 1.0 + }, + { + "Azimuth": 75.08197021484375, + "Elevation": -38.6996955871582, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 12, + "Gain": 1.0 + }, + { + "Azimuth": 8.426385879516602, + "Elevation": -18.86156463623047, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 13, + "Gain": 1.0 + }, + { + "Azimuth": 127.3879623413086, + "Elevation": -45.21382522583008, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 14, + "Gain": 1.0 + }, + { + "Azimuth": 282.4663391113281, + "Elevation": -44.03564834594727, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 15, + "Gain": 1.0 + }, + { + "Azimuth": 285.6147155761719, + "Elevation": -46.66128158569336, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 16, + "Gain": 1.0 + }, + { + "Azimuth": 227.7472076416016, + "Elevation": 23.58154296875, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 17, + "Gain": 1.0 + }, + { + "Azimuth": 129.9808654785156, + "Elevation": -35.77299880981445, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 18, + "Gain": 1.0 + }, + { + "Azimuth": 106.5510330200195, + "Elevation": -8.441055297851562, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 19, + "Gain": 1.0 + }, + { + "Azimuth": 122.2624359130859, + "Elevation": 82.34465026855469, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 20, + "Gain": 1.0 + }, + { + "Azimuth": 72.77767181396484, + "Elevation": 37.14752960205078, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 21, + "Gain": 1.0 + }, + { + "Azimuth": 17.05070114135742, + "Elevation": -84.43448638916016, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 22, + "Gain": 1.0 + }, + { + "Azimuth": 239.1049194335938, + "Elevation": 68.16072082519531, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 23, + "Gain": 1.0 + }, + { + "Azimuth": 294.3244018554688, + "Elevation": 65.151611328125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 24, + "Gain": 1.0 + }, + { + "Azimuth": 306.5675964355469, + "Elevation": -9.301361083984375, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 25, + "Gain": 1.0 + }, + { + "Azimuth": 4.041834354400635, + "Elevation": 35.55632781982422, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 26, + "Gain": 1.0 + }, + { + "Azimuth": 170.4044342041016, + "Elevation": 3.579765319824219, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 27, + "Gain": 1.0 + }, + { + "Azimuth": 270.013671875, + "Elevation": 69.80685424804688, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 28, + "Gain": 1.0 + }, + { + "Azimuth": 187.4513092041016, + "Elevation": -22.96147155761719, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 29, + "Gain": 1.0 + }, + { + "Azimuth": 193.1359405517578, + "Elevation": 47.805908203125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 30, + "Gain": 1.0 + }, + { + "Azimuth": 87.51930999755859, + "Elevation": 78.53073120117188, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 31, + "Gain": 1.0 + }, + { + "Azimuth": 32.12990188598633, + "Elevation": -86.38813018798828, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 32, + "Gain": 1.0 + }, + { + "Azimuth": 89.48677825927734, + "Elevation": 52.09768676757812, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 33, + "Gain": 1.0 + }, + { + "Azimuth": 351.6494140625, + "Elevation": -64.06101989746094, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 34, + "Gain": 1.0 + }, + { + "Azimuth": 352.8275451660156, + "Elevation": -63.7120475769043, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 35, + "Gain": 1.0 + }, + { + "Azimuth": 203.2311553955078, + "Elevation": -76.96486663818359, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 36, + "Gain": 1.0 + }, + { + "Azimuth": 43.00521087646484, + "Elevation": 44.28359985351562, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 37, + "Gain": 1.0 + }, + { + "Azimuth": 128.9801635742188, + "Elevation": 14.86852264404297, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 38, + "Gain": 1.0 + }, + { + "Azimuth": 290.618408203125, + "Elevation": 61.78358459472656, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 39, + "Gain": 1.0 + }, + { + "Azimuth": 133.1874847412109, + "Elevation": -89.03391265869141, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 40, + "Gain": 1.0 + }, + { + "Azimuth": 74.13334655761719, + "Elevation": 89.59426879882812, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 41, + "Gain": 1.0 + }, + { + "Azimuth": 41.85783386230469, + "Elevation": -57.67450332641602, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 42, + "Gain": 1.0 + }, + { + "Azimuth": 109.2193908691406, + "Elevation": -84.81214904785156, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 43, + "Gain": 1.0 + }, + { + "Azimuth": 144.3213806152344, + "Elevation": 54.64051818847656, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 44, + "Gain": 1.0 + }, + { + "Azimuth": 146.2114715576172, + "Elevation": -81.85577392578125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 45, + "Gain": 1.0 + }, + { + "Azimuth": 159.9962921142578, + "Elevation": 18.82240295410156, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 46, + "Gain": 1.0 + }, + { + "Azimuth": 356.3497619628906, + "Elevation": 15.30218505859375, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 47, + "Gain": 1.0 + }, + { + "Azimuth": 107.6309204101562, + "Elevation": 66.46701049804688, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 48, + "Gain": 1.0 + }, + { + "Azimuth": 242.0955810546875, + "Elevation": 0.2441635131835938, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 49, + "Gain": 1.0 + }, + { + "Azimuth": 107.5640029907227, + "Elevation": 44.07992553710938, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 50, + "Gain": 1.0 + }, + { + "Azimuth": 122.596321105957, + "Elevation": 8.113983154296875, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 51, + "Gain": 1.0 + }, + { + "Azimuth": 43.55049514770508, + "Elevation": -53.41069412231445, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 52, + "Gain": 1.0 + }, + { + "Azimuth": 152.9323425292969, + "Elevation": 57.02293395996094, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 53, + "Gain": 1.0 + }, + { + "Azimuth": 309.0556335449219, + "Elevation": 19.04463195800781, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 54, + "Gain": 1.0 + }, + { + "Azimuth": 266.0870361328125, + "Elevation": 12.40871429443359, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 55, + "Gain": 1.0 + }, + { + "Azimuth": 46.50417327880859, + "Elevation": -72.17700958251953, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 56, + "Gain": 1.0 + }, + { + "Azimuth": 62.03335571289062, + "Elevation": -72.69308471679688, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 57, + "Gain": 1.0 + }, + { + "Azimuth": 354.7068176269531, + "Elevation": 68.80496215820312, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 58, + "Gain": 1.0 + }, + { + "Azimuth": 349.811767578125, + "Elevation": -26.85671615600586, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 59, + "Gain": 1.0 + }, + { + "Azimuth": 298.373291015625, + "Elevation": 70.0020751953125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 60, + "Gain": 1.0 + }, + { + "Azimuth": 270.153076171875, + "Elevation": -18.67958831787109, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 61, + "Gain": 1.0 + }, + { + "Azimuth": 124.314453125, + "Elevation": 46.50726318359375, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 62, + "Gain": 1.0 + }, + { + "Azimuth": 355.0306396484375, + "Elevation": -89.96035003662109, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 63, + "Gain": 1.0 + }, + { + "Azimuth": 252.8854675292969, + "Elevation": -46.95735168457031, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 64, + "Gain": 1.0 + }, + { + "Azimuth": 355.6070861816406, + "Elevation": 74.00874328613281, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 65, + "Gain": 1.0 + }, + { + "Azimuth": 309.9019470214844, + "Elevation": -68.92700958251953, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 66, + "Gain": 1.0 + }, + { + "Azimuth": 227.4536437988281, + "Elevation": 76.6678466796875, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 67, + "Gain": 1.0 + }, + { + "Azimuth": 52.98881530761719, + "Elevation": 61.51449584960938, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 68, + "Gain": 1.0 + }, + { + "Azimuth": 88.31106567382812, + "Elevation": 72.03889465332031, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 69, + "Gain": 1.0 + }, + { + "Azimuth": 335.2003479003906, + "Elevation": -53.78620147705078, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 70, + "Gain": 1.0 + }, + { + "Azimuth": 130.6795349121094, + "Elevation": 75.41316223144531, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 71, + "Gain": 1.0 + }, + { + "Azimuth": 358.154052734375, + "Elevation": 57.49952697753906, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 72, + "Gain": 1.0 + }, + { + "Azimuth": 129.2331085205078, + "Elevation": -19.5274658203125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 73, + "Gain": 1.0 + }, + { + "Azimuth": 63.85198593139648, + "Elevation": -89.8380126953125, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 74, + "Gain": 1.0 + }, + { + "Azimuth": 45.11501693725586, + "Elevation": -45.94619369506836, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 75, + "Gain": 1.0 + }, + { + "Azimuth": 144.6218414306641, + "Elevation": 59.66218566894531, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 76, + "Gain": 1.0 + }, + { + "Azimuth": 104.6502456665039, + "Elevation": 38.35610961914062, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 77, + "Gain": 1.0 + }, + { + "Azimuth": 322.4672241210938, + "Elevation": 43.28404235839844, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 78, + "Gain": 1.0 + }, + { + "Azimuth": 9.678201675415039, + "Elevation": 60.77235412597656, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 79, + "Gain": 1.0 + }, + { + "Azimuth": 341.9919738769531, + "Elevation": -40.53199768066406, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 80, + "Gain": 1.0 + }, + { + "Azimuth": 337.5180969238281, + "Elevation": -16.82523345947266, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 81, + "Gain": 1.0 + }, + { + "Azimuth": 176.5812225341797, + "Elevation": 70.31546020507812, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 82, + "Gain": 1.0 + }, + { + "Azimuth": 4.018146991729736, + "Elevation": 16.49763488769531, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 83, + "Gain": 1.0 + }, + { + "Azimuth": 331.4899291992188, + "Elevation": 85.79713439941406, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 84, + "Gain": 1.0 + }, + { + "Azimuth": 204.8748931884766, + "Elevation": 56.09429931640625, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 85, + "Gain": 1.0 + }, + { + "Azimuth": 53.91055679321289, + "Elevation": 67.33366394042969, + "Radius": 1.0, + "IsImaginary": false, + "Channel": 86, + "Gain": 1.0 + } + ] + } +} \ No newline at end of file diff -Nru iem-plugin-suite-1.11.0/CoordinateConverter/CoordinateConverter.jucer iem-plugin-suite-1.11.1/CoordinateConverter/CoordinateConverter.jucer --- iem-plugin-suite-1.11.0/CoordinateConverter/CoordinateConverter.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/CoordinateConverter/CoordinateConverter.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -2,7 +2,7 @@ diff -Nru iem-plugin-suite-1.11.0/CoordinateConverter/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/CoordinateConverter/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/CoordinateConverter/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/CoordinateConverter/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -221,8 +221,8 @@ { updatingParams = true; - auto cartesian = Conversions::sphericalToCartesian (degreesToRadians (*azimuth) * azimuthFlipFactor, - degreesToRadians (*elevation) * elevationFlipFactor, + auto cartesian = Conversions::sphericalToCartesian (degreesToRadians (azimuth->load()) * azimuthFlipFactor, + degreesToRadians (elevation->load()) * elevationFlipFactor, (0.5f - radiusFlipFactor * (0.5f - *radius)) * *radiusRange); cartesian += {*xReference, *yReference, *zReference}; diff -Nru iem-plugin-suite-1.11.0/CoordinateConverter/Source/PluginProcessor.h iem-plugin-suite-1.11.1/CoordinateConverter/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/CoordinateConverter/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/CoordinateConverter/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -81,25 +81,25 @@ bool cartesianWasLastUpdated = true; // list of used audio parameters - float *azimuth; - float *elevation; - float *radius; - float *xPos; - float *yPos; - float *zPos; - float *xReference; - float *yReference; - float *zReference; - float *radiusRange; - float *xRange; - float *yRange; - float *zRange; - float *azimuthFlip; - float *elevationFlip; - float *radiusFlip; - float *xFlip; - float *yFlip; - float *zFlip; + std::atomic* azimuth; + std::atomic* elevation; + std::atomic* radius; + std::atomic* xPos; + std::atomic* yPos; + std::atomic* zPos; + std::atomic* xReference; + std::atomic* yReference; + std::atomic* zReference; + std::atomic* radiusRange; + std::atomic* xRange; + std::atomic* yRange; + std::atomic* zRange; + std::atomic* azimuthFlip; + std::atomic* elevationFlip; + std::atomic* radiusFlip; + std::atomic* xFlip; + std::atomic* yFlip; + std::atomic* zFlip; float azimuthFlipFactor = 1.0f; float elevationFlipFactor = 1.0f; diff -Nru iem-plugin-suite-1.11.0/debian/changelog iem-plugin-suite-1.11.1/debian/changelog --- iem-plugin-suite-1.11.0/debian/changelog 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/changelog 2020-04-08 13:05:54.000000000 +0000 @@ -1,3 +1,19 @@ +iem-plugin-suite (1.11.1-1) unstable; urgency=medium + + * New upstream version 1.11.1 (Closes: #952048) + * Drop patches applied upstream + * Fix dependencies + * Tighten versioned B-D on "juce-modules-source" to >5.4.5 + * Tighten versioned B-D on "juce-tools" to >5.4.4 + * Specifying common library is no longer needed + * Update d/copyright + * Regenerate d/copyright_hints + * Add salsa-ci configuration + * Bump dh-compat to 12 + * Declare compliance with standards version 4.5.0 + + -- IOhannes m zmölnig (Debian/GNU) Wed, 08 Apr 2020 15:05:54 +0200 + iem-plugin-suite (1.11.0-2) unstable; urgency=medium * Cherrypick upstream's fix for (not) using SIMDRegister on non-amd64 diff -Nru iem-plugin-suite-1.11.0/debian/control iem-plugin-suite-1.11.1/debian/control --- iem-plugin-suite-1.11.0/debian/control 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/control 2020-04-08 13:05:54.000000000 +0000 @@ -3,18 +3,18 @@ Priority: optional Maintainer: Debian Multimedia Maintainers Uploaders: IOhannes m zmölnig (Debian/GNU) -Build-Depends: debhelper-compat (= 11), +Build-Depends: debhelper-compat (= 12), dh-exec, - juce-modules-source (>= 5.4.0~), + juce-modules-source (>= 5.4.5~), libasound2-dev, libfreetype6-dev, libcurl4-gnutls-dev | libcurl-dev, libgl1-mesa-dev | libgl-dev, libx11-dev, libxext-dev, libxinerama-dev, libxrandr-dev, - juce-tools, + juce-tools (>= 5.4.4~), libjack-dev, libfftw3-dev, libjpeg-dev, libpng-dev, zlib1g-dev | libz-dev, xvfb, xauth, -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: https://plugins.iem.at/ Vcs-Git: https://salsa.debian.org/multimedia-team/iem-plugin-suite.git diff -Nru iem-plugin-suite-1.11.0/debian/copyright iem-plugin-suite-1.11.1/debian/copyright --- iem-plugin-suite-1.11.0/debian/copyright 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/copyright 2020-04-08 13:05:54.000000000 +0000 @@ -5,8 +5,8 @@ .git* Files: * -Copyright: 2017-2019, Institute of Electronic Music and Acoustics, IEM/Graz - 2017-2019, Daniel Rudrich +Copyright: 2017-2020, Institute of Electronic Music and Acoustics, IEM/Graz + 2017-2020, Daniel Rudrich 2017-2018, Sebastian Grill License: GPL-3+ @@ -79,9 +79,10 @@ License: GPL-3 Files: debian/* -Copyright: 2017 IOhannes m zmölnig (Debian/GNU) +Copyright: 2017-2020 IOhannes m zmölnig (Debian/GNU) License: GPL-3+ + License: MPL-2.0 This Source Code Form is subject to the terms of the Mozilla Public License v. 2.0. If a copy of the MPL was not distributed with this file, You can @@ -123,8 +124,6 @@ On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - - License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -Nru iem-plugin-suite-1.11.0/debian/copyright_hints iem-plugin-suite-1.11.1/debian/copyright_hints --- iem-plugin-suite-1.11.0/debian/copyright_hints 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/copyright_hints 2020-04-08 13:05:54.000000000 +0000 @@ -136,7 +136,6 @@ resources/ReferenceCountedMatrix.h resources/Standalone/IEM_AudioDeviceSelectorComponent.cpp resources/Standalone/IEM_AudioDeviceSelectorComponent.h - resources/Standalone/IEM_JackAudio.h resources/Standalone/MyStandaloneFilterWindow.h resources/Standalone/StandaloneApp.cpp resources/Weights.h @@ -317,6 +316,7 @@ resources/Eigen/src/Core/arch/Default/Settings.h resources/Eigen/src/Core/util/Constants.h resources/Eigen/src/Core/util/ForwardDeclarations.h + resources/Eigen/src/Core/util/Macros.h resources/Eigen/src/Core/util/Meta.h resources/Eigen/src/Core/util/StaticAssert.h resources/Eigen/src/Core/util/XprHelper.h @@ -373,7 +373,6 @@ README.md RoomEncoder/createListOfReflections.m _PluginTemplate/howTo.md - debian/changelog debian/control debian/install.sh debian/rules @@ -449,25 +448,6 @@ License: BSD-3-clause FIXME -Files: resources/Eigen/src/MetisSupport/MetisSupport.h - resources/Eigen/src/OrderingMethods/Ordering.h - resources/Eigen/src/PaStiXSupport/PaStiXSupport.h - resources/Eigen/src/SparseCore/SparseColEtree.h - resources/Eigen/src/SparseLU/SparseLUImpl.h - resources/Eigen/src/SparseLU/SparseLU_Memory.h - resources/Eigen/src/SparseLU/SparseLU_Structs.h - resources/Eigen/src/SparseLU/SparseLU_Utils.h - resources/Eigen/src/SparseLU/SparseLU_column_dfs.h - resources/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h - resources/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h - resources/Eigen/src/SparseLU/SparseLU_panel_dfs.h - resources/Eigen/src/SparseLU/SparseLU_pivotL.h - resources/Eigen/src/SparseLU/SparseLU_pruneL.h - resources/Eigen/src/SparseLU/SparseLU_relax_snode.h -Copyright: 2012, Désiré Nuentsa-Wakam -License: MPL-2.0 - FIXME - Files: resources/Eigen/src/Core/DenseCoeffsBase.h resources/Eigen/src/Core/Dot.h resources/Eigen/src/Core/MathFunctions.h @@ -488,6 +468,19 @@ License: MPL-2.0 FIXME +Files: resources/Eigen/src/SparseCore/SparseColEtree.h + resources/Eigen/src/SparseLU/SparseLU_Memory.h + resources/Eigen/src/SparseLU/SparseLU_column_dfs.h + resources/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h + resources/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h + resources/Eigen/src/SparseLU/SparseLU_panel_dfs.h + resources/Eigen/src/SparseLU/SparseLU_pivotL.h + resources/Eigen/src/SparseLU/SparseLU_pruneL.h + resources/Eigen/src/SparseLU/SparseLU_relax_snode.h +Copyright: 2012, Désiré Nuentsa-Wakam +License: MIT~Boehm and/or MPL-2.0 + FIXME + Files: resources/Eigen/SparseLU resources/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h resources/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h @@ -495,9 +488,7 @@ resources/Eigen/src/SparseCore/SparseTriangularView.h resources/Eigen/src/SparseLU/SparseLU.h resources/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h - resources/Eigen/src/SparseLU/SparseLU_column_bmod.h resources/Eigen/src/SparseLU/SparseLU_kernel_bmod.h - resources/Eigen/src/SparseLU/SparseLU_panel_bmod.h Copyright: 2009-2015, Gael Guennebaud 2011-2014, Gael Guennebaud 2012, Désiré Nuentsa-Wakam @@ -536,6 +527,16 @@ License: MPL-2.0 FIXME +Files: resources/Eigen/src/MetisSupport/MetisSupport.h + resources/Eigen/src/OrderingMethods/Ordering.h + resources/Eigen/src/PaStiXSupport/PaStiXSupport.h + resources/Eigen/src/SparseLU/SparseLUImpl.h + resources/Eigen/src/SparseLU/SparseLU_Structs.h + resources/Eigen/src/SparseLU/SparseLU_Utils.h +Copyright: 2012, Désiré Nuentsa-Wakam +License: MPL-2.0 + FIXME + Files: resources/Eigen/StdDeque resources/Eigen/StdVector resources/Eigen/src/StlSupport/StdDeque.h @@ -578,11 +579,11 @@ License: MPL-2.0 FIXME -Files: resources/Eigen/src/OrderingMethods/Amd.h - resources/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h -Copyright: 2008-2012, Gael Guennebaud - 2010, Gael Guennebaud -License: LGPL-2.1+ +Files: resources/Eigen/src/SparseLU/SparseLU_column_bmod.h + resources/Eigen/src/SparseLU/SparseLU_panel_bmod.h +Copyright: 2012, Désiré Nuentsa-Wakam + 2012, Gael Guennebaud +License: MIT~Boehm and/or MPL-2.0 FIXME Files: resources/Eigen/src/Core/DenseStorage.h @@ -640,17 +641,18 @@ License: MPL-2.0 FIXME +Files: debian/copyright + debian/copyright_hints +Copyright: -format/1.0/ +License: UNKNOWN + FIXME + Files: resources/NewtonApple/NewtonApple_hull3D.cpp resources/NewtonApple/NewtonApple_hull3D.h Copyright: 2017, Dr David Sinclair License: UNKNOWN FIXME -Files: debian/copyright -Copyright: -format/1.0/ -License: BSD-3-clause - FIXME - Files: resources/Eigen/src/Core/Assign_MKL.h Copyright: 2011, Intel Corporation. 2015, Gael Guennebaud @@ -662,18 +664,6 @@ License: BSD-3-clause FIXME -Files: resources/Eigen/src/Core/arch/CUDA/Half.h -Copyright: Fabian Giesen, 2016 - Fabian Giesen, 2016. -License: BSD~unspecified and/or MPL-2.0 - FIXME - -Files: resources/Eigen/src/Core/util/Macros.h -Copyright: 2006-2008, Benoit Jacob - 2008-2015, Gael Guennebaud -License: CC0 and/or MPL-2.0 - FIXME - Files: resources/WalshHadamard/LICENSE Copyright: 2014, John H License: Expat @@ -684,6 +674,21 @@ License: GPL-3 FIXME +Files: resources/Standalone/IEM_JackAudio.h +Copyright: 2017, - Institute of Electronic Music and Acoustics (IEM) +License: GPL-3+ and/or ISC + FIXME + +Files: resources/Eigen/src/OrderingMethods/Amd.h +Copyright: 2010, Gael Guennebaud +License: LGPL-2.1+ + FIXME + +Files: resources/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h +Copyright: 2008-2012, Gael Guennebaud +License: LGPL-2.1+ and/or LGPL-bdwgc + FIXME + Files: resources/Eigen/src/Eigenvalues/RealQZ.h Copyright: 2012, Alexey Korepanov License: MPL-2.0 @@ -768,6 +773,12 @@ License: MPL-2.0 FIXME +Files: resources/Eigen/src/Core/arch/CUDA/Half.h +Copyright: Fabian Giesen, 2016 + Fabian Giesen, 2016. +License: MPL-2.0 + FIXME + Files: resources/Eigen/src/SVD/BDCSVD.h Copyright: 2013, Gauthier Brun 2013, Jean Ceccato @@ -830,8 +841,8 @@ License: MPL-2.0 FIXME -Files: debian/copyright_hints -Copyright: -format/1.0/ +Files: debian/changelog +Copyright: Regenerate d/copyright License: UNKNOWN FIXME diff -Nru iem-plugin-suite-1.11.0/debian/patches/0001-using-types-of-SIMD-guard-see-https-git.iem.at-audio.patch iem-plugin-suite-1.11.1/debian/patches/0001-using-types-of-SIMD-guard-see-https-git.iem.at-audio.patch --- iem-plugin-suite-1.11.0/debian/patches/0001-using-types-of-SIMD-guard-see-https-git.iem.at-audio.patch 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/patches/0001-using-types-of-SIMD-guard-see-https-git.iem.at-audio.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,393 +0,0 @@ -From: Daniel Rudrich -Date: Thu, 12 Dec 2019 11:15:15 +0100 -Subject: using types of SIMD guard see - https://git.iem.at/audioplugins/IEMPluginSuite/issues/106 - ---- - MultiBandCompressor/Source/PluginProcessor.cpp | 20 ++++---- - MultiEQ/Source/PluginProcessor.cpp | 66 +++++++++++++------------- - MultiEQ/Source/PluginProcessor.h | 8 ++-- - RoomEncoder/Source/PluginProcessor.cpp | 36 +++++++------- - RoomEncoder/Source/PluginProcessor.h | 8 ++-- - 5 files changed, 69 insertions(+), 69 deletions(-) - -diff --git a/MultiBandCompressor/Source/PluginProcessor.cpp b/MultiBandCompressor/Source/PluginProcessor.cpp -index 2f55b1b..3b87be0 100644 ---- a/MultiBandCompressor/Source/PluginProcessor.cpp -+++ b/MultiBandCompressor/Source/PluginProcessor.cpp -@@ -513,20 +513,20 @@ void MultiBandCompressorAudioProcessor::processBlock (AudioSampleBuffer& buffer, - // | ---> LP1 ---> | - for (int i = 0; i < numSimdFilters; ++i) - { -- const SIMDRegister* chPtrInterleaved[1] = {interleaved[i]->getChannelPointer (0)}; -- AudioBlock> abInterleaved (const_cast**> (chPtrInterleaved), 1, L); -+ const filterFloatType* chPtrInterleaved[1] = {interleaved[i]->getChannelPointer (0)}; -+ AudioBlock abInterleaved (const_cast (chPtrInterleaved), 1, L); - -- const SIMDRegister* chPtrLow[1] = {freqBands[FrequencyBands::Low][i]->getChannelPointer (0)}; -- AudioBlock> abLow (const_cast**> (chPtrLow), 1, L); -+ const filterFloatType* chPtrLow[1] = {freqBands[FrequencyBands::Low][i]->getChannelPointer (0)}; -+ AudioBlock abLow (const_cast (chPtrLow), 1, L); - -- const SIMDRegister* chPtrMidLow[1] = {freqBands[FrequencyBands::MidLow][i]->getChannelPointer (0)}; -- AudioBlock> abMidLow (const_cast**> (chPtrMidLow), 1, L); -+ const filterFloatType* chPtrMidLow[1] = {freqBands[FrequencyBands::MidLow][i]->getChannelPointer (0)}; -+ AudioBlock abMidLow (const_cast (chPtrMidLow), 1, L); - -- const SIMDRegister* chPtrMidHigh[1] = {freqBands[FrequencyBands::MidHigh][i]->getChannelPointer (0)}; -- AudioBlock> abMidHigh (const_cast**> (chPtrMidHigh), 1, L); -+ const filterFloatType* chPtrMidHigh[1] = {freqBands[FrequencyBands::MidHigh][i]->getChannelPointer (0)}; -+ AudioBlock abMidHigh (const_cast (chPtrMidHigh), 1, L); - -- const SIMDRegister* chPtrHigh[1] = {freqBands[FrequencyBands::High][i]->getChannelPointer (0)}; -- AudioBlock> abHigh (const_cast**> (chPtrHigh), 1, L); -+ const filterFloatType* chPtrHigh[1] = {freqBands[FrequencyBands::High][i]->getChannelPointer (0)}; -+ AudioBlock abHigh (const_cast (chPtrHigh), 1, L); - - - iirLP[1][i]->process (ProcessContextNonReplacing (abInterleaved, abLow)); -diff --git a/MultiEQ/Source/PluginProcessor.cpp b/MultiEQ/Source/PluginProcessor.cpp -index 674b187..9976306 100644 ---- a/MultiEQ/Source/PluginProcessor.cpp -+++ b/MultiEQ/Source/PluginProcessor.cpp -@@ -83,16 +83,16 @@ createParameterLayout()) - for (int i = 0; i < numFilterBands; ++i) - { - filterArrays[i].clear(); -- for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) -+ for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) - filterArrays[i].add (new IIR::Filter (processorCoefficients[i])); - } - - additionalFilterArrays[0].clear(); -- for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) -+ for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) - additionalFilterArrays[0].add (new IIR::Filter (additionalProcessorCoefficients[0])); - - additionalFilterArrays[1].clear(); -- for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) -+ for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) - additionalFilterArrays[1].add (new IIR::Filter (additionalProcessorCoefficients[1])); - } - -@@ -338,7 +338,7 @@ void MultiEQAudioProcessor::copyFilterCoefficientsToProcessor() - - inline void MultiEQAudioProcessor::clear (AudioBlock& ab) - { -- const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements(); -+ const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements; - const int nCh = static_cast (ab.getNumChannels()); - - for (int ch = 0; ch < nCh; ++ch) -@@ -384,7 +384,7 @@ void MultiEQAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBloc - - interleavedData.clear(); - -- for (int i = 0; i < ceil (64 / IIRfloat_elements()); ++i) -+ for (int i = 0; i < ceil (64 / IIRfloat_elements); ++i) - { - // reset filters - for (int f = 0; f < numFilterBands; ++f) -@@ -397,7 +397,7 @@ void MultiEQAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBloc - clear (*interleavedData.getLast()); - } - -- zero = AudioBlock (zeroData, IIRfloat_elements(), samplesPerBlock); -+ zero = AudioBlock (zeroData, IIRfloat_elements, samplesPerBlock); - zero.clear(); - } - -@@ -417,7 +417,7 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - - const int maxNChIn = jmin (buffer.getNumChannels(), input.getSize()); - -- const int nSIMDFilters = 1 + (maxNChIn - 1) / IIRfloat_elements(); -+ const int nSIMDFilters = 1 + (maxNChIn - 1) / IIRfloat_elements; - - - // update iir filter coefficients -@@ -425,14 +425,14 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - - - //interleave input data -- int partial = maxNChIn % IIRfloat_elements(); -+ int partial = maxNChIn % IIRfloat_elements; - if (partial == 0) - { - for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - } - else -@@ -440,24 +440,24 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - int i; - for (i = 0; i (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - -- const float* addr[IIRfloat_elements()]; -+ const float* addr[IIRfloat_elements]; - int ch; - for (ch = 0; ch < partial; ++ch) - { -- addr[ch] = buffer.getReadPointer (i * IIRfloat_elements() + ch); -+ addr[ch] = buffer.getReadPointer (i * IIRfloat_elements + ch); - } -- for (; ch < IIRfloat_elements(); ++ch) -+ for (; ch < IIRfloat_elements; ++ch) - { - addr[ch] = zero.getChannelPointer(ch); - } - AudioDataConverters::interleaveSamples (addr, - reinterpret_cast (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - - -@@ -469,9 +469,9 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - { - for (int i = 0; i < nSIMDFilters; ++i) - { -- const SIMDRegister* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; -- AudioBlock> ab (const_cast**> (chPtr), 1, L); -- ProcessContextReplacing> context (ab); -+ const IIRfloat* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; -+ AudioBlock ab (const_cast (chPtr), 1, L); -+ ProcessContextReplacing context (ab); - filterArrays[f][i]->process (context); - } - } -@@ -482,9 +482,9 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - { - for (int i = 0; i < nSIMDFilters; ++i) - { -- const SIMDRegister* chPtr[1] = {chPtr[0] = interleavedData[i]->getChannelPointer (0)}; -- AudioBlock> ab (const_cast**> (chPtr), 1, L); -- ProcessContextReplacing> context (ab); -+ const IIRfloat* chPtr[1] = {chPtr[0] = interleavedData[i]->getChannelPointer (0)}; -+ AudioBlock ab (const_cast (chPtr), 1, L); -+ ProcessContextReplacing context (ab); - additionalFilterArrays[0][i]->process (context); - } - } -@@ -492,9 +492,9 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - { - for (int i = 0; i < nSIMDFilters; ++i) - { -- const SIMDRegister* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; -- AudioBlock> ab (const_cast**> (chPtr), 1, L); -- ProcessContextReplacing> context (ab); -+ const IIRfloat* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; -+ AudioBlock ab (const_cast (chPtr), 1, L); -+ ProcessContextReplacing context (ab); - additionalFilterArrays[1][i]->process (context); - } - } -@@ -506,9 +506,9 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), -- buffer.getArrayOfWritePointers() + i * IIRfloat_elements(), -+ buffer.getArrayOfWritePointers() + i * IIRfloat_elements, - L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - } - else -@@ -517,25 +517,25 @@ void MultiEQAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& - for (i = 0; i (interleavedData[i]->getChannelPointer (0)), -- buffer.getArrayOfWritePointers() + i * IIRfloat_elements(), -+ buffer.getArrayOfWritePointers() + i * IIRfloat_elements, - L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - -- float* addr[IIRfloat_elements()]; -+ float* addr[IIRfloat_elements]; - int ch; - for (ch = 0; ch < partial; ++ch) - { -- addr[ch] = buffer.getWritePointer (i * IIRfloat_elements() + ch); -+ addr[ch] = buffer.getWritePointer (i * IIRfloat_elements + ch); - } -- for (; ch < IIRfloat_elements(); ++ch) -+ for (; ch < IIRfloat_elements; ++ch) - { - addr[ch] = zero.getChannelPointer (ch); - } - AudioDataConverters::deinterleaveSamples (reinterpret_cast (interleavedData[i]->getChannelPointer (0)), - addr, - L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - zero.clear(); - } - -diff --git a/MultiEQ/Source/PluginProcessor.h b/MultiEQ/Source/PluginProcessor.h -index 1763a45..1cd1800 100644 ---- a/MultiEQ/Source/PluginProcessor.h -+++ b/MultiEQ/Source/PluginProcessor.h -@@ -31,11 +31,11 @@ - using namespace juce::dsp; - - #if JUCE_USE_SIMD --# define IIRfloat juce::dsp::SIMDRegister --# define IIRfloat_elements() IIRfloat::SIMDNumElements -+ using IIRfloat = juce::dsp::SIMDRegister; -+ static constexpr int IIRfloat_elements = juce::dsp::SIMDRegister::size(); - #else /* !JUCE_USE_SIMD */ --# define IIRfloat float --# define IIRfloat_elements() 1 -+ using IIRfloat = float; -+ static constexpr int IIRfloat_elements = 1; - #endif /* JUCE_USE_SIMD */ - - #define ProcessorClass MultiEQAudioProcessor -diff --git a/RoomEncoder/Source/PluginProcessor.cpp b/RoomEncoder/Source/PluginProcessor.cpp -index 84f44a4..25d77ed 100644 ---- a/RoomEncoder/Source/PluginProcessor.cpp -+++ b/RoomEncoder/Source/PluginProcessor.cpp -@@ -264,7 +264,7 @@ void RoomEncoderAudioProcessor::prepareToPlay (double sampleRate, int samplesPer - clear (*interleavedData.getLast()); - } - -- zero = AudioBlock (zeroData, IIRfloat_elements(), samplesPerBlock); -+ zero = AudioBlock (zeroData, IIRfloat_elements, samplesPerBlock); - zero.clear(); - - updateFv = true; -@@ -416,7 +416,7 @@ void RoomEncoderAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf - float* pBufferWrite = buffer.getWritePointer(0); - const float* pBufferRead = buffer.getReadPointer(0); - -- const int nSIMDFilters = 1 + (maxNChIn-1)/IIRfloat_elements(); -+ const int nSIMDFilters = 1 + (maxNChIn-1)/IIRfloat_elements; - - const auto delayBufferWritePtrArray = delayBuffer.getArrayOfWritePointers(); - -@@ -425,14 +425,14 @@ void RoomEncoderAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf - - - //interleave input data -- int partial = maxNChIn%IIRfloat_elements(); -+ int partial = maxNChIn%IIRfloat_elements; - if (partial == 0) - { - for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - } - else -@@ -440,24 +440,24 @@ void RoomEncoderAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf - int i; - for (i = 0; i (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - -- const float* addr[IIRfloat_elements()]; -+ const float* addr[IIRfloat_elements]; - size_t ch; - for (ch = 0; ch < partial; ++ch) - { -- addr[ch] = buffer.getReadPointer(i * static_cast (IIRfloat_elements() + ch)); -+ addr[ch] = buffer.getReadPointer(i * static_cast (IIRfloat_elements + ch)); - } -- for (; ch < IIRfloat_elements(); ++ch) -+ for (; ch < IIRfloat_elements; ++ch) - { - addr[ch] = zero.getChannelPointer(ch); - } - AudioDataConverters::interleaveSamples(addr, - reinterpret_cast (interleavedData[i]->getChannelPointer (0)), L, -- static_cast (IIRfloat_elements())); -+ static_cast (IIRfloat_elements)); - } - - int currNumRefl = roundToInt(*numRefl); -@@ -538,10 +538,10 @@ void RoomEncoderAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf - { - for (int i = 0; i* chPtr[1]; -+ const IIRfloat* chPtr[1]; - chPtr[0] = interleavedData[i]->getChannelPointer (0); -- AudioBlock> ab (const_cast**> (chPtr), 1, L); -- ProcessContextReplacing> context (ab); -+ AudioBlock ab (const_cast (chPtr), 1, L); -+ ProcessContextReplacing context (ab); - - lowShelfArray[idx]->getUnchecked (i)->process (context); - highShelfArray[idx]->getUnchecked (i)->process (context); -@@ -553,15 +553,15 @@ void RoomEncoderAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf - * the following section is broken, as it hardcodes asumptions about how - * many floats can be stored in IIRfloat - */ -- IIRfloat SHsample[16]; //TODO: can be smaller: (N+1)^2/IIRfloat_elements() -+ IIRfloat SHsample[16]; //TODO: can be smaller: (N+1)^2/IIRfloat_elements - IIRfloat SHsampleStep[16]; - #if JUCE_USE_SIMD - FloatVectorOperations::clear((float *) &SHsample->value, -- IIRfloat_elements() * sizeof(SHsample) / sizeof(*SHsample)); -+ IIRfloat_elements * sizeof(SHsample) / sizeof(*SHsample)); - SHEval(directivityOrder, smx[q], smy[q], smz[q],(float *) &SHsample->value, false); // deoding -> false - #else /* !JUCE_USE_SIMD */ - FloatVectorOperations::clear((float *) SHsample, -- IIRfloat_elements() * sizeof(SHsample) / sizeof(*SHsample)); -+ IIRfloat_elements * sizeof(SHsample) / sizeof(*SHsample)); - SHEval(directivityOrder, smx[q], smy[q], smz[q],(float *) SHsample, false); // deoding -> false - #endif /* JUCE_USE_SIMD */ - -@@ -1135,7 +1135,7 @@ std::vector> RoomEncoderAudioProcessor::cr - - inline void RoomEncoderAudioProcessor::clear (AudioBlock& ab) - { -- const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements(); -+ const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements; - const int nCh = static_cast (ab.getNumChannels()); - - for (int ch = 0; ch < nCh; ++ch) -diff --git a/RoomEncoder/Source/PluginProcessor.h b/RoomEncoder/Source/PluginProcessor.h -index 252b9b5..6f9e887 100644 ---- a/RoomEncoder/Source/PluginProcessor.h -+++ b/RoomEncoder/Source/PluginProcessor.h -@@ -39,11 +39,11 @@ - #endif - - #if JUCE_USE_SIMD --# define IIRfloat juce::dsp::SIMDRegister --# define IIRfloat_elements() IIRfloat::size() -+ using IIRfloat = juce::dsp::SIMDRegister; -+ static constexpr int IIRfloat_elements = juce::dsp::SIMDRegister::size(); - #else /* !JUCE_USE_SIMD */ --# define IIRfloat float --# define IIRfloat_elements() 1 -+ using IIRfloat = float; -+ static constexpr int IIRfloat_elements = 1; - #endif /* JUCE_USE_SIMD */ - - #define ProcessorClass RoomEncoderAudioProcessor diff -Nru iem-plugin-suite-1.11.0/debian/patches/series iem-plugin-suite-1.11.1/debian/patches/series --- iem-plugin-suite-1.11.0/debian/patches/series 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/patches/series 2020-04-08 13:05:54.000000000 +0000 @@ -1 +0,0 @@ -0001-using-types-of-SIMD-guard-see-https-git.iem.at-audio.patch diff -Nru iem-plugin-suite-1.11.0/debian/rules iem-plugin-suite-1.11.1/debian/rules --- iem-plugin-suite-1.11.0/debian/rules 2019-12-12 12:33:37.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/rules 2020-04-08 13:05:54.000000000 +0000 @@ -17,7 +17,7 @@ export MAKEFLAGS = V=1 CONFIG=Release TARGET_ARCH=-DDEBIAN_BUILD=1 -PCDEPS=jack flac vorbis vorbisenc vorbisfile ogg libjpeg libpng zlib fftw3f +PCDEPS=fftw3f # see ENVIRONMENT in dpkg-buildflags(1) export DEB_CPPFLAGS_MAINT_APPEND = -DJUCE_JACK=1 diff -Nru iem-plugin-suite-1.11.0/debian/salsa-ci.yml iem-plugin-suite-1.11.1/debian/salsa-ci.yml --- iem-plugin-suite-1.11.0/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/debian/salsa-ci.yml 2020-04-08 13:05:54.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru iem-plugin-suite-1.11.0/DirectionalCompressor/DirectionalCompressor.jucer iem-plugin-suite-1.11.1/DirectionalCompressor/DirectionalCompressor.jucer --- iem-plugin-suite-1.11.0/DirectionalCompressor/DirectionalCompressor.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectionalCompressor/DirectionalCompressor.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -2,7 +2,7 @@ diff -Nru iem-plugin-suite-1.11.0/DirectionalCompressor/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/DirectionalCompressor/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/DirectionalCompressor/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectionalCompressor/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -166,7 +166,10 @@ const int totalNumInputChannels = getTotalNumInputChannels(); const int totalNumOutputChannels = getTotalNumOutputChannels(); const int bufferSize = buffer.getNumSamples(); - //const int ambisonicOrder = input.getOrder(); + + const int numCh = jmin(input.getNumberOfChannels(), buffer.getNumChannels()); + if (numCh == 0) + return; // Compressor 1 settings if (*c1Ratio > 15.9f) @@ -192,22 +195,18 @@ compressor2.setThreshold(*c2Threshold); compressor2.setMakeUpGain(*c2Makeup); - drivingPointers[0] = maskBuffer.getReadPointer(0); drivingPointers[1] = buffer.getReadPointer(0); drivingPointers[2] = omniW.getReadPointer(0); - - const int numCh = jmin(input.getNumberOfChannels(), buffer.getNumChannels()); - // preGain - can be tweaked by adding gain to compressor gains - float preGainLinear = Decibels::decibelsToGain(*preGain); + float preGainLinear = Decibels::decibelsToGain (preGain->load()); if (*useSN3D >= 0.5f) for (int i = 0; i < numCh; ++i) buffer.applyGain(i, 0, bufferSize, sn3d2n3d[i] * preGainLinear); else - buffer.applyGain(Decibels::decibelsToGain(*preGain)); + buffer.applyGain (Decibels::decibelsToGain (preGain->load())); // --------- make copys of buffer diff -Nru iem-plugin-suite-1.11.0/DirectionalCompressor/Source/PluginProcessor.h iem-plugin-suite-1.11.1/DirectionalCompressor/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/DirectionalCompressor/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectionalCompressor/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -116,32 +116,32 @@ Compressor compressor1, compressor2; // == PARAMETERS == // settings and mask - float *orderSetting; - float *useSN3D; - float *preGain; - float *azimuth; - float *elevation; - float *width; - float *listen; + std::atomic* orderSetting; + std::atomic* useSN3D; + std::atomic* preGain; + std::atomic* azimuth; + std::atomic* elevation; + std::atomic* width; + std::atomic* listen; // compressor 1 - float *c1Enabled; - float *c1DrivingSignal; - float *c1Apply; - float *c1Threshold; - float *c1Knee; - float *c1Attack; - float *c1Release; - float *c1Ratio; - float *c1Makeup; + std::atomic* c1Enabled; + std::atomic* c1DrivingSignal; + std::atomic* c1Apply; + std::atomic* c1Threshold; + std::atomic* c1Knee; + std::atomic* c1Attack; + std::atomic* c1Release; + std::atomic* c1Ratio; + std::atomic* c1Makeup; // compressor 2 - float *c2Enabled; - float *c2DrivingSignal; - float *c2Apply; - float *c2Threshold; - float *c2Knee; - float *c2Attack; - float *c2Release; - float *c2Ratio; - float *c2Makeup; + std::atomic* c2Enabled; + std::atomic* c2DrivingSignal; + std::atomic* c2Apply; + std::atomic* c2Threshold; + std::atomic* c2Knee; + std::atomic* c2Attack; + std::atomic* c2Release; + std::atomic* c2Ratio; + std::atomic* c2Makeup; }; diff -Nru iem-plugin-suite-1.11.0/DirectivityShaper/DirectivityShaper.jucer iem-plugin-suite-1.11.1/DirectivityShaper/DirectivityShaper.jucer --- iem-plugin-suite-1.11.0/DirectivityShaper/DirectivityShaper.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectivityShaper/DirectivityShaper.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -2,7 +2,7 @@ diff -Nru iem-plugin-suite-1.11.0/DirectivityShaper/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/DirectivityShaper/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/DirectivityShaper/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectivityShaper/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -87,7 +87,7 @@ for (int i = 0; i < numberOfBands; ++i) { - filter[i].coefficients = createFilterCoefficients(roundToInt(*filterType[i]), 44100, *filterFrequency[i], *filterQ[i]); + filter[i].coefficients = createFilterCoefficients(roundToInt (filterType[i]->load()), 44100, filterFrequency[i]->load(), filterQ[i]->load()); } } @@ -145,7 +145,7 @@ for (int i = 0; i < numberOfBands; ++i) { - *filter[i].coefficients = *createFilterCoefficients(roundToInt(*filterType[i]), sampleRate, *filterFrequency[i], *filterQ[i]); + *filter[i].coefficients = *createFilterCoefficients(roundToInt (filterType[i]->load()), sampleRate, filterFrequency[i]->load(), filterQ[i]->load()); filter[i].reset(); } repaintFV = true; @@ -187,7 +187,7 @@ float probeSH[64]; { - Vector3D pos = Conversions::sphericalToCartesian(degreesToRadians(*probeAzimuth), degreesToRadians(*probeElevation)); + Vector3D pos = Conversions::sphericalToCartesian (degreesToRadians (probeAzimuth->load()), degreesToRadians (probeElevation->load())); SHEval(orderToWorkWith, pos.x, pos.y, pos.z, probeSH, false); // decoding -> false if (applySN3D) { // reverting SN3D in probeSH @@ -225,12 +225,12 @@ WeightsHelper::applyNormalization(tempWeights, *order[b], orderToWorkWith, norm, applySN3D); - Vector3D pos = Conversions::sphericalToCartesian(degreesToRadians(*azimuth[b]), degreesToRadians(*elevation[b])); + Vector3D pos = Conversions::sphericalToCartesian (degreesToRadians(azimuth[b]->load()), degreesToRadians (elevation[b]->load())); SHEval(orderToWorkWith, pos.x, pos.y, pos.z, sh, true); // encoding -> true float temp = 0.0f; float shTemp[64]; - FloatVectorOperations::multiply(shTemp, sh, Decibels::decibelsToGain(*filterGain[b]), 64); + FloatVectorOperations::multiply(shTemp, sh, Decibels::decibelsToGain (filterGain[b]->load()), 64); for (int i = 0; i < nChToWorkWith; ++i) { shTemp[i] *= tempWeights[isqrt(i)]; @@ -320,14 +320,14 @@ { iem::Quaternion probeQuat; float probeypr[3]; - probeypr[0] = degreesToRadians(*probeAzimuth); - probeypr[1] = degreesToRadians(*probeElevation); - probeypr[2] = - degreesToRadians(*probeRoll); + probeypr[0] = degreesToRadians (probeAzimuth->load()); + probeypr[1] = degreesToRadians (probeElevation->load()); + probeypr[2] = - degreesToRadians (probeRoll->load()); probeQuat.fromYPR(probeypr); probeQuat.conjugate(); - ypr[0] = degreesToRadians(*azimuth[i]); - ypr[1] = degreesToRadians(*elevation[i]); + ypr[0] = degreesToRadians (azimuth[i]->load()); + ypr[1] = degreesToRadians (elevation[i]->load()); quats[i].fromYPR(ypr); quats[i] = probeQuat*quats[i]; } @@ -345,9 +345,9 @@ moving = true; iem::Quaternion probeQuat; float ypr[3]; - ypr[0] = degreesToRadians(*probeAzimuth); - ypr[1] = degreesToRadians(*probeElevation); - ypr[2] = - degreesToRadians(*probeRoll); + ypr[0] = degreesToRadians (probeAzimuth->load()); + ypr[1] = degreesToRadians (probeElevation->load()); + ypr[2] = - degreesToRadians (probeRoll->load()); probeQuat.fromYPR(ypr); for (int i = 0; i < numberOfBands; ++i) @@ -374,14 +374,14 @@ { iem::Quaternion probeQuat; float probeypr[3]; - probeypr[0] = degreesToRadians(*probeAzimuth); - probeypr[1] = degreesToRadians(*probeElevation); - probeypr[2] = - degreesToRadians(*probeRoll); + probeypr[0] = degreesToRadians (probeAzimuth->load()); + probeypr[1] = degreesToRadians (probeElevation->load()); + probeypr[2] = - degreesToRadians (probeRoll->load()); probeQuat.fromYPR(probeypr); probeQuat.conjugate(); - ypr[0] = degreesToRadians(*azimuth[i]); - ypr[1] = degreesToRadians(*elevation[i]); + ypr[0] = degreesToRadians (azimuth[i]->load()); + ypr[1] = degreesToRadians (elevation[i]->load()); quats[i].fromYPR(ypr); quats[i] = probeQuat*quats[i]; } @@ -392,7 +392,7 @@ else if (parameterID.startsWith("filter")) { int i = parameterID.getLastCharacters(1).getIntValue(); - *filter[i].coefficients = *createFilterCoefficients(roundToInt(*filterType[i]), getSampleRate(), *filterFrequency[i], *filterQ[i]); + *filter[i].coefficients = *createFilterCoefficients (roundToInt (filterType[i]->load()), getSampleRate(), *filterFrequency[i], *filterQ[i]); repaintFV = true; } else if (parameterID.startsWith("order") || parameterID.startsWith("shape")) diff -Nru iem-plugin-suite-1.11.0/DirectivityShaper/Source/PluginProcessor.h iem-plugin-suite-1.11.1/DirectivityShaper/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/DirectivityShaper/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DirectivityShaper/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -105,21 +105,21 @@ float shOld[numberOfBands][64]; // parameters - float *orderSetting; - float *useSN3D; - float* filterType[numberOfBands]; - float* filterFrequency[numberOfBands]; - float* filterQ[numberOfBands]; - float* filterGain[numberOfBands]; - float* probeAzimuth; - float* probeElevation; - float* probeRoll; - float* probeLock; - float* normalization; - float* order[numberOfBands]; - float* shape[numberOfBands]; - float* azimuth[numberOfBands]; - float* elevation[numberOfBands]; + std::atomic* orderSetting; + std::atomic* useSN3D; + std::atomic* filterType[numberOfBands]; + std::atomic* filterFrequency[numberOfBands]; + std::atomic* filterQ[numberOfBands]; + std::atomic* filterGain[numberOfBands]; + std::atomic* probeAzimuth; + std::atomic* probeElevation; + std::atomic* probeRoll; + std::atomic* probeLock; + std::atomic* normalization; + std::atomic* order[numberOfBands]; + std::atomic* shape[numberOfBands]; + std::atomic* azimuth[numberOfBands]; + std::atomic* elevation[numberOfBands]; //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectivityShaperAudioProcessor) }; diff -Nru iem-plugin-suite-1.11.0/DistanceCompensator/DistanceCompensator.jucer iem-plugin-suite-1.11.1/DistanceCompensator/DistanceCompensator.jucer --- iem-plugin-suite-1.11.0/DistanceCompensator/DistanceCompensator.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DistanceCompensator/DistanceCompensator.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -2,7 +2,7 @@ @@ -169,5 +169,6 @@ JUCE_USE_WINDOWS_MEDIA_FORMAT="0"/> + diff -Nru iem-plugin-suite-1.11.0/DistanceCompensator/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/DistanceCompensator/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/DistanceCompensator/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DistanceCompensator/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -309,7 +309,7 @@ tempValues.clearQuick(); - const int selected = roundToInt(*inputChannelsSetting); + const int selected = roundToInt (inputChannelsSetting->load()); int nCh; if (selected > 0) nCh = selected; @@ -341,7 +341,7 @@ tempValues.clearQuick(); - const int selected = roundToInt(*inputChannelsSetting); + const int selected = roundToInt (inputChannelsSetting->load()); int nCh; if (selected > 0) nCh = selected; diff -Nru iem-plugin-suite-1.11.0/DistanceCompensator/Source/PluginProcessor.h iem-plugin-suite-1.11.1/DistanceCompensator/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/DistanceCompensator/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DistanceCompensator/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -109,18 +109,18 @@ Atomic updatingParameters = false; // list of used audio parameters - float *inputChannelsSetting; - float *speedOfSound; - float *distanceExponent; - float *gainNormalization; - float *referenceX; - float *referenceY; - float *referenceZ; - float *enableGains; - float *enableDelays; + std::atomic* inputChannelsSetting; + std::atomic* speedOfSound; + std::atomic* distanceExponent; + std::atomic* gainNormalization; + std::atomic* referenceX; + std::atomic* referenceY; + std::atomic* referenceZ; + std::atomic* enableGains; + std::atomic* enableDelays; - float *enableCompensation[64]; - float *distance[64]; + std::atomic* enableCompensation[64]; + std::atomic* distance[64]; // ===== last directory loaded from File lastDir; diff -Nru iem-plugin-suite-1.11.0/DualDelay/DualDelay.jucer iem-plugin-suite-1.11.1/DualDelay/DualDelay.jucer --- iem-plugin-suite-1.11.0/DualDelay/DualDelay.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DualDelay/DualDelay.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/DualDelay/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/DualDelay/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/DualDelay/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DualDelay/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -235,11 +235,11 @@ } // ========== OUTPUT - buffer.applyGain(Decibels::decibelsToGain(*dryGain,-59.91f)); //dry signal + buffer.applyGain (Decibels::decibelsToGain (dryGain->load(), -59.91f)); //dry signal for (int channel = 0; channel < nCh; ++channel) { - buffer.addFrom(channel, 0, delayOutLeft, channel, 0, spb, Decibels::decibelsToGain(*wetGainL,-59.91f)); //wet signal - buffer.addFrom(channel, 0, delayOutRight, channel, 0, spb, Decibels::decibelsToGain(*wetGainR,-59.91f)); //wet signal + buffer.addFrom (channel, 0, delayOutLeft, channel, 0, spb, Decibels::decibelsToGain (wetGainL->load(), -59.91f)); //wet signal + buffer.addFrom (channel, 0, delayOutRight, channel, 0, spb, Decibels::decibelsToGain (wetGainR->load(), -59.91f)); //wet signal } // ================ ADD INPUT AND FED BACK OUTPUT WITH PROCESSING =========== @@ -247,14 +247,14 @@ for (int channel = 0; channel < nCh; ++channel) // should be optimizable with SIMD { delayInLeft.copyFrom(channel, 0, AudioIN.getReadPointer(channel), spb); // input - delayInLeft.addFrom(channel, 0, delayOutLeft.getReadPointer(channel), spb, Decibels::decibelsToGain(*feedbackL,-59.91f) ); // feedback gain - delayInLeft.addFrom(channel, 0, delayOutRight.getReadPointer(channel), spb, Decibels::decibelsToGain(*xfeedbackR,-59.91f) ); // feedback bleed gain + delayInLeft.addFrom(channel, 0, delayOutLeft.getReadPointer(channel), spb, Decibels::decibelsToGain (feedbackL->load(), -59.91f) ); // feedback gain + delayInLeft.addFrom(channel, 0, delayOutRight.getReadPointer(channel), spb, Decibels::decibelsToGain (xfeedbackR->load(), -59.91f) ); // feedback bleed gain lowPassFiltersLeft[channel]->processSamples(delayInLeft.getWritePointer(channel), spb); //filter highPassFiltersLeft[channel]->processSamples(delayInLeft.getWritePointer(channel), spb); //filter delayInRight.copyFrom(channel, 0, AudioIN.getReadPointer(channel), spb); // input - delayInRight.addFrom(channel, 0, delayOutRight.getReadPointer(channel), spb, Decibels::decibelsToGain(*feedbackR,-59.91f) ); // feedback gain - delayInRight.addFrom(channel, 0, delayOutLeft.getReadPointer(channel), spb, Decibels::decibelsToGain(*xfeedbackL,-59.91f) ); // feedback bleed gain + delayInRight.addFrom(channel, 0, delayOutRight.getReadPointer(channel), spb, Decibels::decibelsToGain (feedbackR->load(), -59.91f) ); // feedback gain + delayInRight.addFrom(channel, 0, delayOutLeft.getReadPointer(channel), spb, Decibels::decibelsToGain (xfeedbackL->load(), -59.91f) ); // feedback bleed gain lowPassFiltersRight[channel]->processSamples(delayInRight.getWritePointer(channel), spb); //filter highPassFiltersRight[channel]->processSamples(delayInRight.getWritePointer(channel), spb); //filter } diff -Nru iem-plugin-suite-1.11.0/DualDelay/Source/PluginProcessor.h iem-plugin-suite-1.11.1/DualDelay/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/DualDelay/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/DualDelay/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -73,26 +73,26 @@ private: //============================================================================== // parameters - float* dryGain; - float* wetGainL; - float* wetGainR; - float* delayTimeL; - float* delayTimeR; - float* rotationL; - float* rotationR; - float* LPcutOffL; - float* LPcutOffR; - float* HPcutOffL; - float* HPcutOffR; - float* feedbackL; - float* feedbackR; - float* xfeedbackL; - float* xfeedbackR; - float* lfoRateL; - float* lfoRateR; - float* lfoDepthL; - float* lfoDepthR; - float* orderSetting; + std::atomic* dryGain; + std::atomic* wetGainL; + std::atomic* wetGainR; + std::atomic* delayTimeL; + std::atomic* delayTimeR; + std::atomic* rotationL; + std::atomic* rotationR; + std::atomic* LPcutOffL; + std::atomic* LPcutOffR; + std::atomic* HPcutOffL; + std::atomic* HPcutOffR; + std::atomic* feedbackL; + std::atomic* feedbackR; + std::atomic* xfeedbackL; + std::atomic* xfeedbackR; + std::atomic* lfoRateL; + std::atomic* lfoRateR; + std::atomic* lfoDepthL; + std::atomic* lfoDepthR; + std::atomic* orderSetting; float _delayL, _delayR; diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/createTDesignProjectedAndTriangulated.m iem-plugin-suite-1.11.1/EnergyVisualizer/createTDesignProjectedAndTriangulated.m --- iem-plugin-suite-1.11.0/EnergyVisualizer/createTDesignProjectedAndTriangulated.m 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/createTDesignProjectedAndTriangulated.m 2020-04-02 15:28:39.000000000 +0000 @@ -55,10 +55,16 @@ xre = rePro(:,1); yre = rePro(:,2); -scatter(xre, yre); + + + tri = delaunay(xre,yre) -triplot(tri,xre,yre); +triplot (tri, xre, yre, 'Color', [0.2 0.2 0.2]); + +scatter (xre, yre, 300, '.r'); +xlim ([-1 1]) + [x,y,z] = sph2cart(azi,ele,1); diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/EnergyVisualizerGrid.json iem-plugin-suite-1.11.1/EnergyVisualizer/EnergyVisualizerGrid.json --- iem-plugin-suite-1.11.0/EnergyVisualizer/EnergyVisualizerGrid.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/EnergyVisualizerGrid.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,10 @@ +{ + "Description" : "Cartesian and spherical coordinates of the EnergyVisualizer's 426-point grid.", + "x" : [-0.989428233027905, -0.94562237517123438, -0.97653817229723083, -0.9589215425049169, -0.98867544588247824, -0.95892154250491679, -0.97653817229723083, -0.94562237517123438, -0.8611291433269268, -0.90596313391326455, -0.87329387676999282, -0.91550845659717472, -0.853005976182839, -0.90991995150389882, -0.853005976182839, -0.91550845659717472, -0.87329387676999282, -0.90596313391326455, -0.8611291433269268, -0.79501230438537918, -0.83029661458928494, -0.74131433526537283, -0.7909995000356862, -0.69443022574358737, -0.77120003770640355, -0.69443022574358737, -0.7909995000356862, -0.74131433526537283, -0.830296614589285, -0.79501230438537918, -0.7084289337574271, -0.75639574473324822, -0.671693594139846, -0.69740562672519, -0.565796078717367, -0.61967008938249135, -0.49914036122026817, -0.58910886481124225, -0.49914036122026817, -0.61967008938249135, -0.565796078717367, -0.69740562672518946, -0.671693594139846, -0.75639574473324844, -0.7084289337574271, -0.63578880451330455, -0.6510652764094137, -0.50601581936609574, -0.52284594190360856, -0.36182364198623596, -0.41692267240601072, -0.2816752392322821, -0.37879446564668046, -0.2816752392322821, -0.41692267240601072, -0.36182364198623596, -0.52284594190360856, -0.50601581936609574, -0.65106527640941425, -0.63578880451330455, -0.59406355775518038, -0.51491783695621851, -0.50125373644613047, -0.31266629474366164, -0.32149019791965894, -0.14334621098231232, -0.19685353171630268, -0.055154542350804789, -0.15395974554799582, -0.055154542350804789, -0.19685353171630268, -0.14334621098231232, -0.32149019791965838, -0.31266629474366164, -0.50125373644613136, -0.51491783695621851, -0.59406355775518038, -0.51723990890365068, -0.35813645747788386, -0.32107853426731159, -0.10593532535962329, -0.10734775411014962, 0.076927088897341719, 0.027793804570801141, 0.16873206582647687, 0.073137517642518926, 0.16873206582647685, 0.027793804570801141, 0.076927088897341719, -0.10734775411014963, -0.10593532535962329, -0.32107853426731153, -0.35813645747788386, -0.51723990890365068, -0.41017625752326192, -0.39923569231691663, -0.17923749366896338, -0.1250308586682381, 0.1005719913636212, 0.1066234997577299, 0.28762707223681083, 0.24567150099224064, 0.37973464499968468, 0.29168467357555738, 0.37973464499968462, 0.24567150099224064, 0.28762707223681083, 0.10662349975773046, 0.1005719913636212, -0.12503085866823868, -0.17923749366896338, -0.39923569231691663, -0.41017625752326214, -0.32005431801006917, -0.25041665829459026, 0.0065619957937038181, 0.072363248743749289, 0.29426214880030638, 0.30870777333893895, 0.47881751974206366, 0.44686631023507467, 0.569051519498278, 0.49231419939479937, 0.569051519498278, 0.44686631023507467, 0.47881751974206366, 0.308707773338939, 0.29426214880030638, 0.072363248743748387, 0.0065619957937038181, -0.25041665829459026, -0.32005431801006951, -0.20070155681837162, -0.084187208008073583, 0.18303324579757904, 0.25703093956542011, 0.46390296134897951, 0.48861785714056805, 0.64207936349823835, 0.6229340635398003, 0.729336636819478, 0.66710369973691064, 0.729336636819478, 0.6229340635398003, 0.64207936349823835, 0.4886178571405681, 0.46390296134897951, 0.25703093956542, 0.18303324579757904, -0.084187208008073583, -0.20070155681837176, -0.060887670498268653, 0.081951095935592855, 0.33387283654542532, 0.41598002486746927, 0.5999757337779692, 0.63767020905662375, 0.77058414869815461, 0.76692942851300172, 0.854705726246426, 0.809575906731543, 0.854705726246426, 0.76692942851300172, 0.77058414869815461, 0.63767020905662386, 0.5999757337779692, 0.41598002486746904, 0.33387283654542532, 0.081951095935592855, -0.060887670498268105, 0.079279895879067155, 0.22628589161077531, 0.44421736619701735, 0.53802221305675013, 0.69500437457812791, 0.748941175708626, 0.85915506593126645, 0.87343064723672637, 0.940741243162931, 0.91469868000133425, 0.940741243162931, 0.87343064723672637, 0.85915506593126645, 0.748941175708626, 0.69500437457812791, 0.53802221305675, 0.44421736619701735, 0.22628589161077531, 0.079279895879067558, 0.17599693312597767, 0.32535083529900866, 0.50255352882351878, 0.61451170162552049, 0.74383409240983211, 0.81739717339059925, 0.90431409325138068, 0.93855901281978116, 0.98449608748550044, 0.97888500666190836, 0.98449608748550033, 0.93855901281978116, 0.90431409325138068, 0.81739717339059936, 0.74383409240983211, 0.61451170162552, 0.50255352882351878, 0.32535083529900866, 0.17599693312597864, -0.0013227466940842578, 0.17599693312597775, 0.35998833559701332, 0.50255352882351878, 0.63999152504706647, 0.74383409240983211, 0.83999250141852788, 0.90431409325138079, 0.95999289196795967, 0.98449608748550044, 0.9999930013218753, 0.98449608748550033, 0.95999289196795967, 0.90431409325138079, 0.839992501418528, 0.74383409240983211, 0.63999152504706647, 0.50255352882351878, 0.35998833559701332, 0.17599693312597875, -0.0013227466940842578, 0.079279895879067155, 0.32283468078535987, 0.44421736619701735, 0.61263607740967, 0.69500437457812791, 0.81572983410625177, 0.85915506593126645, 0.93697615394646783, 0.940741243162931, 0.977325906082831, 0.940741243162931, 0.93697615394646783, 0.85915506593126645, 0.81572983410625188, 0.69500437457812791, 0.61263607740966985, 0.44421736619701735, 0.32283468078535987, 0.079279895879067558, -0.060887670498268549, 0.22177449618114994, 0.33387283654542549, 0.53440518945971827, 0.59997573377796931, 0.74568024443584235, 0.770584148698155, 0.87032092156909413, 0.85470572624642627, 0.91163209053935768, 0.85470572624642627, 0.87032092156909413, 0.770584148698155, 0.74568024443584269, 0.59997573377796931, 0.534405189459718, 0.33387283654542549, 0.22177449618114994, -0.060887670498267994, -0.20070155681837162, 0.076253809019891552, 0.18303324579757904, 0.41087884302695143, 0.46390296134897951, 0.63296170396166584, 0.64207936349823835, 0.76240461660885883, 0.729336636819478, 0.80510505177902292, 0.729336636819478, 0.76240461660885883, 0.64207936349823835, 0.632961703961666, 0.46390296134897951, 0.41087884302695127, 0.18303324579757904, 0.076253809019891552, -0.20070155681837176, -0.32005431801006917, -0.090239646018537414, 0.0065619957937040679, 0.25080566036358554, 0.29426214880030654, 0.48267719196242531, 0.47881751974206388, 0.617161329277089, 0.56905151949827826, 0.661383414382382, 0.56905151949827826, 0.617161329277089, 0.47881751974206388, 0.48267719196242559, 0.29426214880030654, 0.25080566036358543, 0.0065619957937040679, -0.090239646018537414, -0.32005431801006951, -0.41017625752326192, -0.25612202158127184, -0.17923749366896338, 0.065451277050613585, 0.1005719913636212, 0.30181563122906424, 0.28762707223681083, 0.44006759814169177, 0.37973464499968468, 0.48555093042297365, 0.37973464499968462, 0.44006759814169177, 0.28762707223681083, 0.30181563122906468, 0.1005719913636212, 0.065451277050613266, -0.17923749366896338, -0.25612202158127184, -0.41017625752326214, -0.40404983400147271, -0.35813645747788364, -0.13214144559497293, -0.10593532535962294, 0.099120661508992708, 0.076927088897342122, 0.23812274204495956, 0.16873206582647707, 0.28413647946732529, 0.16873206582647707, 0.23812274204495956, 0.076927088897342122, 0.099120661508992722, -0.10593532535962294, -0.13214144559497348, -0.35813645747788364, -0.40404983400147271, -0.52074726026037255, -0.51491783695621851, -0.3278734151146776, -0.31266629474366164, -0.11506638250603425, -0.14334621098231232, 0.019823938272352508, -0.055154542350804789, 0.065114068574948947, -0.055154542350804789, 0.019823938272352508, -0.14334621098231232, -0.11506638250603426, -0.31266629474366164, -0.32787341511467749, -0.51491783695621851, -0.52074726026037255, -0.59593591488260522, -0.63578880451330455, -0.50721232435235164, -0.50601581936609552, -0.32898209341939294, -0.36182364198623596, -0.20486370948021143, -0.28167523923228188, -0.1620971677016565, -0.28167523923228188, -0.20486370948021143, -0.36182364198623596, -0.32898209341939244, -0.50601581936609552, -0.5072123243523522, -0.63578880451330455, -0.59593591488260522, -0.7084289337574271, -0.655675362281081, -0.671693594139846, -0.52962774272594793, -0.565796078717367, -0.42454182469795182, -0.49914036122026817, -0.38663296731700841, -0.49914036122026817, -0.42454182469795182, -0.565796078717367, -0.529627742725948, -0.671693594139846, -0.65567536228108148, -0.7084289337574271, -0.75916297247481712, -0.795012304385379, -0.70295993195600792, -0.74131433526537227, -0.62641780435651429, -0.694430225743587, -0.59618394073263437, -0.694430225743587, -0.62641780435651429, -0.74131433526537227, -0.70295993195600737, -0.795012304385379, -0.75916297247481723, -0.8611291433269268, -0.83407858641754351, -0.87329387676999282, -0.79634789437509146, -0.853005976182839, -0.77699557091707838, -0.853005976182839, -0.79634789437509146, -0.87329387676999282, -0.83407858641754329, -0.8611291433269268, -0.9074067231374644, -0.94562237517123426, -0.91888390180491852, -0.95892154250491679, -0.91386821334589863, -0.95892154250491668, -0.91888390180491852, -0.94562237517123426, -0.90740672313746429, -0.97732312869673676, -0.990157096001666, -0.97732312869673676], + "y" : [-0.14502334876590658, 0.10516091195246342, 0.070450506826574583, 0.26295030618542486, 0.15006952625061076, 0.26295030618542486, 0.070450506826574583, 0.10516091195246342, 0.048677437164362423, 0.10428127232973203, 0.36161643598064663, 0.33905045618789836, 0.50964430770037672, 0.41478389777707442, 0.50964430770037672, 0.33905045618789836, 0.36161643598064663, 0.10428127232973285, 0.048677437164362423, 0.2858146318456839, 0.34941469027490019, 0.577059356370298, 0.56779447376482761, 0.70987044190454907, 0.63659288547834225, 0.70987044190454907, 0.56779447376482761, 0.577059356370298, 0.34941469027490024, 0.2858146318456839, 0.02959574449826962, 0.18517965346228996, 0.48489941353137678, 0.55380829345905946, 0.74333215895898042, 0.74798298031953436, 0.85785248663564728, 0.80805367730170585, 0.85785248663564728, 0.74798298031953436, 0.74333215895898042, 0.55380829345906, 0.48489941353137678, 0.18517965346228929, 0.02959574449826962, 0.22388612418870393, 0.38089331196621884, 0.636833069318911, 0.70926816166, 0.85607398304439508, 0.874918731232357, 0.9511694876879262, 0.92548082248928631, 0.9511694876879262, 0.874918731232357, 0.85607398304439508, 0.70926816166, 0.636833069318911, 0.3808933119662179, 0.22388612418870393, 0.020796765907848576, 0.38235348708435191, 0.53310477466356254, 0.73613876542295353, 0.81128296954442525, 0.91396369817120859, 0.94701250681214821, 0.99002242207495472, 0.988077120851807, 0.99002242207495472, 0.94701250681214821, 0.91396369817120859, 0.81128296954442536, 0.73613876542295353, 0.53310477466356165, 0.38235348708435191, 0.020796765907848576, 0.18236614835183212, 0.49541118493620717, 0.63466959987904992, 0.7805343112851294, 0.858414290156182, 0.91817559351392286, 0.96515654838564335, 0.97670247984328662, 0.997321865554491, 0.97670247984328651, 0.96515654838564335, 0.91817559351392286, 0.85841429015618209, 0.7805343112851294, 0.63466959987904981, 0.49541118493620717, 0.18236614835183212, 0.047957087157740871, 0.30964372482880231, 0.55615151776505711, 0.68165661806374045, 0.77063640807825973, 0.85185005892223731, 0.87195695932850859, 0.9322552155911068, 0.91518381068672094, 0.956514532665929, 0.91518381068672083, 0.9322552155911068, 0.87195695932850859, 0.8518500589222372, 0.77063640807825973, 0.68165661806374023, 0.55615151776505711, 0.30964372482880231, 0.0479570871577409, 0.15383508547502925, 0.39250099379286774, 0.56080423024050707, 0.67334550750424416, 0.709709493779817, 0.79504144162431489, 0.78027801634293037, 0.85285306271472039, 0.81079681749980492, 0.87041756018261585, 0.81079681749980492, 0.85285306271472039, 0.78027801634293037, 0.79504144162431511, 0.709709493779817, 0.67334550750424427, 0.56080423024050707, 0.39250099379286774, 0.15383508547502941, 0.22419484725373706, 0.42213567136375907, 0.50944514822845888, 0.61225687199936851, 0.60340523972663873, 0.69337875107392843, 0.64952557585190318, 0.73282571473111024, 0.66995538943124355, 0.74496486749196822, 0.66995538943124355, 0.73282571473111024, 0.64952557585190318, 0.69337875107392855, 0.60340523972663873, 0.61225687199936829, 0.50944514822845888, 0.42213567136375907, 0.22419484725373723, 0.24529669659225309, 0.39257333922580839, 0.40673427430575182, 0.50411049022905641, 0.45945892861125803, 0.55388099505278954, 0.48722324403524375, 0.57911235069757172, 0.49992105081671656, 0.587015205288415, 0.49992105081671656, 0.57911235069757172, 0.48722324403524375, 0.55388099505278954, 0.45945892861125803, 0.50411049022905619, 0.40673427430575182, 0.39257333922580839, 0.24529669659225367, 0.19953620751483692, 0.30363073203448121, 0.26233626185686593, 0.3576211252604824, 0.28732444913433969, 0.384884848847874, 0.30176759898264788, 0.39947617244805805, 0.30859256342690228, 0.40413651753314334, 0.30859256342690228, 0.39947617244805805, 0.30176759898264788, 0.38488484884787383, 0.28732444913433969, 0.35762112526048229, 0.26233626185686593, 0.30363073203448121, 0.19953620751483792, 0.078969555154888751, 0.16472461001914751, 0.0906206615631628, 0.18406727126692463, 0.0977434319888648, 0.19572608851910697, 0.10217376149020091, 0.20228368607784558, 0.10431285226119984, 0.20441170155476796, 0.10431285226119982, 0.20228368607784558, 0.10217376149020091, 0.195726088519107, 0.0977434319888648, 0.18406727126692449, 0.0906206615631628, 0.16472461001914751, 0.078969555154889182, 3.4993390631858086E-6, -0.078969555154888516, -0.0030851294254100881, -0.090620661563162536, -0.0033878827477248348, -0.09774343198886451, -0.003588524489842624, -0.1021737614902006, -0.003703695159673284, -0.10431285226119952, -0.0037412975379981514, -0.1043128522611995, -0.003703695159673284, -0.1021737614902006, -0.0035885244898426231, -0.09774343198886451, -0.0033878827477248387, -0.090620661563162536, -0.0030851294254100881, -0.07896955515488896, 3.4993390631858086E-6, -0.19953620751483692, -0.17034073177417974, -0.26233626185686593, -0.190587307858797, -0.28732444913433969, -0.20271750480354181, -0.30176759898264788, -0.2095306044158747, -0.30859256342690228, -0.21174058019041458, -0.30859256342690228, -0.2095306044158747, -0.30176759898264788, -0.20271750480354184, -0.28732444913433969, -0.19058730785879693, -0.26233626185686593, -0.17034073177417974, -0.19953620751483792, -0.24529669659225312, -0.3077574770957261, -0.40673427430575165, -0.36339242067279393, -0.45945892861125787, -0.39132546687416669, -0.48722324403524336, -0.40624519132005521, -0.49992105081671634, -0.41100721587198485, -0.49992105081671634, -0.40624519132005521, -0.48722324403524336, -0.39132546687416664, -0.45945892861125787, -0.36339242067279381, -0.40673427430575165, -0.3077574770957261, -0.2452966965922537, -0.22419484725373706, -0.39467412372257271, -0.50944514822845888, -0.5086930550182831, -0.60340523972663873, -0.55942386269223454, -0.64952557585190318, -0.585096654221666, -0.66995538943124355, -0.593132241241274, -0.66995538943124355, -0.585096654221666, -0.64952557585190318, -0.55942386269223465, -0.60340523972663873, -0.508693055018283, -0.50944514822845888, -0.39467412372257271, -0.22419484725373723, -0.15383508547502925, -0.42207362946537791, -0.56080423024050707, -0.61529202483993461, -0.70970949377981685, -0.69770700437947086, -0.78027801634293026, -0.73773638757022364, -0.81079681749980481, -0.75004798458492128, -0.81079681749980481, -0.73773638757022364, -0.78027801634293026, -0.69770700437947075, -0.70970949377981685, -0.61529202483993439, -0.56080423024050707, -0.42207362946537791, -0.15383508547502941, -0.047957087157740871, -0.390411586864514, -0.55615151776505711, -0.67457557764084219, -0.77063640807825973, -0.7978798462300184, -0.87195695932850859, -0.85642672782577345, -0.91518381068672094, -0.87420838131728329, -0.91518381068672083, -0.85642672782577345, -0.87195695932850859, -0.79787984623001829, -0.77063640807825973, -0.67457557764084208, -0.55615151776505711, -0.390411586864514, -0.0479570871577409, -0.30580566222612315, -0.49541118493620728, -0.68093587052823434, -0.78053431128512951, -0.85297622318184441, -0.91817559351392286, -0.934262219847231, -0.97670247984328662, -0.95878384479293044, -0.97670247984328651, -0.934262219847231, -0.91817559351392286, -0.85297622318184452, -0.78053431128512951, -0.68093587052823423, -0.49541118493620728, -0.30580566222612315, -0.17712327984382462, -0.38235348708435191, -0.63196804045766808, -0.73613876542295353, -0.85766970271183318, -0.91396369817120859, -0.96540996954898972, -0.99002242207495472, -0.99787782722817164, -0.99002242207495472, -0.96540996954898972, -0.91396369817120859, -0.85766970271183329, -0.73613876542295353, -0.63196804045766786, -0.38235348708435191, -0.17712327984382462, -0.014528049607708819, -0.22388612418870393, -0.52850772453275841, -0.63683306931891137, -0.80858422686043452, -0.85607398304439508, -0.94537837819971893, -0.95116948768792631, -0.98677480116949734, -0.95116948768792631, -0.94537837819971893, -0.85607398304439508, -0.80858422686043485, -0.63683306931891137, -0.52850772453275763, -0.22388612418870393, -0.014528049607708819, -0.02959574449826962, -0.37460028005071766, -0.48489941353137678, -0.70461906881828829, -0.74333215895898042, -0.87132808607548462, -0.85785248663564728, -0.92223367352512409, -0.85785248663564728, -0.87132808607548462, -0.74333215895898042, -0.7046190688182884, -0.48489941353137678, -0.37460028005071677, -0.02959574449826962, -0.17750645812039359, -0.28581463184568423, -0.547314032585461, -0.57705935637029881, -0.74244667379906981, -0.7098704419045494, -0.80284787401630875, -0.7098704419045494, -0.74244667379906981, -0.57705935637029881, -0.54731403258546163, -0.28581463184568423, -0.17750645812039326, -0.048677437164362423, -0.34130015525555257, -0.36161643598064663, -0.56042238731049643, -0.50964430770037672, -0.62950606254049957, -0.50964430770037672, -0.56042238731049643, -0.36161643598064663, -0.34130015525555335, -0.048677437164362423, -0.094917443622638362, -0.10516091195246384, -0.33007793864252843, -0.26295030618542531, -0.406010946448461, -0.26295030618542531, -0.33007793864252843, -0.10516091195246384, -0.09491744362263875, -0.060277522057913181, -0.13996044168817004, -0.060277522057913181], + "z" : [0, -0.30779783328158683, -0.20349428526192753, -0.106426555882365, 0, 0.10642655588236512, 0.20349428526192753, 0.30779783328158683, -0.50605049710887806, -0.41031233984776588, -0.32648331967298327, -0.21653880497000325, -0.11244324890790776, 0, 0.11244324890790788, 0.21653880497000325, 0.32648331967298327, 0.41031233984776577, 0.50605049710887806, -0.53503778567383953, -0.43418533602790871, -0.34271789500339134, -0.22787985102991656, -0.11768864551837875, 0, 0.11768864551837889, 0.22787985102991656, 0.34271789500339134, 0.43418533602790854, 0.53503778567383953, -0.70516135580653327, -0.62735474278355541, -0.56008952351246721, -0.45488654179697308, -0.35683623521922797, -0.23776131198536549, -0.12226205860338232, 0, 0.12226205860338248, 0.23776131198536549, 0.35683623521922797, 0.45488654179697297, 0.56008952351246721, 0.62735474278355541, 0.70516135580653327, -0.73867963248711765, -0.65653201807173, -0.58171439072203968, -0.47283273563742667, -0.3690812751337042, -0.24635888247147314, -0.12623654500549572, 0, 0.12623654500549589, 0.24635888247147314, 0.3690812751337042, 0.4728327356374265, 0.58171439072203968, 0.65653201807173, 0.73867963248711765, -0.8041492298541556, -0.76724535325980669, -0.68157464076189433, -0.60028285513817525, -0.48832775465742045, -0.37963432698087546, -0.2538030712820265, -0.12966719032551594, 0, 0.12966719032551607, 0.2538030712820265, 0.37963432698087546, 0.48832775465742034, 0.60028285513817525, 0.68157464076189433, 0.76724535325980669, 0.8041492298541556, -0.83618506598280062, -0.79139499345478237, -0.70292465728705344, -0.61607133981999151, -0.50159880994990924, -0.388633249309855, -0.26019289293866438, -0.13259621348252737, 0, 0.13259621348252754, 0.26019289293866438, 0.388633249309855, 0.501598809949909, 0.61607133981999151, 0.70292465728705356, 0.79139499345478237, 0.83618506598280062, -0.91074450619015845, -0.86297834599390566, -0.81152289564182456, -0.72091021592885407, -0.62928912361282208, -0.51281859015990661, -0.39618395777096, -0.26560445516481557, -0.13505625510836489, 0, 0.13505625510836505, 0.26560445516481557, 0.39618395777096, 0.5128185901599065, 0.62928912361282208, 0.72091021592885418, 0.81152289564182456, 0.86297834599390566, 0.91074450619015834, -0.93482618705297293, -0.88500534863930713, -0.82792243329647475, -0.73577808322557559, -0.64009547898905073, -0.52211935108751273, -0.40236799077461427, -0.27009656457461895, -0.13707256796634723, 0, 0.1370725679663474, 0.27009656457461895, 0.40236799077461427, 0.52211935108751251, 0.64009547898905073, 0.73577808322557559, 0.82792243329647475, 0.88500534863930713, 0.93482618705297282, -0.95365379229338543, -0.90261508350463193, -0.84081179337547751, -0.74771426280074815, -0.64861094588519319, -0.529602206606542, -0.40724761175966478, -0.27371449415518639, -0.13866451011301845, 0, 0.13866451011301861, 0.27371449415518639, 0.40724761175966478, 0.52960220660654189, 0.64861094588519319, 0.74771426280074837, 0.84081179337547751, 0.90261508350463193, 0.95365379229338532, -0.9675340935709823, -0.91606232932265785, -0.8503506095264971, -0.7568574717556007, -0.65492489019503775, -0.53534339241370443, -0.41086929825300122, -0.27649256219698448, -0.1398465747591956, 0, 0.13984657475919574, 0.27649256219698448, 0.41086929825300122, 0.53534339241370421, 0.65492489019503775, 0.756857471755601, 0.8503506095264971, 0.91606232932265785, 0.96753409357098219, -0.976678043164686, -0.92552853755144771, -0.85665081409168742, -0.76330808264091066, -0.65910058431692631, -0.53939852470648308, -0.41326612356796072, -0.27845590694737032, -0.14062909801984982, 0, 0.14062909801985, 0.27845590694737032, 0.41326612356796072, 0.539398524706483, 0.65910058431692631, 0.76330808264091088, 0.85665081409168742, 0.92552853755144771, 0.97667804316468576, -0.9812180638822795, -0.93113513349259736, -0.8597836043824536, -0.76713402232833849, -0.661178542053415, -0.54180546251036388, -0.41445933842763955, -0.27962169050615027, -0.14101873130501197, 0, 0.14101873130501213, 0.27962169050615027, 0.41445933842763955, 0.54180546251036366, 0.661178542053415, 0.76713402232833872, 0.8597836043824536, 0.93113513349259736, 0.98121806388227928, -0.99999912516408629, -0.9812180638822795, -0.932951703042832, -0.8597836043824536, -0.76837449861276486, -0.661178542053415, -0.54258614067503619, -0.41445933842763955, -0.27999987502346763, -0.14101873130501197, 0, 0.14101873130501213, 0.27999987502346763, 0.41445933842763955, 0.54258614067503608, 0.661178542053415, 0.76837449861276486, 0.8597836043824536, 0.932951703042832, 0.98121806388227928, 0.99999912516408629, -0.976678043164686, -0.93100043178338632, -0.85665081409168742, -0.76704205539150783, -0.65910058431692631, -0.54174758974564252, -0.41326612356796072, -0.27959365648884665, -0.14062909801984982, 0, 0.14062909801985, 0.27959365648884665, 0.41326612356796072, 0.5417475897456423, 0.65910058431692631, 0.767042055391508, 0.85665081409168742, 0.93100043178338632, 0.97667804316468576, -0.9675340935709823, -0.9252574820747308, -0.8503506095264971, -0.76312321552688311, -0.65492489019503775, -0.5392822563684232, -0.41086929825300122, -0.27839960130800184, -0.1398465747591956, 0, 0.13984657475919574, 0.27839960130800184, 0.41086929825300122, 0.53928225636842309, 0.65492489019503775, 0.76312321552688334, 0.8503506095264971, 0.9252574820747308, 0.96753409357098219, -0.95365379229338543, -0.9156515126803304, -0.84081179337547751, -0.7565777898729249, -0.64861094588519319, -0.5351676589335761, -0.40724761175966478, -0.2764074995221929, -0.13866451011301845, 0, 0.13866451011301861, 0.2764074995221929, 0.40724761175966478, 0.53516765893357587, 0.64861094588519319, 0.75657778987292512, 0.84081179337547751, 0.9156515126803304, 0.95365379229338532, -0.93482618705297293, -0.9020591208986094, -0.82792243329647475, -0.74733676806240379, -0.64009547898905073, -0.52936534113888967, -0.40236799077461427, -0.27359991977296561, -0.13707256796634723, 0, 0.1370725679663474, 0.27359991977296561, 0.40236799077461427, 0.52936534113888956, 0.64009547898905073, 0.747336768062404, 0.82792243329647475, 0.9020591208986094, 0.93482618705297282, -0.91074450619015845, -0.88429650169106433, -0.81152289564182456, -0.73529852467074075, -0.62928912361282208, -0.52181900667354353, -0.39618395777096, -0.26995141957663576, -0.13505625510836489, 0, 0.13505625510836505, 0.26995141957663576, 0.39618395777096, 0.52181900667354331, 0.62928912361282208, 0.73529852467074086, 0.81152289564182456, 0.88429650169106433, 0.91074450619015834, -0.86210592655069052, -0.79139499345478237, -0.720322829420272, -0.61607133981999151, -0.51245161444614085, -0.388633249309855, -0.2654273239271232, -0.13259621348252737, 0, 0.13259621348252754, 0.2654273239271232, 0.388633249309855, 0.51245161444614062, 0.61607133981999151, 0.72032282942027215, 0.79139499345478237, 0.86210592655069052, -0.83513450094501673, -0.76724535325980669, -0.70222177373044592, -0.60028285513817525, -0.50116106060544119, -0.37963432698087546, -0.25998192661566422, -0.12966719032551594, 0, 0.12966719032551607, 0.25998192661566422, 0.37963432698087546, 0.501161060605441, 0.60028285513817525, 0.70222177373044614, 0.76724535325980669, 0.83513450094501673, -0.80290056739774962, -0.73867963248711765, -0.68074609299965194, -0.58171439072203968, -0.48781382748125035, -0.3690812751337042, -0.25355587662382567, -0.12623654500549572, 0, 0.12623654500549589, 0.25355587662382567, 0.3690812751337042, 0.48781382748125024, 0.58171439072203968, 0.680746092999652, 0.73867963248711765, 0.80290056739774962, -0.70516135580653327, -0.65556422224180078, -0.56008952351246721, -0.47223555773857756, -0.35683623521922797, -0.24607235825701007, -0.12226205860338232, 0, 0.12226205860338248, 0.24607235825701007, 0.35683623521922797, 0.47223555773857739, 0.56008952351246721, 0.65556422224180078, 0.70516135580653327, -0.62622922204952469, -0.53503778567383953, -0.45419674569446861, -0.34271789500339139, -0.23743140261949641, -0.11768864551837875, 0, 0.11768864551837889, 0.23743140261949641, 0.34271789500339139, 0.4541967456944685, 0.53503778567383953, 0.62622922204952469, -0.50605049710887806, -0.43339025796878267, -0.32648331967298327, -0.22750116247079261, -0.11244324890790776, 0, 0.11244324890790788, 0.22750116247079261, 0.32648331967298327, 0.43339025796878256, 0.50605049710887806, -0.40939433032355521, -0.30779783328158689, -0.21610397827265473, -0.10642655588236502, 0, 0.10642655588236513, 0.21610397827265473, 0.30779783328158689, 0.40939433032355516, -0.20299291231217795, 0, 0.20299291231217795], + "azimuthInRadians" : [-2.9960560828851843, 3.0308395810714948, 3.0695743073934971, 2.8739567509261343, 2.9909540585654026, 2.8739567509261343, 3.0695743073934971, 3.0308395810714948, 3.0851252938220028, 3.0269915782803181, 2.7490047378605453, 2.7869126959441584, 2.6030365373132187, 2.7138873593374244, 2.6030365373132187, 2.7869126959441584, 2.7490047378605453, 3.0269915782803172, 3.0851252938220028, 2.7964711918294651, 2.7432583405093767, 2.4801448762705265, 2.5190074640120468, 2.3451999828350369, 2.4515204264201591, 2.3451999828350369, 2.5190074640120468, 2.4801448762705265, 2.7432583405093767, 2.7964711918294651, 3.0998403430300123, 2.9014966330300704, 2.5163156835557889, 2.4704609725220426, 2.2214028286972898, 2.2626485513405772, 2.0977623599213335, 2.2007519068346362, 2.0977623599213335, 2.2626485513405772, 2.2214028286972898, 2.4704609725220417, 2.5163156835557889, 2.9014966330300713, 3.0998403430300123, 2.8030134122072292, 2.6122525542950452, 2.2422246038918221, 2.2060307293177468, 1.9706787580757059, 2.015490076012151, 1.858704129476882, 1.9592896721962199, 1.858704129476882, 2.015490076012151, 1.9706787580757059, 2.2060307293177468, 2.2422246038918221, 2.6122525542950465, 2.8030134122072292, 3.1065992995027938, 2.5028750584934358, 2.3254111820545118, 1.9724452530693912, 1.9480863544439282, 1.7263691101924183, 1.7757456330362789, 1.6264491959041667, 1.7253708866341413, 1.6264491959041667, 1.7757456330362789, 1.7263691101924183, 1.9480863544439277, 1.9724452530693912, 2.3254111820545136, 2.5028750584934358, 3.1065992995027938, 2.8026251976062495, 2.19673158077513, 2.0391517639208372, 1.7056936204631721, 1.6952040468673826, 1.4872089968745159, 1.5420070847784573, 1.3997279591673446, 1.49759344842734, 1.3997279591673446, 1.5420070847784573, 1.4872089968745159, 1.6952040468673826, 1.7056936204631721, 2.0391517639208372, 2.19673158077513, 2.8026251976062495, 3.025202836282205, 2.4819132802899988, 1.8825677157195131, 1.7522019378374203, 1.4410246365994521, 1.4462769240087188, 1.2521715583348578, 1.31313037171311, 1.1774882813093068, 1.2748086979434188, 1.1774882813093068, 1.31313037171311, 1.2521715583348578, 1.4462769240087181, 1.4410246365994521, 1.7522019378374212, 1.8825677157195131, 2.4819132802899988, 3.025202836282205, 2.6935420478681622, 2.1386912416994917, 1.559095815302485, 1.463738986795952, 1.1777474949569553, 1.200424120427467, 1.020400552110339, 1.0881599750163828, 0.9588349758639817, 1.0560498435832424, 0.9588349758639817, 1.0881599750163828, 1.020400552110339, 1.200424120427467, 1.1777474949569553, 1.4637389867959534, 1.559095815302485, 2.1386912416994917, 2.6935420478681622, 2.3009589247086728, 1.7676453241476662, 1.2258786461577957, 1.1733307138775428, 0.91536616723720476, 0.95692888534990694, 0.79116318460001567, 0.86627674919093134, 0.74298697344602893, 0.84048217531117209, 0.74298697344602893, 0.86627674919093134, 0.79116318460001567, 0.95692888534990694, 0.91536616723720476, 1.1733307138775428, 1.2258786461577957, 1.7676453241476662, 2.3009589247086728, 1.8140994734039368, 1.364998191348733, 0.8834632818421867, 0.88089139470572508, 0.65353404545960991, 0.71519428596976453, 0.5638156739496849, 0.64676039772080229, 0.52924576399881185, 0.62736702902110264, 0.52924576399881185, 0.64676039772080229, 0.5638156739496849, 0.71519428596976442, 0.65353404545960991, 0.88089139470572519, 0.8834632818421867, 1.364998191348733, 1.8140994734039342, 1.1926016920159646, 0.9303313809300503, 0.53344816283483387, 0.58663694166882574, 0.39201630982090152, 0.4747098754115936, 0.337776969505417, 0.4289613437272683, 0.31697114942808269, 0.41603462597346785, 0.31697114942808269, 0.4289613437272683, 0.337776969505417, 0.47470987541159343, 0.39201630982090152, 0.58663694166882574, 0.53344816283483387, 0.9303313809300503, 1.1926016920159646, 0.42177104823675521, 0.46867363076025265, 0.17840328156293922, 0.29102940075425, 0.13065629028655615, 0.23502525848550415, 0.11250769340328891, 0.21227867850416987, 0.10556172147276406, 0.20586268119898793, 0.10556172147276406, 0.21227867850416987, 0.11250769340328891, 0.23502525848550415, 0.13065629028655615, 0.29102940075425, 0.17840328156293922, 0.46867363076025265, 0.42177104823675515, 3.1389471501723683, -0.42177104823675388, -0.008569871835362796, -0.17840328156293872, -0.0052935874459529263, -0.13065629028655576, -0.00427206511119928, -0.11250769340328856, -0.0038580252155343457, -0.10556172147276374, -0.0037413062660683312, -0.10556172147276373, -0.0038580252155343457, -0.11250769340328856, -0.0042720651111992792, -0.13065629028655576, -0.0052935874459529323, -0.17840328156293872, -0.008569871835362796, -0.42177104823675382, 3.1389471501723683, -1.1926016920159646, -0.48551490962192473, -0.53344816283483387, -0.30160329627390486, -0.39201630982090152, -0.24357637779540167, -0.337776969505417, -0.22000461348781911, -0.31697114942808269, -0.21335557912607792, -0.31697114942808269, -0.22000461348781911, -0.337776969505417, -0.24357637779540167, -0.39201630982090152, -0.30160329627390481, -0.53344816283483387, -0.48551490962192473, -1.1926016920159646, -1.8140994734039364, -0.94636869860308848, -0.88346328184218637, -0.59717268098205967, -0.65353404545960969, -0.48328229002070888, -0.56381567394968435, -0.43671719447703827, -0.52924576399881162, -0.42355863645031849, -0.52924576399881162, -0.43671719447703827, -0.56381567394968435, -0.4832822900207086, -0.65353404545960969, -0.59717268098205967, -0.88346328184218637, -0.94636869860308848, -1.8140994734039337, -2.3009589247086728, -1.3799409346524056, -1.2258786461577957, -0.89136898808025589, -0.91536616723720476, -0.72380330621405209, -0.79116318460001567, -0.65456700056242578, -0.74298697344602893, -0.63494376627960114, -0.74298697344602893, -0.65456700056242578, -0.79116318460001567, -0.72380330621405209, -0.91536616723720476, -0.891368988080256, -1.2258786461577957, -1.3799409346524056, -2.3009589247086728, -2.6935420478681622, -1.7814259124474605, -1.5590958153024845, -1.1837378399749452, -1.1777474949569551, -0.96559156527650292, -1.0204005521103388, -0.87415634762160122, -0.95883497586398148, -0.84813462783898552, -0.95883497586398148, -0.87415634762160122, -1.0204005521103388, -0.96559156527650258, -1.1777474949569551, -1.1837378399749452, -1.5590958153024845, -1.7814259124474605, -2.6935420478681622, -3.025202836282205, -2.1513994420897609, -1.8825677157195131, -1.4740732240357877, -1.4410246365994521, -1.209160115595701, -1.2521715583348578, -1.0961369298253898, -1.1774882813093068, -1.0638030644097818, -1.1774882813093068, -1.0961369298253898, -1.2521715583348578, -1.2091601155957006, -1.4410246365994521, -1.4740732240357881, -1.8825677157195131, -2.1513994420897609, -3.025202836282205, -2.4937210817953379, -2.1967315807751295, -1.7624725066879161, -1.7056936204631716, -1.4551095441463151, -1.4872089968745155, -1.3212320451595403, -1.3997279591673444, -1.28269066048167, -1.3997279591673444, -1.3212320451595403, -1.4872089968745155, -1.4551095441463151, -1.7056936204631716, -1.7624725066879168, -2.1967315807751295, -2.4937210817953379, -2.8137350159535912, -2.5028750584934358, -2.0493810380811253, -1.9724452530693912, -1.7041616189019273, -1.7263691101924183, -1.5502649946969136, -1.6264491959041667, -1.5056361579833759, -1.6264491959041667, -1.5502649946969136, -1.7263691101924183, -1.7041616189019273, -1.9724452530693912, -2.0493810380811253, -2.5028750584934358, -2.8137350159535912, -3.1172189378942234, -2.8030134122072292, -2.3356364252353505, -2.2422246038918217, -1.9572040798035435, -1.9706787580757059, -1.7841970245562802, -1.8587041294768818, -1.7336118853734275, -1.8587041294768818, -1.7841970245562802, -1.9706787580757059, -1.9572040798035426, -2.2422246038918217, -2.3356364252353519, -2.8030134122072292, -3.1172189378942234, -3.0998403430300123, -2.6225285824137092, -2.5163156835557889, -2.21535334280785, -2.2214028286972898, -2.0241801502113406, -2.0977623599213335, -1.9677741590203226, -2.0977623599213335, -2.0241801502113406, -2.2214028286972898, -2.21535334280785, -2.5163156835557889, -2.6225285824137106, -3.0998403430300123, -2.9119005156409576, -2.7964711918294647, -2.4800467429804711, -2.4801448762705256, -2.2716337583714807, -2.3451999828350365, -2.2095358457714775, -2.3451999828350365, -2.2716337583714807, -2.4801448762705256, -2.4800467429804702, -2.7964711918294647, -2.9119005156409581, -3.0851252938220028, -2.7531854194857162, -2.7490047378605453, -2.5283605930939421, -2.6030365373132187, -2.46067530762723, -2.6030365373132187, -2.5283605930939421, -2.7490047378605453, -2.7531854194857153, -3.0851252938220028, -3.0373687067377162, -3.0308395810714943, -2.7967311633910943, -2.8739567509261339, -2.7235078666234807, -2.8739567509261339, -2.7967311633910943, -3.0308395810714943, -3.0373687067377158, -3.0799945357994409, -3.0011711905438685, -3.0799945357994409], + "elevationInRadians" : [0, -0.31287763002792568, -0.2049255673751002, -0.10662849558070053, 0, 0.10662849558070066, 0.2049255673751002, 0.31287763002792568, -0.53059949297468978, -0.42279653434545617, -0.33258061703040692, -0.21826775698568443, -0.11268155300132326, 0, 0.11268155300132339, 0.21826775698568443, 0.33258061703040692, 0.42279653434545605, 0.53059949297468978, -0.56455247237179085, -0.4491337248210614, -0.3498084826585407, -0.22989968703972624, -0.1179620296435841, 0, 0.11796202964358424, 0.22989968703972624, 0.3498084826585407, 0.44913372482106118, 0.56455247237179085, -0.782650687293933, -0.6781516738652289, -0.59449385984543013, -0.47224480750180292, -0.36487897038022915, -0.24006041768532532, -0.12256872168220534, 0, 0.12256872168220549, 0.24006041768532532, 0.36487897038022915, 0.47224480750180292, 0.59449385984543013, 0.6781516738652289, 0.782650687293933, -0.8311094125712839, -0.71621188084667864, -0.62083480859008233, -0.49250282393975331, -0.37802030942184123, -0.24892154018520668, -0.12657424957273644, 0, 0.12657424957273661, 0.24892154018520668, 0.37802030942184123, 0.49250282393975325, 0.62083480859008233, 0.71621188084667864, 0.8311094125712839, -0.93424283645665884, -0.87453499615365049, -0.74991237170989777, -0.64385472461492854, -0.51017246173866571, -0.38940100060253569, -0.25661005410898508, -0.1300333290115695, 0, 0.13003332901156964, 0.25661005410898508, 0.38940100060253569, 0.51017246173866559, 0.64385472461492854, 0.74991237170989777, 0.87453499615365049, 0.93424283645665884, -0.99029000452155314, -0.913087630548229, -0.77950110050556709, -0.66374534701411891, -0.52544590828877058, -0.39914777448623517, -0.26322197134947478, -0.13298786584424671, 0, 0.13298786584424688, 0.26322197134947478, 0.39914777448623517, 0.52544590828877036, 0.66374534701411891, 0.7795011005055672, 0.913087630548229, 0.99029000452155314, -1.1450833013705817, -1.041135226361777, -0.94675368531668225, -0.80511481227954984, -0.68063817525949422, -0.5384647513393318, -0.40735696681548333, -0.26883084301087451, -0.1354702375342979, 0, 0.1354702375342981, 0.26883084301087451, 0.40735696681548333, 0.53846475133933169, 0.68063817525949422, 0.80511481227955006, 0.94675368531668225, 1.041135226361777, 1.1450833013705815, -1.2077692804198195, -1.0865054990232932, -0.97539312482772156, -0.82681489758918858, -0.69462253299890608, -0.54933402270807985, -0.41410199705216322, -0.27349332216428363, -0.13750547851556788, 0, 0.13750547851556805, 0.27349332216428363, 0.41410199705216322, 0.54933402270807952, 0.69462253299890608, 0.82681489758918858, 0.97539312482772156, 1.0865054990232932, 1.207769280419819, -1.2651537435610658, -1.125806590647054, -0.99878111473971165, -0.84461310637786691, -0.70575800133629207, -0.55813153678445315, -0.41943841502733392, -0.2772529004485213, -0.13911276961064467, 0, 0.13911276961064484, 0.2772529004485213, 0.41943841502733392, 0.55813153678445282, 0.70575800133629207, 0.84461310637786713, 0.99878111473971165, 1.125806590647054, 1.2651537435610656, -1.3152846210077103, -1.1581489206383797, -1.0166512193089066, -0.85849145818471517, -0.714083224368267, -0.56491425218247249, -0.42340735511898231, -0.2801424646616188, -0.14030646512869493, 0, 0.14030646512869507, 0.2801424646616188, 0.42340735511898231, 0.56491425218247227, 0.714083224368267, 0.85849145818471562, 1.0166512193089066, 1.1581489206383797, 1.3152846210077098, -1.3544023474006803, -1.1824289663572651, -1.0287422814601745, -0.86841833626613085, -0.71962218883204865, -0.56972264757739677, -0.42603789668006053, -0.28218605535332159, -0.14109679860798402, 0, 0.14109679860798419, 0.28218605535332159, 0.42603789668006053, 0.56972264757739666, 0.71962218883204865, 0.86841833626613119, 1.0287422814601745, 1.1824289663572651, 1.3544023474006792, -1.3766776728925689, -1.1975133091521721, -1.0348457632448564, -0.87436142675666528, -0.72238858620947333, -0.572583697387741, -0.42734863323613886, -0.2834000594530045, -0.14149035380777275, 0, 0.14149035380777289, 0.2834000594530045, 0.42734863323613886, 0.57258369738774073, 0.72238858620947333, 0.87436142675666584, 1.0348457632448564, 1.1975133091521721, 1.3766776728925678, -1.5694735750863227, -1.3766776728925689, -1.2025267663273684, -1.0348457632448564, -0.87629742073237282, -0.72238858620947333, -0.57351279731004956, -0.42734863323613886, -0.28379397902444242, -0.14149035380777275, 0, 0.14149035380777292, 0.28379397902444242, 0.42734863323613886, 0.57351279731004945, 0.72238858620947333, 0.87629742073237282, 1.0348457632448564, 1.2025267663273684, 1.3766776728925678, 1.5694735750863227, -1.3544023474006803, -1.1971441078079408, -1.0287422814601745, -0.874218073773897, -0.71962218883204865, -0.57251484407361775, -0.42603789668006053, -0.28337086082937124, -0.14109679860798402, 0, 0.14109679860798419, 0.28337086082937124, 0.42603789668006053, 0.57251484407361752, 0.71962218883204865, 0.87421807377389726, 1.0287422814601745, 1.1971441078079408, 1.3544023474006792, -1.3152846210077103, -1.1817137969867002, -1.0166512193089066, -0.86813222796730893, -0.714083224368267, -0.56958457607025847, -0.42340735511898231, -0.28212743156371167, -0.14030646512869493, 0, 0.14030646512869507, 0.28212743156371167, 0.42340735511898231, 0.56958457607025825, 0.714083224368267, 0.86813222796730938, 1.0166512193089066, 1.1817137969867002, 1.3152846210077098, -1.2651537435610658, -1.1571257275276221, -0.99878111473971165, -0.85806364117011713, -0.70575800133629207, -0.56470620728947774, -0.41943841502733392, -0.2800539525174674, -0.13911276961064467, 0, 0.13911276961064484, 0.2800539525174674, 0.41943841502733392, 0.5647062072894774, 0.70575800133629207, 0.85806364117011746, 0.99878111473971165, 1.1571257275276221, 1.2651537435610656, -1.2077692804198195, -1.1245167458218877, -0.97539312482772156, -0.84404478967417607, -0.69462253299890608, -0.5578523196834938, -0.41410199705216322, -0.27713377887267904, -0.13750547851556788, 0, 0.13750547851556805, 0.27713377887267904, 0.41410199705216322, 0.55785231968349369, 0.69462253299890608, 0.8440447896741764, 0.97539312482772156, 1.1245167458218877, 1.207769280419819, -1.1450833013705817, -1.0849851949864247, -0.94675368531668225, -0.82610704440030291, -0.68063817525949422, -0.54898190433582039, -0.40735696681548333, -0.27334257754533026, -0.1354702375342979, 0, 0.1354702375342981, 0.27334257754533026, 0.40735696681548333, 0.54898190433582028, 0.68063817525949422, 0.82610704440030314, 0.94675368531668225, 1.0849851949864247, 1.1450833013705815, -1.0394110248943884, -0.913087630548229, -0.80426762072347169, -0.66374534701411891, -0.53803734287319671, -0.39914777448623517, -0.26864711720781576, -0.13298786584424671, 0, 0.13298786584424688, 0.26864711720781576, 0.39914777448623517, 0.53803734287319649, 0.66374534701411891, 0.80426762072347169, 0.913087630548229, 1.0394110248943884, -0.988377266699848, -0.87453499615365049, -0.7785133653389863, -0.64385472461492854, -0.52493997257803571, -0.38940100060253569, -0.26300348586463984, -0.1300333290115695, 0, 0.13003332901156964, 0.26300348586463984, 0.38940100060253569, 0.52493997257803549, 0.64385472461492854, 0.77851336533898674, 0.87453499615365049, 0.988377266699848, -0.93214519751506764, -0.8311094125712839, -0.74878068319038127, -0.62083480859008233, -0.509583638631291, -0.37802030942184123, -0.2563544998446835, -0.12657424957273644, 0, 0.12657424957273661, 0.2563544998446835, 0.37802030942184123, 0.50958363863129086, 0.62083480859008233, 0.74878068319038138, 0.8311094125712839, 0.93214519751506764, -0.782650687293933, -0.71492955462224683, -0.59449385984543013, -0.491825223187094, -0.36487897038022915, -0.24862591517680549, -0.12256872168220534, 0, 0.12256872168220549, 0.24862591517680549, 0.36487897038022915, 0.49182522318709382, 0.59449385984543013, 0.71492955462224683, 0.782650687293933, -0.6767071919239791, -0.56455247237179085, -0.47147038693914955, -0.34980848265854075, -0.23972078251623014, -0.1179620296435841, 0, 0.11796202964358424, 0.23972078251623014, 0.34980848265854075, 0.47147038693914944, 0.56455247237179085, 0.6767071919239791, -0.53059949297468978, -0.4482512999495652, -0.33258061703040692, -0.22951078336011502, -0.11268155300132326, 0, 0.11268155300132339, 0.22951078336011502, 0.33258061703040692, 0.44825129994956503, 0.53059949297468978, -0.42179011200224753, -0.31287763002792573, -0.21782238485594854, -0.10662849558070055, 0, 0.10662849558070067, 0.21782238485594854, 0.31287763002792573, 0.42179011200224753, -0.20441350679511722, 0, 0.20441350679511722], + "azimuthInDegrees" : [-171.66136873381865, 173.65431637659518, 175.87365271544019, 164.66559233119824, 171.369044273322, 164.66559233119824, 175.87365271544019, 173.65431637659518, 176.76465860505877, 173.43384205710618, 157.50636934087649, 159.67833534902633, 149.14300750639546, 155.49429176393829, 149.14300750639546, 159.67833534902633, 157.50636934087649, 173.43384205710612, 176.76465860505877, 160.22599682174757, 157.17712502524935, 142.10183399129693, 144.32849624984289, 134.37006113060073, 140.461773823987, 134.37006113060073, 144.32849624984289, 142.10183399129693, 157.17712502524935, 160.22599682174757, 177.60776882000505, 166.24351134404168, 144.17426859032349, 141.54698717729786, 127.2770066827773, 129.64021251320486, 120.19292964489595, 126.09379601699281, 120.19292964489595, 129.64021251320486, 127.2770066827773, 141.54698717729781, 144.17426859032349, 166.24351134404171, 177.60776882000505, 160.60083843803793, 149.67104638337503, 128.47000652339418, 126.39625026607382, 112.91157561382055, 115.47907500599773, 106.49590198256305, 112.25902906041395, 106.49590198256305, 115.47907500599773, 112.91157561382055, 126.39625026607382, 128.47000652339418, 149.67104638337509, 160.60083843803793, 177.99502849980806, 143.40417750023292, 133.23624636425143, 113.01278832148969, 111.61712623666365, 98.913663895780914, 101.74273026176542, 93.188674517755175, 98.856469898881116, 93.188674517755175, 101.74273026176542, 98.913663895780914, 111.61712623666362, 113.01278832148969, 133.23624636425154, 143.40417750023292, 177.99502849980806, 160.57859537985644, 125.86344830151663, 116.83478985932119, 97.729045594929033, 97.128037298998422, 85.2107987747946, 88.350497937077336, 80.198504526748863, 85.8057840213295, 80.198504526748863, 88.350497937077336, 85.2107987747946, 97.128037298998422, 97.729045594929033, 116.83478985932119, 125.86344830151663, 160.57859537985644, 173.33135468997651, 142.20315607808666, 107.86318475831227, 100.39377589272841, 82.5646298515218, 82.865563752862471, 71.74414551890672, 75.236828249606177, 67.4651089451363, 73.041158078725687, 67.4651089451363, 75.236828249606177, 71.74414551890672, 82.865563752862442, 82.5646298515218, 100.39377589272846, 107.86318475831227, 142.20315607808666, 173.33135468997651, 154.32859128387045, 122.53798183097433, 89.3296100733405, 83.866066252163378, 67.479960793138744, 68.779235726197939, 58.464645048741453, 62.346974003499838, 54.937197366534306, 60.507198992770533, 54.937197366534306, 62.346974003499838, 58.464645048741453, 68.779235726197939, 67.479960793138744, 83.866066252163463, 89.3296100733405, 122.53798183097433, 154.32859128387045, 131.83523521876711, 101.27861674969563, 70.237672620052919, 67.226897878255173, 52.446618091758126, 54.8279864247079, 45.330311383710544, 49.634001618953313, 42.570017811656022, 48.156081401304718, 42.570017811656022, 49.634001618953313, 45.330311383710544, 54.8279864247079, 52.446618091758126, 67.226897878255173, 70.237672620052919, 101.27861674969563, 131.83523521876711, 103.9402434429507, 78.208635407273164, 50.618717404334028, 50.4713591260308, 37.444742572946524, 40.977614117939979, 32.304258540641058, 37.056641145604523, 30.323548602308726, 35.945482968570616, 30.323548602308726, 37.056641145604523, 32.304258540641058, 40.977614117939972, 37.444742572946524, 50.471359126030805, 50.618717404334028, 78.208635407273164, 103.94024344295056, 68.331043592675613, 53.304061675869562, 30.564328319443476, 33.611820864085971, 22.460880053030539, 27.198872354265443, 19.353194769379506, 24.577674569833086, 18.161109089639695, 23.837028199583486, 18.161109089639695, 24.577674569833086, 19.353194769379506, 27.198872354265436, 22.460880053030539, 33.611820864085971, 30.564328319443476, 53.304061675869562, 68.331043592675613, 24.165700984774737, 26.853021011635196, 10.22175508484051, 16.674756377439984, 7.4860540002558, 13.465955390190626, 6.4462159947603084, 12.162672358903405, 6.0482411185248983, 11.795062791949171, 6.0482411185248983, 12.162672358903405, 6.4462159947603084, 13.465955390190626, 7.4860540002558, 16.674756377439984, 10.22175508484051, 26.853021011635196, 24.16570098477473, 179.84842381949412, -24.165700984774659, -0.49101748713432086, -10.221755084840481, -0.30330021913653943, -7.4860540002557787, -0.24477130067680547, -6.4462159947602879, -0.2210485621051678, -6.0482411185248788, -0.21436105891156443, -6.0482411185248788, -0.2210485621051678, -6.4462159947602879, -0.24477130067680541, -7.4860540002557787, -0.30330021913653982, -10.221755084840481, -0.49101748713432086, -24.165700984774656, 179.84842381949412, -68.331043592675613, -27.817955212011888, -30.564328319443476, -17.280595963728498, -22.460880053030539, -13.955898436760576, -19.353194769379506, -12.60533582625898, -18.161109089639695, -12.224374219493749, -18.161109089639695, -12.60533582625898, -19.353194769379506, -13.955898436760576, -22.460880053030539, -17.280595963728491, -30.564328319443476, -27.817955212011888, -68.331043592675613, -103.94024344295069, -54.222932293245222, -50.618717404334014, -34.21547426078434, -37.444742572946517, -27.690035531604043, -32.30425854064103, -25.02205208432828, -30.323548602308712, -24.26812224491924, -30.323548602308712, -25.02205208432828, -32.30425854064103, -27.690035531604025, -37.444742572946517, -34.21547426078434, -50.618717404334014, -54.222932293245222, -103.94024344295055, -131.83523521876711, -79.064791532920978, -70.237672620052919, -51.071681005845647, -52.446618091758126, -41.470874643680339, -45.330311383710544, -37.503926540764382, -42.570017811656022, -36.379598035962104, -42.570017811656022, -37.503926540764382, -45.330311383710544, -41.470874643680339, -52.446618091758126, -51.071681005845655, -70.237672620052919, -79.064791532920978, -131.83523521876711, -154.32859128387045, -102.06818629848119, -89.329610073340476, -67.8231822804968, -67.47996079313873, -55.324321423774542, -58.464645048741438, -50.085469353288609, -54.937197366534292, -48.594534634072645, -54.937197366534292, -50.085469353288609, -58.464645048741438, -55.324321423774528, -67.47996079313873, -67.8231822804968, -89.329610073340476, -102.06818629848119, -154.32859128387045, -173.33135468997651, -123.26610807854327, -107.86318475831227, -84.458174430492889, -82.5646298515218, -69.27977137918441, -71.74414551890672, -62.804019847422524, -67.4651089451363, -60.951425823764176, -67.4651089451363, -62.804019847422524, -71.74414551890672, -69.2797713791844, -82.5646298515218, -84.4581744304929, -107.86318475831227, -123.26610807854327, -173.33135468997651, -142.87969326967081, -125.86344830151661, -100.98223614106035, -97.729045594929, -83.371635608789, -85.210798774794583, -75.70101994507985, -80.198504526748863, -73.4927612664477, -80.198504526748863, -75.70101994507985, -85.210798774794583, -83.371635608789, -97.729045594929, -100.9822361410604, -125.86344830151661, -142.87969326967081, -161.21514108231614, -143.40417750023292, -117.42088409618792, -113.01278832148969, -97.641268371262242, -98.913663895780914, -88.8236413230041, -93.188674517755175, -86.2665973347399, -93.188674517755175, -88.8236413230041, -98.913663895780914, -97.641268371262242, -113.01278832148969, -117.42088409618792, -143.40417750023292, -161.21514108231614, -178.60348895959208, -160.60083843803793, -133.82210964300842, -128.47000652339418, -112.139533418529, -112.91157561382055, -102.22695932687417, -106.49590198256304, -99.328644345614848, -106.49590198256304, -102.22695932687417, -112.91157561382055, -112.13953341852894, -128.47000652339418, -133.8221096430085, -160.60083843803793, -178.60348895959208, -177.60776882000505, -150.25981942473223, -144.17426859032349, -126.93039667308845, -127.2770066827773, -115.97697958126683, -120.19292964489595, -112.7451543467694, -120.19292964489595, -115.97697958126683, -127.2770066827773, -126.93039667308845, -144.17426859032349, -150.25981942473231, -177.60776882000505, -166.83960990819503, -160.22599682174754, -142.09621136794703, -142.10183399129687, -130.1550269541269, -134.3700611306007, -126.59707864557444, -134.3700611306007, -130.1550269541269, -142.10183399129687, -142.09621136794698, -160.22599682174754, -166.83960990819509, -176.76465860505877, -157.74590475348666, -157.50636934087649, -144.86439107147658, -149.14300750639546, -140.98630987909578, -149.14300750639546, -144.86439107147658, -157.50636934087649, -157.7459047534866, -176.76465860505877, -174.02840772118017, -173.65431637659515, -160.24089209502236, -164.66559233119821, -156.04550622820418, -164.66559233119821, -160.24089209502236, -173.65431637659515, -174.02840772118017, -176.47068782466309, -171.95444281441627, -176.47068782466309], + "elevationInDegrees" : [0, -17.926567704655774, -11.741370124917038, -6.1093627726034905, 0, 6.1093627726034985, 11.741370124917038, 17.926567704655774, -30.401111559231097, -24.224457010752591, -19.055465703699067, -12.505821279066808, -6.4561774159555174, 0, 6.4561774159555245, 12.505821279066808, 19.055465703699067, 24.224457010752587, 30.401111559231097, -32.346473980579624, -25.733466869236924, -20.04254969420963, -13.172281778754783, -6.758726441374475, 0, 6.758726441374483, 13.172281778754783, 20.04254969420963, 25.73346686923691, 32.346473980579624, -44.842581214955516, -38.855228782209871, -34.061989115585028, -27.057634366821304, -20.906025035866104, -13.754448761516848, -7.02267045270399, 0, 7.0226704527039985, 13.754448761516848, 20.906025035866104, 27.057634366821304, 34.061989115585028, 38.855228782209871, 44.842581214955516, -47.619061653931652, -41.035918009641286, -35.571214307024022, -28.218333210022507, -21.65896830010097, -14.262153682508462, -7.2521702955533618, 0, 7.2521702955533707, 14.262153682508462, 21.65896830010097, 28.218333210022504, 35.571214307024022, 41.035918009641286, 47.619061653931652, -53.528171569297349, -50.107164316093858, -42.966813903622935, -36.890158339993285, -29.230728881425019, -22.31103387269652, -14.702673081068534, -7.450360948398977, 0, 7.450360948398985, 14.702673081068534, 22.31103387269652, 29.230728881425012, 36.890158339993285, 42.966813903622935, 50.107164316093858, 53.528171569297349, -56.73943775307621, -52.3160675560141, -44.662123184771993, -38.029807055355271, -30.105832907364672, -22.869482880100836, -15.08150803343838, -7.6196434393273318, 0, 7.6196434393273407, 15.08150803343838, 22.869482880100836, 30.105832907364665, 38.029807055355271, 44.662123184772, 52.3160675560141, 56.73943775307621, -65.608440359441246, -59.652654372927429, -54.244990407102755, -46.129680767085759, -38.997694817854665, -30.851757668305055, -23.339834953777927, -15.402872707467115, -7.7618728603500218, 0, 7.7618728603500333, 15.402872707467115, 23.339834953777927, 30.851757668305048, 38.997694817854665, 46.129680767085766, 54.244990407102755, 59.652654372927429, 65.608440359441232, -69.200082393608071, -62.252179511790082, -55.885909418705516, -47.37300407040189, -39.798939495524074, -31.474521044116702, -23.726296719027808, -15.670013085025184, -7.8784835788688552, 0, 7.878483578868865, 15.670013085025184, 23.726296719027808, 31.474521044116685, 39.798939495524074, 47.37300407040189, 55.885909418705516, 62.252179511790082, 69.200082393608042, -72.487969941225529, -64.503966192088541, -57.225942531957095, -48.392766316885805, -40.436954834157852, -31.978581470899826, -24.03205094672284, -15.885421053461039, -7.970574575065716, 0, 7.9705745750657258, 15.885421053461039, 24.03205094672284, 31.9785814708998, 40.436954834157852, 48.392766316885819, 57.225942531957095, 64.503966192088541, 72.4879699412255, -75.360257642205809, -66.357045200210891, -58.249824103229408, -49.187937302015975, -40.913954977395122, -32.367202436844728, -24.259454463114558, -16.050980887503567, -8.03896829027368, 0, 8.0389682902736865, 16.050980887503567, 24.259454463114558, 32.367202436844714, 40.913954977395122, 49.187937302016, 58.249824103229408, 66.357045200210891, 75.360257642205781, -77.60153826867051, -67.7481893462877, -58.942590934327434, -49.75670551982202, -41.231314264042751, -32.642703199204028, -24.410173392398097, -16.168070009190359, -8.0842510630448334, 0, 8.0842510630448423, 16.168070009190359, 24.410173392398097, 32.642703199204021, 41.231314264042751, 49.756705519822034, 58.942590934327434, 67.7481893462877, 77.601538268670438, -78.8778204066359, -68.612458525164442, -59.292294680924691, -50.097219522193974, -41.389817158225242, -32.806629278313459, -24.4852730651149, -16.237627320413768, -8.1068001149981548, 0, 8.1068001149981637, 16.237627320413768, 24.4852730651149, 32.806629278313444, 41.389817158225242, 50.09721952219401, 59.292294680924691, 68.612458525164442, 78.877820406635834, -89.924211909755, -78.8778204066359, -68.899708462072766, -59.292294680924691, -50.20814380616477, -41.389817158225242, -32.859862782607671, -24.4852730651149, -16.260197249324765, -8.1068001149981548, 0, 8.1068001149981654, 16.260197249324765, 24.4852730651149, 32.859862782607664, 41.389817158225242, 50.20814380616477, 59.292294680924691, 68.899708462072766, 78.877820406635834, 89.924211909755, -77.60153826867051, -68.591304846349431, -58.942590934327434, -50.089006001300739, -41.231314264042751, -32.802684274008705, -24.410173392398097, -16.23595436251199, -8.0842510630448334, 0, 8.0842510630448423, 16.23595436251199, 24.410173392398097, 32.802684274008691, 41.231314264042751, 50.089006001300753, 58.942590934327434, 68.591304846349431, 77.601538268670438, -75.360257642205809, -67.7072131597173, -58.249824103229408, -49.740312721815847, -40.913954977395122, -32.634792284574, -24.259454463114558, -16.164711113466645, -8.03896829027368, 0, 8.0389682902736865, 16.164711113466645, 24.259454463114558, 32.634792284573983, 40.913954977395122, 49.740312721815876, 58.249824103229408, 67.7072131597173, 75.360257642205781, -72.487969941225529, -66.2984205533376, -57.225942531957095, -49.163425192675625, -40.436954834157852, -32.355282342526877, -24.03205094672284, -16.045909515208038, -7.970574575065716, 0, 7.9705745750657258, 16.045909515208038, 24.03205094672284, 32.355282342526863, 40.436954834157852, 49.163425192675639, 57.225942531957095, 66.2984205533376, 72.4879699412255, -69.200082393608071, -64.430063527379716, -55.885909418705516, -48.360204168337532, -39.798939495524074, -31.962583509446976, -23.726296719027808, -15.87859588991633, -7.8784835788688552, 0, 7.878483578868865, 15.87859588991633, 23.726296719027808, 31.962583509446972, 39.798939495524074, 48.360204168337553, 55.885909418705516, 64.430063527379716, 69.200082393608042, -65.608440359441246, -62.16507250690082, -54.244990407102755, -47.332447070163866, -38.997694817854665, -31.454346147497215, -23.339834953777927, -15.661376054574848, -7.7618728603500218, 0, 7.7618728603500333, 15.661376054574848, 23.339834953777927, 31.454346147497212, 38.997694817854665, 47.332447070163873, 54.244990407102755, 62.16507250690082, 65.608440359441232, -59.5538649058158, -52.3160675560141, -46.081140266483352, -38.029807055355271, -30.827268967067354, -22.869482880100836, -15.392345994364195, -7.6196434393273318, 0, 7.6196434393273407, 15.392345994364195, 22.869482880100836, 30.82726896706734, 38.029807055355271, 46.081140266483352, 52.3160675560141, 59.5538649058158, -56.629845948577454, -50.107164316093858, -44.605530128450269, -36.890158339993285, -30.076844926434614, -22.31103387269652, -15.068989737272467, -7.450360948398977, 0, 7.450360948398985, 15.068989737272467, 22.31103387269652, 30.0768449264346, 36.890158339993285, 44.60553012845029, 50.107164316093858, 56.629845948577454, -53.407985711001892, -47.619061653931652, -42.901972927731229, -35.571214307024022, -29.196991802492668, -21.65896830010097, -14.688030900287483, -7.2521702955533618, 0, 7.2521702955533707, 14.688030900287483, 21.65896830010097, 29.196991802492661, 35.571214307024022, 42.901972927731236, 47.619061653931652, 53.407985711001892, -44.842581214955516, -40.962446129022396, -34.061989115585028, -28.179509546700242, -20.906025035866104, -14.245215617208554, -7.02267045270399, 0, 7.0226704527039985, 14.245215617208554, 20.906025035866104, 28.179509546700231, 34.061989115585028, 40.962446129022396, 44.842581214955516, -38.772466063393388, -32.346473980579624, -27.013263337013118, -20.042549694209633, -13.734989099753482, -6.758726441374475, 0, 6.758726441374483, 13.734989099753482, 20.042549694209633, 27.013263337013115, 32.346473980579624, 38.772466063393388, -30.401111559231097, -25.682907648362814, -19.055465703699067, -13.149999239275953, -6.4561774159555174, 0, 6.4561774159555245, 13.149999239275953, 19.055465703699067, 25.682907648362807, 30.401111559231097, -24.166793258079071, -17.926567704655778, -12.48030333572019, -6.1093627726034914, 0, 6.1093627726034985, 12.48030333572019, 17.926567704655778, 24.166793258079071, -11.712031214828992, 0, 11.712031214828992] +} diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/EnergyVisualizer.jucer iem-plugin-suite-1.11.1/EnergyVisualizer/EnergyVisualizer.jucer --- iem-plugin-suite-1.11.0/EnergyVisualizer/EnergyVisualizer.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/EnergyVisualizer.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/EVgrid.json iem-plugin-suite-1.11.1/EnergyVisualizer/EVgrid.json --- iem-plugin-suite-1.11.0/EnergyVisualizer/EVgrid.json 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/EVgrid.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -{ - "x" : [-0.989428233027905, -0.94562237517123438, -0.97653817229723083, -0.9589215425049169, -0.98867544588247824, -0.95892154250491679, -0.97653817229723083, -0.94562237517123438, -0.8611291433269268, -0.90596313391326455, -0.87329387676999282, -0.91550845659717472, -0.853005976182839, -0.90991995150389882, -0.853005976182839, -0.91550845659717472, -0.87329387676999282, -0.90596313391326455, -0.8611291433269268, -0.79501230438537918, -0.83029661458928494, -0.74131433526537283, -0.7909995000356862, -0.69443022574358737, -0.77120003770640355, -0.69443022574358737, -0.7909995000356862, -0.74131433526537283, -0.830296614589285, -0.79501230438537918, -0.7084289337574271, -0.75639574473324822, -0.671693594139846, -0.69740562672519, -0.565796078717367, -0.61967008938249135, -0.49914036122026817, -0.58910886481124225, -0.49914036122026817, -0.61967008938249135, -0.565796078717367, -0.69740562672518946, -0.671693594139846, -0.75639574473324844, -0.7084289337574271, -0.63578880451330455, -0.6510652764094137, -0.50601581936609574, -0.52284594190360856, -0.36182364198623596, -0.41692267240601072, -0.2816752392322821, -0.37879446564668046, -0.2816752392322821, -0.41692267240601072, -0.36182364198623596, -0.52284594190360856, -0.50601581936609574, -0.65106527640941425, -0.63578880451330455, -0.59406355775518038, -0.51491783695621851, -0.50125373644613047, -0.31266629474366164, -0.32149019791965894, -0.14334621098231232, -0.19685353171630268, -0.055154542350804789, -0.15395974554799582, -0.055154542350804789, -0.19685353171630268, -0.14334621098231232, -0.32149019791965838, -0.31266629474366164, -0.50125373644613136, -0.51491783695621851, -0.59406355775518038, -0.51723990890365068, -0.35813645747788386, -0.32107853426731159, -0.10593532535962329, -0.10734775411014962, 0.076927088897341719, 0.027793804570801141, 0.16873206582647687, 0.073137517642518926, 0.16873206582647685, 0.027793804570801141, 0.076927088897341719, -0.10734775411014963, -0.10593532535962329, -0.32107853426731153, -0.35813645747788386, -0.51723990890365068, -0.41017625752326192, -0.39923569231691663, -0.17923749366896338, -0.1250308586682381, 0.1005719913636212, 0.1066234997577299, 0.28762707223681083, 0.24567150099224064, 0.37973464499968468, 0.29168467357555738, 0.37973464499968462, 0.24567150099224064, 0.28762707223681083, 0.10662349975773046, 0.1005719913636212, -0.12503085866823868, -0.17923749366896338, -0.39923569231691663, -0.41017625752326214, -0.32005431801006917, -0.25041665829459026, 0.0065619957937038181, 0.072363248743749289, 0.29426214880030638, 0.30870777333893895, 0.47881751974206366, 0.44686631023507467, 0.569051519498278, 0.49231419939479937, 0.569051519498278, 0.44686631023507467, 0.47881751974206366, 0.308707773338939, 0.29426214880030638, 0.072363248743748387, 0.0065619957937038181, -0.25041665829459026, -0.32005431801006951, -0.20070155681837162, -0.084187208008073583, 0.18303324579757904, 0.25703093956542011, 0.46390296134897951, 0.48861785714056805, 0.64207936349823835, 0.6229340635398003, 0.729336636819478, 0.66710369973691064, 0.729336636819478, 0.6229340635398003, 0.64207936349823835, 0.4886178571405681, 0.46390296134897951, 0.25703093956542, 0.18303324579757904, -0.084187208008073583, -0.20070155681837176, -0.060887670498268653, 0.081951095935592855, 0.33387283654542532, 0.41598002486746927, 0.5999757337779692, 0.63767020905662375, 0.77058414869815461, 0.76692942851300172, 0.854705726246426, 0.809575906731543, 0.854705726246426, 0.76692942851300172, 0.77058414869815461, 0.63767020905662386, 0.5999757337779692, 0.41598002486746904, 0.33387283654542532, 0.081951095935592855, -0.060887670498268105, 0.079279895879067155, 0.22628589161077531, 0.44421736619701735, 0.53802221305675013, 0.69500437457812791, 0.748941175708626, 0.85915506593126645, 0.87343064723672637, 0.940741243162931, 0.91469868000133425, 0.940741243162931, 0.87343064723672637, 0.85915506593126645, 0.748941175708626, 0.69500437457812791, 0.53802221305675, 0.44421736619701735, 0.22628589161077531, 0.079279895879067558, 0.17599693312597767, 0.32535083529900866, 0.50255352882351878, 0.61451170162552049, 0.74383409240983211, 0.81739717339059925, 0.90431409325138068, 0.93855901281978116, 0.98449608748550044, 0.97888500666190836, 0.98449608748550033, 0.93855901281978116, 0.90431409325138068, 0.81739717339059936, 0.74383409240983211, 0.61451170162552, 0.50255352882351878, 0.32535083529900866, 0.17599693312597864, -0.0013227466940842578, 0.17599693312597775, 0.35998833559701332, 0.50255352882351878, 0.63999152504706647, 0.74383409240983211, 0.83999250141852788, 0.90431409325138079, 0.95999289196795967, 0.98449608748550044, 0.9999930013218753, 0.98449608748550033, 0.95999289196795967, 0.90431409325138079, 0.839992501418528, 0.74383409240983211, 0.63999152504706647, 0.50255352882351878, 0.35998833559701332, 0.17599693312597875, -0.0013227466940842578, 0.079279895879067155, 0.32283468078535987, 0.44421736619701735, 0.61263607740967, 0.69500437457812791, 0.81572983410625177, 0.85915506593126645, 0.93697615394646783, 0.940741243162931, 0.977325906082831, 0.940741243162931, 0.93697615394646783, 0.85915506593126645, 0.81572983410625188, 0.69500437457812791, 0.61263607740966985, 0.44421736619701735, 0.32283468078535987, 0.079279895879067558, -0.060887670498268549, 0.22177449618114994, 0.33387283654542549, 0.53440518945971827, 0.59997573377796931, 0.74568024443584235, 0.770584148698155, 0.87032092156909413, 0.85470572624642627, 0.91163209053935768, 0.85470572624642627, 0.87032092156909413, 0.770584148698155, 0.74568024443584269, 0.59997573377796931, 0.534405189459718, 0.33387283654542549, 0.22177449618114994, -0.060887670498267994, -0.20070155681837162, 0.076253809019891552, 0.18303324579757904, 0.41087884302695143, 0.46390296134897951, 0.63296170396166584, 0.64207936349823835, 0.76240461660885883, 0.729336636819478, 0.80510505177902292, 0.729336636819478, 0.76240461660885883, 0.64207936349823835, 0.632961703961666, 0.46390296134897951, 0.41087884302695127, 0.18303324579757904, 0.076253809019891552, -0.20070155681837176, -0.32005431801006917, -0.090239646018537414, 0.0065619957937040679, 0.25080566036358554, 0.29426214880030654, 0.48267719196242531, 0.47881751974206388, 0.617161329277089, 0.56905151949827826, 0.661383414382382, 0.56905151949827826, 0.617161329277089, 0.47881751974206388, 0.48267719196242559, 0.29426214880030654, 0.25080566036358543, 0.0065619957937040679, -0.090239646018537414, -0.32005431801006951, -0.41017625752326192, -0.25612202158127184, -0.17923749366896338, 0.065451277050613585, 0.1005719913636212, 0.30181563122906424, 0.28762707223681083, 0.44006759814169177, 0.37973464499968468, 0.48555093042297365, 0.37973464499968462, 0.44006759814169177, 0.28762707223681083, 0.30181563122906468, 0.1005719913636212, 0.065451277050613266, -0.17923749366896338, -0.25612202158127184, -0.41017625752326214, -0.40404983400147271, -0.35813645747788364, -0.13214144559497293, -0.10593532535962294, 0.099120661508992708, 0.076927088897342122, 0.23812274204495956, 0.16873206582647707, 0.28413647946732529, 0.16873206582647707, 0.23812274204495956, 0.076927088897342122, 0.099120661508992722, -0.10593532535962294, -0.13214144559497348, -0.35813645747788364, -0.40404983400147271, -0.52074726026037255, -0.51491783695621851, -0.3278734151146776, -0.31266629474366164, -0.11506638250603425, -0.14334621098231232, 0.019823938272352508, -0.055154542350804789, 0.065114068574948947, -0.055154542350804789, 0.019823938272352508, -0.14334621098231232, -0.11506638250603426, -0.31266629474366164, -0.32787341511467749, -0.51491783695621851, -0.52074726026037255, -0.59593591488260522, -0.63578880451330455, -0.50721232435235164, -0.50601581936609552, -0.32898209341939294, -0.36182364198623596, -0.20486370948021143, -0.28167523923228188, -0.1620971677016565, -0.28167523923228188, -0.20486370948021143, -0.36182364198623596, -0.32898209341939244, -0.50601581936609552, -0.5072123243523522, -0.63578880451330455, -0.59593591488260522, -0.7084289337574271, -0.655675362281081, -0.671693594139846, -0.52962774272594793, -0.565796078717367, -0.42454182469795182, -0.49914036122026817, -0.38663296731700841, -0.49914036122026817, -0.42454182469795182, -0.565796078717367, -0.529627742725948, -0.671693594139846, -0.65567536228108148, -0.7084289337574271, -0.75916297247481712, -0.795012304385379, -0.70295993195600792, -0.74131433526537227, -0.62641780435651429, -0.694430225743587, -0.59618394073263437, -0.694430225743587, -0.62641780435651429, -0.74131433526537227, -0.70295993195600737, -0.795012304385379, -0.75916297247481723, -0.8611291433269268, -0.83407858641754351, -0.87329387676999282, -0.79634789437509146, -0.853005976182839, -0.77699557091707838, -0.853005976182839, -0.79634789437509146, -0.87329387676999282, -0.83407858641754329, -0.8611291433269268, -0.9074067231374644, -0.94562237517123426, -0.91888390180491852, -0.95892154250491679, -0.91386821334589863, -0.95892154250491668, -0.91888390180491852, -0.94562237517123426, -0.90740672313746429, -0.97732312869673676, -0.990157096001666, -0.97732312869673676], - - "y" : [-0.14502334876590658, 0.10516091195246342, 0.070450506826574583, 0.26295030618542486, 0.15006952625061076, 0.26295030618542486, 0.070450506826574583, 0.10516091195246342, 0.048677437164362423, 0.10428127232973203, 0.36161643598064663, 0.33905045618789836, 0.50964430770037672, 0.41478389777707442, 0.50964430770037672, 0.33905045618789836, 0.36161643598064663, 0.10428127232973285, 0.048677437164362423, 0.2858146318456839, 0.34941469027490019, 0.577059356370298, 0.56779447376482761, 0.70987044190454907, 0.63659288547834225, 0.70987044190454907, 0.56779447376482761, 0.577059356370298, 0.34941469027490024, 0.2858146318456839, 0.02959574449826962, 0.18517965346228996, 0.48489941353137678, 0.55380829345905946, 0.74333215895898042, 0.74798298031953436, 0.85785248663564728, 0.80805367730170585, 0.85785248663564728, 0.74798298031953436, 0.74333215895898042, 0.55380829345906, 0.48489941353137678, 0.18517965346228929, 0.02959574449826962, 0.22388612418870393, 0.38089331196621884, 0.636833069318911, 0.70926816166, 0.85607398304439508, 0.874918731232357, 0.9511694876879262, 0.92548082248928631, 0.9511694876879262, 0.874918731232357, 0.85607398304439508, 0.70926816166, 0.636833069318911, 0.3808933119662179, 0.22388612418870393, 0.020796765907848576, 0.38235348708435191, 0.53310477466356254, 0.73613876542295353, 0.81128296954442525, 0.91396369817120859, 0.94701250681214821, 0.99002242207495472, 0.988077120851807, 0.99002242207495472, 0.94701250681214821, 0.91396369817120859, 0.81128296954442536, 0.73613876542295353, 0.53310477466356165, 0.38235348708435191, 0.020796765907848576, 0.18236614835183212, 0.49541118493620717, 0.63466959987904992, 0.7805343112851294, 0.858414290156182, 0.91817559351392286, 0.96515654838564335, 0.97670247984328662, 0.997321865554491, 0.97670247984328651, 0.96515654838564335, 0.91817559351392286, 0.85841429015618209, 0.7805343112851294, 0.63466959987904981, 0.49541118493620717, 0.18236614835183212, 0.047957087157740871, 0.30964372482880231, 0.55615151776505711, 0.68165661806374045, 0.77063640807825973, 0.85185005892223731, 0.87195695932850859, 0.9322552155911068, 0.91518381068672094, 0.956514532665929, 0.91518381068672083, 0.9322552155911068, 0.87195695932850859, 0.8518500589222372, 0.77063640807825973, 0.68165661806374023, 0.55615151776505711, 0.30964372482880231, 0.0479570871577409, 0.15383508547502925, 0.39250099379286774, 0.56080423024050707, 0.67334550750424416, 0.709709493779817, 0.79504144162431489, 0.78027801634293037, 0.85285306271472039, 0.81079681749980492, 0.87041756018261585, 0.81079681749980492, 0.85285306271472039, 0.78027801634293037, 0.79504144162431511, 0.709709493779817, 0.67334550750424427, 0.56080423024050707, 0.39250099379286774, 0.15383508547502941, 0.22419484725373706, 0.42213567136375907, 0.50944514822845888, 0.61225687199936851, 0.60340523972663873, 0.69337875107392843, 0.64952557585190318, 0.73282571473111024, 0.66995538943124355, 0.74496486749196822, 0.66995538943124355, 0.73282571473111024, 0.64952557585190318, 0.69337875107392855, 0.60340523972663873, 0.61225687199936829, 0.50944514822845888, 0.42213567136375907, 0.22419484725373723, 0.24529669659225309, 0.39257333922580839, 0.40673427430575182, 0.50411049022905641, 0.45945892861125803, 0.55388099505278954, 0.48722324403524375, 0.57911235069757172, 0.49992105081671656, 0.587015205288415, 0.49992105081671656, 0.57911235069757172, 0.48722324403524375, 0.55388099505278954, 0.45945892861125803, 0.50411049022905619, 0.40673427430575182, 0.39257333922580839, 0.24529669659225367, 0.19953620751483692, 0.30363073203448121, 0.26233626185686593, 0.3576211252604824, 0.28732444913433969, 0.384884848847874, 0.30176759898264788, 0.39947617244805805, 0.30859256342690228, 0.40413651753314334, 0.30859256342690228, 0.39947617244805805, 0.30176759898264788, 0.38488484884787383, 0.28732444913433969, 0.35762112526048229, 0.26233626185686593, 0.30363073203448121, 0.19953620751483792, 0.078969555154888751, 0.16472461001914751, 0.0906206615631628, 0.18406727126692463, 0.0977434319888648, 0.19572608851910697, 0.10217376149020091, 0.20228368607784558, 0.10431285226119984, 0.20441170155476796, 0.10431285226119982, 0.20228368607784558, 0.10217376149020091, 0.195726088519107, 0.0977434319888648, 0.18406727126692449, 0.0906206615631628, 0.16472461001914751, 0.078969555154889182, 3.4993390631858086E-6, -0.078969555154888516, -0.0030851294254100881, -0.090620661563162536, -0.0033878827477248348, -0.09774343198886451, -0.003588524489842624, -0.1021737614902006, -0.003703695159673284, -0.10431285226119952, -0.0037412975379981514, -0.1043128522611995, -0.003703695159673284, -0.1021737614902006, -0.0035885244898426231, -0.09774343198886451, -0.0033878827477248387, -0.090620661563162536, -0.0030851294254100881, -0.07896955515488896, 3.4993390631858086E-6, -0.19953620751483692, -0.17034073177417974, -0.26233626185686593, -0.190587307858797, -0.28732444913433969, -0.20271750480354181, -0.30176759898264788, -0.2095306044158747, -0.30859256342690228, -0.21174058019041458, -0.30859256342690228, -0.2095306044158747, -0.30176759898264788, -0.20271750480354184, -0.28732444913433969, -0.19058730785879693, -0.26233626185686593, -0.17034073177417974, -0.19953620751483792, -0.24529669659225312, -0.3077574770957261, -0.40673427430575165, -0.36339242067279393, -0.45945892861125787, -0.39132546687416669, -0.48722324403524336, -0.40624519132005521, -0.49992105081671634, -0.41100721587198485, -0.49992105081671634, -0.40624519132005521, -0.48722324403524336, -0.39132546687416664, -0.45945892861125787, -0.36339242067279381, -0.40673427430575165, -0.3077574770957261, -0.2452966965922537, -0.22419484725373706, -0.39467412372257271, -0.50944514822845888, -0.5086930550182831, -0.60340523972663873, -0.55942386269223454, -0.64952557585190318, -0.585096654221666, -0.66995538943124355, -0.593132241241274, -0.66995538943124355, -0.585096654221666, -0.64952557585190318, -0.55942386269223465, -0.60340523972663873, -0.508693055018283, -0.50944514822845888, -0.39467412372257271, -0.22419484725373723, -0.15383508547502925, -0.42207362946537791, -0.56080423024050707, -0.61529202483993461, -0.70970949377981685, -0.69770700437947086, -0.78027801634293026, -0.73773638757022364, -0.81079681749980481, -0.75004798458492128, -0.81079681749980481, -0.73773638757022364, -0.78027801634293026, -0.69770700437947075, -0.70970949377981685, -0.61529202483993439, -0.56080423024050707, -0.42207362946537791, -0.15383508547502941, -0.047957087157740871, -0.390411586864514, -0.55615151776505711, -0.67457557764084219, -0.77063640807825973, -0.7978798462300184, -0.87195695932850859, -0.85642672782577345, -0.91518381068672094, -0.87420838131728329, -0.91518381068672083, -0.85642672782577345, -0.87195695932850859, -0.79787984623001829, -0.77063640807825973, -0.67457557764084208, -0.55615151776505711, -0.390411586864514, -0.0479570871577409, -0.30580566222612315, -0.49541118493620728, -0.68093587052823434, -0.78053431128512951, -0.85297622318184441, -0.91817559351392286, -0.934262219847231, -0.97670247984328662, -0.95878384479293044, -0.97670247984328651, -0.934262219847231, -0.91817559351392286, -0.85297622318184452, -0.78053431128512951, -0.68093587052823423, -0.49541118493620728, -0.30580566222612315, -0.17712327984382462, -0.38235348708435191, -0.63196804045766808, -0.73613876542295353, -0.85766970271183318, -0.91396369817120859, -0.96540996954898972, -0.99002242207495472, -0.99787782722817164, -0.99002242207495472, -0.96540996954898972, -0.91396369817120859, -0.85766970271183329, -0.73613876542295353, -0.63196804045766786, -0.38235348708435191, -0.17712327984382462, -0.014528049607708819, -0.22388612418870393, -0.52850772453275841, -0.63683306931891137, -0.80858422686043452, -0.85607398304439508, -0.94537837819971893, -0.95116948768792631, -0.98677480116949734, -0.95116948768792631, -0.94537837819971893, -0.85607398304439508, -0.80858422686043485, -0.63683306931891137, -0.52850772453275763, -0.22388612418870393, -0.014528049607708819, -0.02959574449826962, -0.37460028005071766, -0.48489941353137678, -0.70461906881828829, -0.74333215895898042, -0.87132808607548462, -0.85785248663564728, -0.92223367352512409, -0.85785248663564728, -0.87132808607548462, -0.74333215895898042, -0.7046190688182884, -0.48489941353137678, -0.37460028005071677, -0.02959574449826962, -0.17750645812039359, -0.28581463184568423, -0.547314032585461, -0.57705935637029881, -0.74244667379906981, -0.7098704419045494, -0.80284787401630875, -0.7098704419045494, -0.74244667379906981, -0.57705935637029881, -0.54731403258546163, -0.28581463184568423, -0.17750645812039326, -0.048677437164362423, -0.34130015525555257, -0.36161643598064663, -0.56042238731049643, -0.50964430770037672, -0.62950606254049957, -0.50964430770037672, -0.56042238731049643, -0.36161643598064663, -0.34130015525555335, -0.048677437164362423, -0.094917443622638362, -0.10516091195246384, -0.33007793864252843, -0.26295030618542531, -0.406010946448461, -0.26295030618542531, -0.33007793864252843, -0.10516091195246384, -0.09491744362263875, -0.060277522057913181, -0.13996044168817004, -0.060277522057913181], - - "z" : [0, -0.30779783328158683, -0.20349428526192753, -0.106426555882365, 0, 0.10642655588236512, 0.20349428526192753, 0.30779783328158683, -0.50605049710887806, -0.41031233984776588, -0.32648331967298327, -0.21653880497000325, -0.11244324890790776, 0, 0.11244324890790788, 0.21653880497000325, 0.32648331967298327, 0.41031233984776577, 0.50605049710887806, -0.53503778567383953, -0.43418533602790871, -0.34271789500339134, -0.22787985102991656, -0.11768864551837875, 0, 0.11768864551837889, 0.22787985102991656, 0.34271789500339134, 0.43418533602790854, 0.53503778567383953, -0.70516135580653327, -0.62735474278355541, -0.56008952351246721, -0.45488654179697308, -0.35683623521922797, -0.23776131198536549, -0.12226205860338232, 0, 0.12226205860338248, 0.23776131198536549, 0.35683623521922797, 0.45488654179697297, 0.56008952351246721, 0.62735474278355541, 0.70516135580653327, -0.73867963248711765, -0.65653201807173, -0.58171439072203968, -0.47283273563742667, -0.3690812751337042, -0.24635888247147314, -0.12623654500549572, 0, 0.12623654500549589, 0.24635888247147314, 0.3690812751337042, 0.4728327356374265, 0.58171439072203968, 0.65653201807173, 0.73867963248711765, -0.8041492298541556, -0.76724535325980669, -0.68157464076189433, -0.60028285513817525, -0.48832775465742045, -0.37963432698087546, -0.2538030712820265, -0.12966719032551594, 0, 0.12966719032551607, 0.2538030712820265, 0.37963432698087546, 0.48832775465742034, 0.60028285513817525, 0.68157464076189433, 0.76724535325980669, 0.8041492298541556, -0.83618506598280062, -0.79139499345478237, -0.70292465728705344, -0.61607133981999151, -0.50159880994990924, -0.388633249309855, -0.26019289293866438, -0.13259621348252737, 0, 0.13259621348252754, 0.26019289293866438, 0.388633249309855, 0.501598809949909, 0.61607133981999151, 0.70292465728705356, 0.79139499345478237, 0.83618506598280062, -0.91074450619015845, -0.86297834599390566, -0.81152289564182456, -0.72091021592885407, -0.62928912361282208, -0.51281859015990661, -0.39618395777096, -0.26560445516481557, -0.13505625510836489, 0, 0.13505625510836505, 0.26560445516481557, 0.39618395777096, 0.5128185901599065, 0.62928912361282208, 0.72091021592885418, 0.81152289564182456, 0.86297834599390566, 0.91074450619015834, -0.93482618705297293, -0.88500534863930713, -0.82792243329647475, -0.73577808322557559, -0.64009547898905073, -0.52211935108751273, -0.40236799077461427, -0.27009656457461895, -0.13707256796634723, 0, 0.1370725679663474, 0.27009656457461895, 0.40236799077461427, 0.52211935108751251, 0.64009547898905073, 0.73577808322557559, 0.82792243329647475, 0.88500534863930713, 0.93482618705297282, -0.95365379229338543, -0.90261508350463193, -0.84081179337547751, -0.74771426280074815, -0.64861094588519319, -0.529602206606542, -0.40724761175966478, -0.27371449415518639, -0.13866451011301845, 0, 0.13866451011301861, 0.27371449415518639, 0.40724761175966478, 0.52960220660654189, 0.64861094588519319, 0.74771426280074837, 0.84081179337547751, 0.90261508350463193, 0.95365379229338532, -0.9675340935709823, -0.91606232932265785, -0.8503506095264971, -0.7568574717556007, -0.65492489019503775, -0.53534339241370443, -0.41086929825300122, -0.27649256219698448, -0.1398465747591956, 0, 0.13984657475919574, 0.27649256219698448, 0.41086929825300122, 0.53534339241370421, 0.65492489019503775, 0.756857471755601, 0.8503506095264971, 0.91606232932265785, 0.96753409357098219, -0.976678043164686, -0.92552853755144771, -0.85665081409168742, -0.76330808264091066, -0.65910058431692631, -0.53939852470648308, -0.41326612356796072, -0.27845590694737032, -0.14062909801984982, 0, 0.14062909801985, 0.27845590694737032, 0.41326612356796072, 0.539398524706483, 0.65910058431692631, 0.76330808264091088, 0.85665081409168742, 0.92552853755144771, 0.97667804316468576, -0.9812180638822795, -0.93113513349259736, -0.8597836043824536, -0.76713402232833849, -0.661178542053415, -0.54180546251036388, -0.41445933842763955, -0.27962169050615027, -0.14101873130501197, 0, 0.14101873130501213, 0.27962169050615027, 0.41445933842763955, 0.54180546251036366, 0.661178542053415, 0.76713402232833872, 0.8597836043824536, 0.93113513349259736, 0.98121806388227928, -0.99999912516408629, -0.9812180638822795, -0.932951703042832, -0.8597836043824536, -0.76837449861276486, -0.661178542053415, -0.54258614067503619, -0.41445933842763955, -0.27999987502346763, -0.14101873130501197, 0, 0.14101873130501213, 0.27999987502346763, 0.41445933842763955, 0.54258614067503608, 0.661178542053415, 0.76837449861276486, 0.8597836043824536, 0.932951703042832, 0.98121806388227928, 0.99999912516408629, -0.976678043164686, -0.93100043178338632, -0.85665081409168742, -0.76704205539150783, -0.65910058431692631, -0.54174758974564252, -0.41326612356796072, -0.27959365648884665, -0.14062909801984982, 0, 0.14062909801985, 0.27959365648884665, 0.41326612356796072, 0.5417475897456423, 0.65910058431692631, 0.767042055391508, 0.85665081409168742, 0.93100043178338632, 0.97667804316468576, -0.9675340935709823, -0.9252574820747308, -0.8503506095264971, -0.76312321552688311, -0.65492489019503775, -0.5392822563684232, -0.41086929825300122, -0.27839960130800184, -0.1398465747591956, 0, 0.13984657475919574, 0.27839960130800184, 0.41086929825300122, 0.53928225636842309, 0.65492489019503775, 0.76312321552688334, 0.8503506095264971, 0.9252574820747308, 0.96753409357098219, -0.95365379229338543, -0.9156515126803304, -0.84081179337547751, -0.7565777898729249, -0.64861094588519319, -0.5351676589335761, -0.40724761175966478, -0.2764074995221929, -0.13866451011301845, 0, 0.13866451011301861, 0.2764074995221929, 0.40724761175966478, 0.53516765893357587, 0.64861094588519319, 0.75657778987292512, 0.84081179337547751, 0.9156515126803304, 0.95365379229338532, -0.93482618705297293, -0.9020591208986094, -0.82792243329647475, -0.74733676806240379, -0.64009547898905073, -0.52936534113888967, -0.40236799077461427, -0.27359991977296561, -0.13707256796634723, 0, 0.1370725679663474, 0.27359991977296561, 0.40236799077461427, 0.52936534113888956, 0.64009547898905073, 0.747336768062404, 0.82792243329647475, 0.9020591208986094, 0.93482618705297282, -0.91074450619015845, -0.88429650169106433, -0.81152289564182456, -0.73529852467074075, -0.62928912361282208, -0.52181900667354353, -0.39618395777096, -0.26995141957663576, -0.13505625510836489, 0, 0.13505625510836505, 0.26995141957663576, 0.39618395777096, 0.52181900667354331, 0.62928912361282208, 0.73529852467074086, 0.81152289564182456, 0.88429650169106433, 0.91074450619015834, -0.86210592655069052, -0.79139499345478237, -0.720322829420272, -0.61607133981999151, -0.51245161444614085, -0.388633249309855, -0.2654273239271232, -0.13259621348252737, 0, 0.13259621348252754, 0.2654273239271232, 0.388633249309855, 0.51245161444614062, 0.61607133981999151, 0.72032282942027215, 0.79139499345478237, 0.86210592655069052, -0.83513450094501673, -0.76724535325980669, -0.70222177373044592, -0.60028285513817525, -0.50116106060544119, -0.37963432698087546, -0.25998192661566422, -0.12966719032551594, 0, 0.12966719032551607, 0.25998192661566422, 0.37963432698087546, 0.501161060605441, 0.60028285513817525, 0.70222177373044614, 0.76724535325980669, 0.83513450094501673, -0.80290056739774962, -0.73867963248711765, -0.68074609299965194, -0.58171439072203968, -0.48781382748125035, -0.3690812751337042, -0.25355587662382567, -0.12623654500549572, 0, 0.12623654500549589, 0.25355587662382567, 0.3690812751337042, 0.48781382748125024, 0.58171439072203968, 0.680746092999652, 0.73867963248711765, 0.80290056739774962, -0.70516135580653327, -0.65556422224180078, -0.56008952351246721, -0.47223555773857756, -0.35683623521922797, -0.24607235825701007, -0.12226205860338232, 0, 0.12226205860338248, 0.24607235825701007, 0.35683623521922797, 0.47223555773857739, 0.56008952351246721, 0.65556422224180078, 0.70516135580653327, -0.62622922204952469, -0.53503778567383953, -0.45419674569446861, -0.34271789500339139, -0.23743140261949641, -0.11768864551837875, 0, 0.11768864551837889, 0.23743140261949641, 0.34271789500339139, 0.4541967456944685, 0.53503778567383953, 0.62622922204952469, -0.50605049710887806, -0.43339025796878267, -0.32648331967298327, -0.22750116247079261, -0.11244324890790776, 0, 0.11244324890790788, 0.22750116247079261, 0.32648331967298327, 0.43339025796878256, 0.50605049710887806, -0.40939433032355521, -0.30779783328158689, -0.21610397827265473, -0.10642655588236502, 0, 0.10642655588236513, 0.21610397827265473, 0.30779783328158689, 0.40939433032355516, -0.20299291231217795, 0, 0.20299291231217795] -} diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/EnergyVisualizer/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/EnergyVisualizer/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -254,7 +254,7 @@ //============================================================================== void EnergyVisualizerAudioProcessor::sendAdditionalOSCMessages (OSCSender& oscSender, const OSCAddressPattern& address) { - OSCMessage message (address); + OSCMessage message (address.toString() + "/RMS"); for (int i = 0; i < nSamplePoints; ++i) message.addFloat32 (rms[i]); oscSender.send (message); diff -Nru iem-plugin-suite-1.11.0/EnergyVisualizer/Source/PluginProcessor.h iem-plugin-suite-1.11.1/EnergyVisualizer/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/EnergyVisualizer/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/EnergyVisualizer/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -82,7 +82,10 @@ private: //============================================================================== // parameters - float *orderSetting, *useSN3D, *peakLevel, *dynamicRange; + std::atomic* orderSetting; + std::atomic* useSN3D; + std::atomic* peakLevel; + std::atomic* dynamicRange; float timeConstant; diff -Nru iem-plugin-suite-1.11.0/FdnReverb/FdnReverb.jucer iem-plugin-suite-1.11.1/FdnReverb/FdnReverb.jucer --- iem-plugin-suite-1.11.0/FdnReverb/FdnReverb.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/FdnReverb/FdnReverb.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/FdnReverb/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/FdnReverb/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/FdnReverb/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/FdnReverb/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -142,11 +142,11 @@ lowShelf.frequency = *lowCutoff; lowShelf.q = *lowQ; - lowShelf.linearGain = Decibels::decibelsToGain(*lowGain); + lowShelf.linearGain = Decibels::decibelsToGain (lowGain->load()); highShelf.frequency = *highCutoff; highShelf.q = *highQ; - highShelf.linearGain = Decibels::decibelsToGain(*highGain); + highShelf.linearGain = Decibels::decibelsToGain (highGain->load()); fdn.setFilterParameter (lowShelf, highShelf); fdnFade.setFilterParameter(lowShelf, highShelf); diff -Nru iem-plugin-suite-1.11.0/FdnReverb/Source/PluginProcessor.h iem-plugin-suite-1.11.1/FdnReverb/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/FdnReverb/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/FdnReverb/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -81,17 +81,17 @@ AudioBuffer copyBuffer; // parameters (from GUI) - float *revTime; - float *fadeInTime; - float *delayLength; + std::atomic* revTime; + std::atomic* fadeInTime; + std::atomic* delayLength; - float *highCutoff; - float *highQ; - float *highGain; - float *lowCutoff; - float *lowQ; - float *lowGain; - float *wet; + std::atomic* highCutoff; + std::atomic* highQ; + std::atomic* highGain; + std::atomic* lowCutoff; + std::atomic* lowQ; + std::atomic* lowGain; + std::atomic* wet; FeedbackDelayNetwork fdn, fdnFade; diff -Nru iem-plugin-suite-1.11.0/macOS_buildAll.sh iem-plugin-suite-1.11.1/macOS_buildAll.sh --- iem-plugin-suite-1.11.0/macOS_buildAll.sh 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/macOS_buildAll.sh 2020-04-02 15:28:39.000000000 +0000 @@ -2,11 +2,13 @@ cd ${0%/*} rm -rf */Builds rm -rf */JuceLibraryCode +rm -Rf _compiledPlugins/macOS/IEM +rm -Rf _compiledPlugins/macOS/Standalone mkdir -p _compiledPlugins/macOS/IEM mkdir -p _compiledPlugins/macOS/Standalone for d in */*.jucer; do - open -W -n ${PWD}/${d} --args --resave ${PWD}/${d} - d=${d%/*} + open -W -n "${PWD}/${d}" --args --resave "${PWD}/${d}" + d="${d%/*}" echo "Compiling $d for macOS..." if [ -d "${d}/Builds/MacOSX" ]; then pushd "${d}/Builds/MacOSX" diff -Nru iem-plugin-suite-1.11.0/Makefile iem-plugin-suite-1.11.1/Makefile --- iem-plugin-suite-1.11.0/Makefile 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/Makefile 2020-04-02 15:28:39.000000000 +0000 @@ -99,8 +99,11 @@ showprojects: @echo $(PROJECTS) +.PHONY: $(ALL_PROJECTS) +$(ALL_PROJECTS): % : %-$(BUILDSYSTEM)-build + # generic rules -.PHONY: distclean clean all +.PHONY: distclean clean all resave noop= space=$(noop) $(noop) @@ -110,11 +113,12 @@ clean: $(PROJECTS:%=%-$(BUILDSYSTEM)-clean) distclean: rm -rf */Builds +resave: $(PROJECTS:%=%/Builds/LinuxMakefile/Makefile) # aliases -$(ALL_PROJECTS:%=%-build): - make $(@:%-build=%)-$(BUILDSYSTEM)-build -$(ALL_PROJECTS:%=%-clean): - make $(@:%-clean=%)-$(BUILDSYSTEM)-clean +.PHONY: $(ALL_PROJECTS:%=%-build) +.PHONY: $(ALL_PROJECTS:%=%-clean) +$(ALL_PROJECTS:%=%-build): %-build : %-$(BUILDSYSTEM)-build +$(ALL_PROJECTS:%=%-clean): %-clean : %-$(BUILDSYSTEM)-clean # LinuxMakefile based rules %-LinuxMakefile-build: %/Builds/LinuxMakefile/Makefile diff -Nru iem-plugin-suite-1.11.0/MatrixMultiplier/MatrixMultiplier.jucer iem-plugin-suite-1.11.1/MatrixMultiplier/MatrixMultiplier.jucer --- iem-plugin-suite-1.11.0/MatrixMultiplier/MatrixMultiplier.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MatrixMultiplier/MatrixMultiplier.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/MultiBandCompressor/MultiBandCompressor.jucer iem-plugin-suite-1.11.1/MultiBandCompressor/MultiBandCompressor.jucer --- iem-plugin-suite-1.11.0/MultiBandCompressor/MultiBandCompressor.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiBandCompressor/MultiBandCompressor.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -2,7 +2,7 @@ diff -Nru iem-plugin-suite-1.11.0/MultiBandCompressor/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/MultiBandCompressor/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/MultiBandCompressor/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiBandCompressor/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -265,7 +265,7 @@ { jassert (lastSampleRate > 0.0); - const float crossoverFrequency = jmin (static_cast (0.5 * lastSampleRate), *crossovers[i]); + const float crossoverFrequency = jmin (static_cast (0.5 * lastSampleRate), crossovers[i]->load()); double b0, b1, b2, a0, a1, a2; double K = std::tan (MathConstants::pi * (crossoverFrequency) / lastSampleRate); @@ -392,7 +392,7 @@ compressors[i].setKnee (*knee[i]); compressors[i].setAttackTime (*attack[i] * 0.001f); compressors[i].setReleaseTime (*release[i] * 0.001f); - compressors[i].setRatio (*ratio[i] > 15.9f ? INFINITY : *ratio[i]); + compressors[i].setRatio (*ratio[i] > 15.9f ? INFINITY : ratio[i]->load()); compressors[i].setMakeUpGain (*makeUpGain[i]); freqBands[i].clear(); @@ -437,6 +437,9 @@ } const int numChannels = jmin (buffer.getNumChannels(), input.getNumberOfChannels()); + if (numChannels == 0) + return; + ScopedNoDenormals noDenormals; for (int i = numChannels; i < getTotalNumOutputChannels(); ++i) @@ -513,20 +516,20 @@ // | ---> LP1 ---> | for (int i = 0; i < numSimdFilters; ++i) { - const SIMDRegister* chPtrInterleaved[1] = {interleaved[i]->getChannelPointer (0)}; - AudioBlock> abInterleaved (const_cast**> (chPtrInterleaved), 1, L); + const filterFloatType* chPtrInterleaved[1] = {interleaved[i]->getChannelPointer (0)}; + AudioBlock abInterleaved (const_cast (chPtrInterleaved), 1, L); - const SIMDRegister* chPtrLow[1] = {freqBands[FrequencyBands::Low][i]->getChannelPointer (0)}; - AudioBlock> abLow (const_cast**> (chPtrLow), 1, L); + const filterFloatType* chPtrLow[1] = {freqBands[FrequencyBands::Low][i]->getChannelPointer (0)}; + AudioBlock abLow (const_cast (chPtrLow), 1, L); - const SIMDRegister* chPtrMidLow[1] = {freqBands[FrequencyBands::MidLow][i]->getChannelPointer (0)}; - AudioBlock> abMidLow (const_cast**> (chPtrMidLow), 1, L); + const filterFloatType* chPtrMidLow[1] = {freqBands[FrequencyBands::MidLow][i]->getChannelPointer (0)}; + AudioBlock abMidLow (const_cast (chPtrMidLow), 1, L); - const SIMDRegister* chPtrMidHigh[1] = {freqBands[FrequencyBands::MidHigh][i]->getChannelPointer (0)}; - AudioBlock> abMidHigh (const_cast**> (chPtrMidHigh), 1, L); + const filterFloatType* chPtrMidHigh[1] = {freqBands[FrequencyBands::MidHigh][i]->getChannelPointer (0)}; + AudioBlock abMidHigh (const_cast (chPtrMidHigh), 1, L); - const SIMDRegister* chPtrHigh[1] = {freqBands[FrequencyBands::High][i]->getChannelPointer (0)}; - AudioBlock> abHigh (const_cast**> (chPtrHigh), 1, L); + const filterFloatType* chPtrHigh[1] = {freqBands[FrequencyBands::High][i]->getChannelPointer (0)}; + AudioBlock abHigh (const_cast (chPtrHigh), 1, L); iirLP[1][i]->process (ProcessContextNonReplacing (abInterleaved, abLow)); diff -Nru iem-plugin-suite-1.11.0/MultiBandCompressor/Source/PluginProcessor.h iem-plugin-suite-1.11.1/MultiBandCompressor/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/MultiBandCompressor/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiBandCompressor/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -118,12 +118,15 @@ // list of used audio parameters - float* orderSetting, - *crossovers[numFreqBands-1], - *threshold[numFreqBands], *knee[numFreqBands], - *makeUpGain[numFreqBands], *ratio[numFreqBands], - *attack[numFreqBands], *release[numFreqBands], - *bypass[numFreqBands]; + std::atomic* orderSetting; + std::atomic* crossovers[numFreqBands-1]; + std::atomic* threshold[numFreqBands]; + std::atomic* knee[numFreqBands]; + std::atomic* makeUpGain[numFreqBands]; + std::atomic* ratio[numFreqBands]; + std::atomic* attack[numFreqBands]; + std::atomic* release[numFreqBands]; + std::atomic* bypass[numFreqBands]; BigInteger soloArray; diff -Nru iem-plugin-suite-1.11.0/MultiEncoder/MultiEncoder.jucer iem-plugin-suite-1.11.1/MultiEncoder/MultiEncoder.jucer --- iem-plugin-suite-1.11.0/MultiEncoder/MultiEncoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiEncoder/MultiEncoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,6 +1,6 @@ -load()); } else { - if (!muteMask[i]) currGain = Decibels::decibelsToGain(*gain[i]); + if (! muteMask[i]) + currGain = Decibels::decibelsToGain (gain[i]->load()); } - const float azimuthInRad = degreesToRadians(*azimuth[i]); - const float elevationInRad = degreesToRadians(*elevation[i]); - Vector3D pos {Conversions::sphericalToCartesian(azimuthInRad, elevationInRad)}; + const float azimuthInRad = degreesToRadians (azimuth[i]->load()); + const float elevationInRad = degreesToRadians (elevation[i]->load()); + + const Vector3D pos {Conversions::sphericalToCartesian (azimuthInRad, elevationInRad)}; - SHEval(ambisonicOrder, pos.x, pos.y, pos.z, SH[i]); + SHEval (ambisonicOrder, pos.x, pos.y, pos.z, SH[i]); if (*useSN3D >= 0.5f) - { - FloatVectorOperations::multiply(SH[i], SH[i], n3d2sn3d, nChOut); - } + FloatVectorOperations::multiply (SH[i], SH[i], n3d2sn3d, nChOut); const float* inpReadPtr = bufferCopy.getReadPointer(i); - for (int ch = 0; ch < nChOut; ++ch) { - buffer.addFromWithRamp(ch, 0, inpReadPtr, buffer.getNumSamples(), _SH[i][ch]*_gain[i], SH[i][ch]*currGain); - } + for (int ch = 0; ch < nChOut; ++ch) + buffer.addFromWithRamp (ch, 0, inpReadPtr, buffer.getNumSamples(), _SH[i][ch] * _gain[i], SH[i][ch] * currGain); + _gain[i] = currGain; } - - } //============================================================================== @@ -233,14 +233,14 @@ { iem::Quaternion masterQuat; float masterypr[3]; - masterypr[0] = degreesToRadians(*masterAzimuth); - masterypr[1] = degreesToRadians(*masterElevation); - masterypr[2] = - degreesToRadians(*masterRoll); + masterypr[0] = degreesToRadians (masterAzimuth->load()); + masterypr[1] = degreesToRadians (masterElevation->load()); + masterypr[2] = - degreesToRadians (masterRoll->load()); masterQuat.fromYPR(masterypr); masterQuat.conjugate(); - ypr[0] = degreesToRadians(*azimuth[i]); - ypr[1] = degreesToRadians(*elevation[i]); + ypr[0] = degreesToRadians (azimuth[i]->load()); + ypr[1] = degreesToRadians (elevation[i]->load()); quats[i].fromYPR(ypr); quats[i] = masterQuat*quats[i]; } @@ -254,9 +254,9 @@ moving = true; iem::Quaternion masterQuat; float ypr[3]; - ypr[0] = degreesToRadians(*masterAzimuth); - ypr[1] = degreesToRadians(*masterElevation); - ypr[2] = - degreesToRadians(*masterRoll); + ypr[0] = degreesToRadians (masterAzimuth->load()); + ypr[1] = degreesToRadians (masterElevation->load()); + ypr[2] = - degreesToRadians (masterRoll->load()); masterQuat.fromYPR(ypr); const int nChIn = input.getSize(); @@ -279,14 +279,14 @@ { iem::Quaternion masterQuat; float masterypr[3]; - masterypr[0] = degreesToRadians(*masterAzimuth); - masterypr[1] = degreesToRadians(*masterElevation); - masterypr[2] = - degreesToRadians(*masterRoll); + masterypr[0] = degreesToRadians (masterAzimuth->load()); + masterypr[1] = degreesToRadians (masterElevation->load()); + masterypr[2] = - degreesToRadians (masterRoll->load()); masterQuat.fromYPR(masterypr); masterQuat.conjugate(); - ypr[0] = degreesToRadians(*azimuth[i]); - ypr[1] = degreesToRadians(*elevation[i]); + ypr[0] = degreesToRadians (azimuth[i]->load()); + ypr[1] = degreesToRadians (elevation[i]->load()); quats[i].fromYPR(ypr); quats[i] = masterQuat*quats[i]; } @@ -371,16 +371,16 @@ iem::Quaternion masterQuat; float masterypr[3]; - masterypr[0] = degreesToRadians(*masterAzimuth); - masterypr[1] = degreesToRadians(*masterElevation); - masterypr[2] = - degreesToRadians(*masterRoll); + masterypr[0] = degreesToRadians (masterAzimuth->load()); + masterypr[1] = degreesToRadians (masterElevation->load()); + masterypr[2] = - degreesToRadians (masterRoll->load()); masterQuat.fromYPR(masterypr); masterQuat.conjugate(); for (int i = 0; i < maxNumberOfInputs; ++i) { - ypr[0] = degreesToRadians(*azimuth[i]); - ypr[1] = degreesToRadians(*elevation[i]); + ypr[0] = degreesToRadians (azimuth[i]->load()); + ypr[1] = degreesToRadians (elevation[i]->load()); quats[i].fromYPR(ypr); quats[i] = masterQuat*quats[i]; } diff -Nru iem-plugin-suite-1.11.0/MultiEncoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/MultiEncoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/MultiEncoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiEncoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -84,23 +84,23 @@ float xyzGrab[3]; float xyz[maxNumberOfInputs][3]; - float *azimuth[maxNumberOfInputs]; - float *elevation[maxNumberOfInputs]; - float *gain[maxNumberOfInputs]; - float *mute[maxNumberOfInputs]; - float *solo[maxNumberOfInputs]; + std::atomic* azimuth[maxNumberOfInputs]; + std::atomic* elevation[maxNumberOfInputs]; + std::atomic* gain[maxNumberOfInputs]; + std::atomic* mute[maxNumberOfInputs]; + std::atomic* solo[maxNumberOfInputs]; BigInteger muteMask; BigInteger soloMask; - float *masterAzimuth; - float *masterElevation; - float *masterRoll; - float *lockedToMaster; - - float *inputSetting; - float *orderSetting; - float *useSN3D; + std::atomic* masterAzimuth; + std::atomic* masterElevation; + std::atomic* masterRoll; + std::atomic* lockedToMaster; + + std::atomic* inputSetting; + std::atomic* orderSetting; + std::atomic* useSN3D; bool yprInput; diff -Nru iem-plugin-suite-1.11.0/MultiEQ/MultiEQ.jucer iem-plugin-suite-1.11.1/MultiEQ/MultiEQ.jucer --- iem-plugin-suite-1.11.0/MultiEQ/MultiEQ.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiEQ/MultiEQ.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/MultiEQ/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/MultiEQ/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/MultiEQ/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiEQ/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -83,16 +83,16 @@ for (int i = 0; i < numFilterBands; ++i) { filterArrays[i].clear(); - for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) + for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) filterArrays[i].add (new IIR::Filter (processorCoefficients[i])); } additionalFilterArrays[0].clear(); - for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) + for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) additionalFilterArrays[0].add (new IIR::Filter (additionalProcessorCoefficients[0])); additionalFilterArrays[1].clear(); - for (int ch = 0; ch < ceil (64 / IIRfloat_elements()); ++ch) + for (int ch = 0; ch < ceil (64 / IIRfloat_elements); ++ch) additionalFilterArrays[1].add (new IIR::Filter (additionalProcessorCoefficients[1])); } @@ -107,7 +107,7 @@ const double sampleRate = getSampleRate() == 0 ? 48000.0 : getSampleRate(); // Low band - const auto lowBandFrequency = jmin (static_cast (0.5 * sampleRate), *filterFrequency[0]); + const auto lowBandFrequency = jmin (static_cast (0.5 * sampleRate), filterFrequency[0]->load()); const SpecialFilterType lowType = SpecialFilterType (static_cast (*filterType[0])); switch (lowType) @@ -127,7 +127,7 @@ guiCoefficients[0] = IIR::Coefficients::makeHighPass (sampleRate, lowBandFrequency, *filterQ[0]); break; case SpecialFilterType::LowShelf: - guiCoefficients[0] = IIR::Coefficients::makeLowShelf (sampleRate, lowBandFrequency, *filterQ[0], Decibels::decibelsToGain (*filterGain[0])); + guiCoefficients[0] = IIR::Coefficients::makeLowShelf (sampleRate, lowBandFrequency, *filterQ[0], Decibels::decibelsToGain (filterGain[0]->load())); break; default: break; @@ -135,7 +135,7 @@ // High band - const auto highBandFrequency = jmin (static_cast (0.5 * sampleRate), *filterFrequency[numFilterBands - 1]); + const auto highBandFrequency = jmin (static_cast (0.5 * sampleRate), filterFrequency[numFilterBands - 1]->load()); const SpecialFilterType highType = SpecialFilterType (4 + static_cast (*filterType[numFilterBands - 1])); switch (highType) @@ -155,7 +155,7 @@ guiCoefficients[numFilterBands - 1] = IIR::Coefficients::makeLowPass (sampleRate, highBandFrequency, *filterQ[numFilterBands - 1]); break; case SpecialFilterType::HighShelf: - guiCoefficients[numFilterBands - 1] = IIR::Coefficients::makeHighShelf (sampleRate, highBandFrequency, *filterQ[numFilterBands - 1], Decibels::decibelsToGain (*filterGain[numFilterBands - 1])); + guiCoefficients[numFilterBands - 1] = IIR::Coefficients::makeHighShelf (sampleRate, highBandFrequency, *filterQ[numFilterBands - 1], Decibels::decibelsToGain (filterGain[numFilterBands - 1]->load())); break; default: break; @@ -165,18 +165,18 @@ for (int f = 1; f < numFilterBands - 1; ++f) { - const auto frequency = jmin (static_cast (0.5 * sampleRate), *filterFrequency[f]); + const auto frequency = jmin (static_cast (0.5 * sampleRate), filterFrequency[f]->load()); const RegularFilterType type = RegularFilterType (2 + static_cast(*filterType[f])); switch (type) { case RegularFilterType::LowShelf: - guiCoefficients[f] = IIR::Coefficients::makeLowShelf (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (*filterGain[f])); + guiCoefficients[f] = IIR::Coefficients::makeLowShelf (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (filterGain[f]->load())); break; case RegularFilterType::PeakFilter: - guiCoefficients[f] = IIR::Coefficients::makePeakFilter (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (*filterGain[f])); + guiCoefficients[f] = IIR::Coefficients::makePeakFilter (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (filterGain[f]->load())); break; case RegularFilterType::HighShelf: - guiCoefficients[f] = IIR::Coefficients::makeHighShelf (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (*filterGain[f])); + guiCoefficients[f] = IIR::Coefficients::makeHighShelf (sampleRate, frequency, *filterQ[f], Decibels::decibelsToGain (filterGain[f]->load())); break; default: break; @@ -253,13 +253,13 @@ { if (isUpperBand) { - const auto frequency = jmin (static_cast (0.5 * getSampleRate()), *filterFrequency[numFilterBands - 1]); + const auto frequency = jmin (static_cast (0.5 * getSampleRate()), filterFrequency[numFilterBands - 1]->load()); tempCoefficients[numFilterBands - 1] = IIR::Coefficients::makeLowPass (getSampleRate(), frequency, *filterQ[numFilterBands - 1]); additionalTempCoefficients[1] = processorCoefficients[numFilterBands - 1]; } else { - const auto frequency = jmin (static_cast (0.5 * getSampleRate()), *filterFrequency[0]); + const auto frequency = jmin (static_cast (0.5 * getSampleRate()), filterFrequency[0]->load()); tempCoefficients[0] = IIR::Coefficients::makeHighPass (getSampleRate(), frequency, *filterQ[0]); additionalTempCoefficients[0] = processorCoefficients[0]; } @@ -267,7 +267,7 @@ void MultiEQAudioProcessor::createFilterCoefficients (const int filterIndex, const double sampleRate) { - const int type = roundToInt (*filterType[filterIndex]); + const int type = roundToInt (filterType[filterIndex]->load()); if (filterIndex == 0 && type == 2) { createLinkwitzRileyFilter (false); @@ -319,7 +319,7 @@ } break; } - tempCoefficients[filterIndex] = createFilterCoefficients (filterType, sampleRate, *filterFrequency[filterIndex], *filterQ[filterIndex], Decibels::decibelsToGain (*filterGain[filterIndex])); + tempCoefficients[filterIndex] = createFilterCoefficients (filterType, sampleRate, *filterFrequency[filterIndex], *filterQ[filterIndex], Decibels::decibelsToGain (filterGain[filterIndex]->load())); } } @@ -338,7 +338,7 @@ inline void MultiEQAudioProcessor::clear (AudioBlock& ab) { - const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements(); + const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements; const int nCh = static_cast (ab.getNumChannels()); for (int ch = 0; ch < nCh; ++ch) @@ -384,7 +384,7 @@ interleavedData.clear(); - for (int i = 0; i < ceil (64 / IIRfloat_elements()); ++i) + for (int i = 0; i < ceil (64 / IIRfloat_elements); ++i) { // reset filters for (int f = 0; f < numFilterBands; ++f) @@ -397,7 +397,7 @@ clear (*interleavedData.getLast()); } - zero = AudioBlock (zeroData, IIRfloat_elements(), samplesPerBlock); + zero = AudioBlock (zeroData, IIRfloat_elements, samplesPerBlock); zero.clear(); } @@ -416,8 +416,10 @@ const int L = buffer.getNumSamples(); const int maxNChIn = jmin (buffer.getNumChannels(), input.getSize()); - - const int nSIMDFilters = 1 + (maxNChIn - 1) / IIRfloat_elements(); + if (maxNChIn < 1) + return; + + const int nSIMDFilters = 1 + (maxNChIn - 1) / IIRfloat_elements; // update iir filter coefficients @@ -425,14 +427,14 @@ //interleave input data - int partial = maxNChIn % IIRfloat_elements(); + int partial = maxNChIn % IIRfloat_elements; if (partial == 0) { for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } } else @@ -440,24 +442,24 @@ int i; for (i = 0; i (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } - const float* addr[IIRfloat_elements()]; + const float* addr[IIRfloat_elements]; int ch; for (ch = 0; ch < partial; ++ch) { - addr[ch] = buffer.getReadPointer (i * IIRfloat_elements() + ch); + addr[ch] = buffer.getReadPointer (i * IIRfloat_elements + ch); } - for (; ch < IIRfloat_elements(); ++ch) + for (; ch < IIRfloat_elements; ++ch) { addr[ch] = zero.getChannelPointer(ch); } AudioDataConverters::interleaveSamples (addr, reinterpret_cast (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } @@ -469,9 +471,9 @@ { for (int i = 0; i < nSIMDFilters; ++i) { - const SIMDRegister* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; - AudioBlock> ab (const_cast**> (chPtr), 1, L); - ProcessContextReplacing> context (ab); + const IIRfloat* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; + AudioBlock ab (const_cast (chPtr), 1, L); + ProcessContextReplacing context (ab); filterArrays[f][i]->process (context); } } @@ -482,9 +484,9 @@ { for (int i = 0; i < nSIMDFilters; ++i) { - const SIMDRegister* chPtr[1] = {chPtr[0] = interleavedData[i]->getChannelPointer (0)}; - AudioBlock> ab (const_cast**> (chPtr), 1, L); - ProcessContextReplacing> context (ab); + const IIRfloat* chPtr[1] = {chPtr[0] = interleavedData[i]->getChannelPointer (0)}; + AudioBlock ab (const_cast (chPtr), 1, L); + ProcessContextReplacing context (ab); additionalFilterArrays[0][i]->process (context); } } @@ -492,9 +494,9 @@ { for (int i = 0; i < nSIMDFilters; ++i) { - const SIMDRegister* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; - AudioBlock> ab (const_cast**> (chPtr), 1, L); - ProcessContextReplacing> context (ab); + const IIRfloat* chPtr[1] = {interleavedData[i]->getChannelPointer (0)}; + AudioBlock ab (const_cast (chPtr), 1, L); + ProcessContextReplacing context (ab); additionalFilterArrays[1][i]->process (context); } } @@ -506,9 +508,9 @@ for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), - buffer.getArrayOfWritePointers() + i * IIRfloat_elements(), + buffer.getArrayOfWritePointers() + i * IIRfloat_elements, L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } } else @@ -517,25 +519,25 @@ for (i = 0; i (interleavedData[i]->getChannelPointer (0)), - buffer.getArrayOfWritePointers() + i * IIRfloat_elements(), + buffer.getArrayOfWritePointers() + i * IIRfloat_elements, L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } - float* addr[IIRfloat_elements()]; + float* addr[IIRfloat_elements]; int ch; for (ch = 0; ch < partial; ++ch) { - addr[ch] = buffer.getWritePointer (i * IIRfloat_elements() + ch); + addr[ch] = buffer.getWritePointer (i * IIRfloat_elements + ch); } - for (; ch < IIRfloat_elements(); ++ch) + for (; ch < IIRfloat_elements; ++ch) { addr[ch] = zero.getChannelPointer (ch); } AudioDataConverters::deinterleaveSamples (reinterpret_cast (interleavedData[i]->getChannelPointer (0)), addr, L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); zero.clear(); } diff -Nru iem-plugin-suite-1.11.0/MultiEQ/Source/PluginProcessor.h iem-plugin-suite-1.11.1/MultiEQ/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/MultiEQ/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/MultiEQ/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -31,11 +31,11 @@ using namespace juce::dsp; #if JUCE_USE_SIMD -# define IIRfloat juce::dsp::SIMDRegister -# define IIRfloat_elements() IIRfloat::SIMDNumElements + using IIRfloat = juce::dsp::SIMDRegister; + static constexpr int IIRfloat_elements = juce::dsp::SIMDRegister::size(); #else /* !JUCE_USE_SIMD */ -# define IIRfloat float -# define IIRfloat_elements() 1 + using IIRfloat = float; + static constexpr int IIRfloat_elements = 1; #endif /* JUCE_USE_SIMD */ #define ProcessorClass MultiEQAudioProcessor @@ -127,12 +127,12 @@ // list of used audio parameters - float *inputChannelsSetting; - float* filterEnabled[numFilterBands]; - float* filterType[numFilterBands]; - float* filterFrequency[numFilterBands]; - float* filterQ[numFilterBands]; - float* filterGain[numFilterBands]; + std::atomic* inputChannelsSetting; + std::atomic* filterEnabled[numFilterBands]; + std::atomic* filterType[numFilterBands]; + std::atomic* filterFrequency[numFilterBands]; + std::atomic* filterQ[numFilterBands]; + std::atomic* filterGain[numFilterBands]; // filters for processing OwnedArray> filterArrays[numFilterBands]; diff -Nru iem-plugin-suite-1.11.0/OmniCompressor/OmniCompressor.jucer iem-plugin-suite-1.11.1/OmniCompressor/OmniCompressor.jucer --- iem-plugin-suite-1.11.0/OmniCompressor/OmniCompressor.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/OmniCompressor/OmniCompressor.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/OmniCompressor/Source/PluginProcessor.h iem-plugin-suite-1.11.1/OmniCompressor/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/OmniCompressor/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/OmniCompressor/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -84,15 +84,15 @@ AudioBuffer gains; float GR; - float *orderSetting; - float *threshold; - float *outGain; - float *ratio; - float *attack; - float *release; - float *knee; - float *lookAhead; - float *reportLatency; + std::atomic* orderSetting; + std::atomic* threshold; + std::atomic* outGain; + std::atomic* ratio; + std::atomic* attack; + std::atomic* release; + std::atomic* knee; + std::atomic* lookAhead; + std::atomic* reportLatency; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OmniCompressorAudioProcessor) }; diff -Nru iem-plugin-suite-1.11.0/_PluginTemplate/PluginTemplate.jucer iem-plugin-suite-1.11.1/_PluginTemplate/PluginTemplate.jucer --- iem-plugin-suite-1.11.0/_PluginTemplate/PluginTemplate.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/_PluginTemplate/PluginTemplate.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -10,7 +10,7 @@ pluginChannelConfigs="" pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="PluginTemplateAU" aaxIdentifier="at.iem.PluginTemplate" - pluginAAXCategory="2" jucerVersion="5.4.5" companyCopyright="IEM - FirstName FamilyName" + pluginAAXCategory="2" jucerVersion="5.4.7" companyCopyright="IEM - FirstName FamilyName" companyName="IEM" companyWebsite="iem.at" headerPath="../../../resources/" pluginFormats="buildStandalone,buildVST" defines="JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1"> diff -Nru iem-plugin-suite-1.11.0/_PluginTemplate/Source/PluginProcessor.h iem-plugin-suite-1.11.1/_PluginTemplate/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/_PluginTemplate/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/_PluginTemplate/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -72,7 +72,11 @@ private: //============================================================================== // list of used audio parameters - float *inputChannelsSetting, *outputOrderSetting, *useSN3D, *param1, *param2; + std::atomic* inputChannelsSetting; + std::atomic* outputOrderSetting; + std::atomic* useSN3D; + std::atomic* param1; + std::atomic* param2; //============================================================================== diff -Nru iem-plugin-suite-1.11.0/ProbeDecoder/ProbeDecoder.jucer iem-plugin-suite-1.11.1/ProbeDecoder/ProbeDecoder.jucer --- iem-plugin-suite-1.11.0/ProbeDecoder/ProbeDecoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/ProbeDecoder/ProbeDecoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,6 +1,6 @@ - xyz = Conversions::sphericalToCartesian(degreesToRadians(*azimuth), degreesToRadians(*elevation)); + Vector3D xyz = Conversions::sphericalToCartesian (degreesToRadians (azimuth->load()), degreesToRadians (elevation->load())); float sh[64]; diff -Nru iem-plugin-suite-1.11.0/ProbeDecoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/ProbeDecoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/ProbeDecoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/ProbeDecoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -69,16 +69,16 @@ std::vector> createParameterLayout(); //============================================================================== - float *orderSetting; - float *useSN3D; + std::atomic* orderSetting; + std::atomic* useSN3D; Atomic updatedPositionData {true}; private: //============================================================================== - float *azimuth; - float *elevation; + std::atomic* azimuth; + std::atomic* elevation; float previousSH[64]; diff -Nru iem-plugin-suite-1.11.0/resources/ConfigurationHelper.h iem-plugin-suite-1.11.1/resources/ConfigurationHelper.h --- iem-plugin-suite-1.11.0/resources/ConfigurationHelper.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/ConfigurationHelper.h 2020-04-02 15:28:39.000000000 +0000 @@ -334,13 +334,26 @@ if (! result.wasOk()) return Result::fail (result.getErrorMessage()); + result = parseVarForDecoder (parsedJson, decoder); + if (! result.wasOk()) + return Result::fail (result.getErrorMessage()); + + return Result::ok(); + } + + /** Parses a 'Decoder' object from a JSON var. If successful, writes the decoder into the destination (decoder). + */ + static Result parseVarForDecoder (const var& jsonVar, ReferenceCountedDecoder::Ptr* decoder) + { + jassert (decoder != nullptr); + // looking for a 'Decoder' object - if (! parsedJson.hasProperty ("Decoder")) + if (! jsonVar.hasProperty ("Decoder")) return Result::fail ("No 'Decoder' object found in the configuration file."); - var decoderObject = parsedJson.getProperty ("Decoder", parsedJson); - result = DecoderVar (decoderObject, decoder, - parsedJson.getProperty ("Name", var("")), parsedJson.getProperty ("Description", var(""))); + var decoderObject = jsonVar.getProperty ("Decoder", jsonVar); + auto result = DecoderVar (decoderObject, decoder, + jsonVar.getProperty ("Name", var("")), jsonVar.getProperty ("Description", var(""))); if (! result.wasOk()) return Result::fail (result.getErrorMessage()); diff -Nru iem-plugin-suite-1.11.0/resources/customComponents/SpherePanner.h iem-plugin-suite-1.11.1/resources/customComponents/SpherePanner.h --- iem-plugin-suite-1.11.0/resources/customComponents/SpherePanner.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/customComponents/SpherePanner.h 2020-04-02 15:28:39.000000000 +0000 @@ -34,6 +34,7 @@ { setBufferedToImage(true); }; + ~SpherePannerBackground() {}; void resized() override @@ -105,7 +106,7 @@ -class SpherePanner : public Component +class SpherePanner : public Component { public: SpherePanner() : Component() @@ -150,20 +151,19 @@ Colour getColour() { return colour; } Colour getTextColour() { return textColour; } - void setLabel(String newLabel) {label = newLabel;} + void setLabel (String newLabel) {label = newLabel;} void setGrabPriority (int newPriority) { grabPriority = newPriority; } int getGrabPriority() {return grabPriority;} void setGrabRadius (float newRadius) { grabRadius = newRadius; } float getGrabRadius() { return grabRadius; } - String getLabel() {return label;}; private: bool active = true; - float grabRadius = 0.015f; + float grabRadius = 0.123f; int grabPriority = 0; Colour colour = Colours::white; @@ -188,11 +188,13 @@ } if (linearElevation) - r = std::sin (r * 1.570796327f); + r = std::sin (r * MathConstants::halfPi); float elevation = std::acos (r); - if (! upBeforeDrag) elevation *= -1.0f; + if (! upBeforeDrag) + elevation *= -1.0f; + position = Conversions::sphericalToCartesian (azimuth, elevation); } @@ -214,7 +216,6 @@ return false; } - private: Vector3D position; }; @@ -247,7 +248,7 @@ } if (linearElevation) - r = std::sin(r * 1.570796327f); + r = std::sin(r * MathConstants::halfPi); float ele = std::acos (r); if (! upBeforeDrag) ele *= -1.0f; @@ -315,12 +316,12 @@ } if (linearElevation) - r = std::sin (r * 1.570796327f); + r = std::sin (r * MathConstants::halfPi); float ele = std::acos (r); if (! upBeforeDrag) ele *= -1.0f; - Vector3D posXYZ {Conversions::sphericalToCartesian (azi, ele)}; + Vector3D posXYZ (Conversions::sphericalToCartesian (azi, ele)); // ==== calculate width Vector3D dPos = posXYZ - centerElement.getCoordinates(); @@ -420,16 +421,23 @@ if (linearElevation) { const float r = sqrt (pos.y * pos.y + pos.x * pos.x); - const float factor = std::asin (r) / r / (MathConstants::pi / 2); + const float factor = std::asin (r) / r / MathConstants::halfPi; pos *= factor; } const Rectangle circleArea (centreX - pos.y * radius - diam / 2, centreY - pos.x * radius - diam / 2, diam, diam); - Path panPos; + Path panPos; panPos.addEllipse (circleArea); g.strokePath (panPos, PathStrokeType (1.0f)); - g.setColour (colour.withMultipliedAlpha (isUp ? 1.0f : 0.3f)); + + if (i == activeElem) + { + g.setColour (colour.withAlpha (0.8f)); + g.drawEllipse (circleArea.withSizeKeepingCentre (1.3f * diam, 1.3f * diam), 0.9f); + } + + g.setColour (colour.withAlpha (isUp ? 1.0f : 0.3f)); g.fillPath (panPos); g.setColour (isUp ? handle->getTextColour() : colour); @@ -439,7 +447,7 @@ }; - void mouseWheelMove(const MouseEvent &event, const MouseWheelDetails &wheel) override + void mouseWheelMove (const MouseEvent &event, const MouseWheelDetails &wheel) override { for (int i = listeners.size(); --i >= 0;) listeners.getUnchecked(i)->mouseWheelOnSpherePannerMoved (this, event, wheel); @@ -447,64 +455,62 @@ void mouseMove (const MouseEvent &event) override { - int oldActiveElem = activeElem; + const int oldActiveElem = activeElem; activeElem = -1; - const float centreX = 0.5f * (float) getBounds().getWidth(); - const float centreY = 0.5f * (float) getBounds().getHeight(); - - int nElem = elements.size(); - - if (nElem > 0) { - Point pos = event.getPosition(); - - const float mouseX = (centreY-pos.getY()) / radius; - const float mouseY = (centreX-pos.getX()) / radius; + const int nElem = elements.size(); - float *dist = (float*) malloc(nElem * sizeof(float)); + if (nElem > 0) + { + const auto centre = getLocalBounds().getCentre(); + const Point dif = centre - event.getPosition(); + const Point mousePos (dif.y / radius, dif.x / radius); // scale and swap xy - //int nGrabed = 0; int highestPriority = -1; + int smallestDist = 123456789; // basically infinity - float tx,ty; - for (int i = elements.size(); --i >= 0;) { + for (int i = 0; i < nElem; ++i) + { Element* handle (elements.getUnchecked (i)); - Vector3D pos = handle->getCoordinates(); + auto elementPosition = handle->getCoordinates(); if (linearElevation) { - const float r = sqrt (pos.y * pos.y + pos.x * pos.x); - const float factor = std::asin (r) / r / 1.570796327f; // pi / 2 - pos *= factor; + const float r = sqrt (elementPosition.y * elementPosition.y + elementPosition.x * elementPosition.x); + const float factor = std::asin (r) / r / MathConstants::halfPi; + elementPosition *= factor; } - tx = (mouseX - pos.x); - ty = (mouseY - pos.y); - dist[i] = tx*tx + ty*ty; + const Point connection (mousePos.x - elementPosition.x, mousePos.y - elementPosition.y); + const auto distance = connection.getDistanceFromOrigin(); - if (dist[i] <= handle->getGrabRadius()) { + if (distance <= handle->getGrabRadius()) + { if (handle->getGrabPriority() > highestPriority) { activeElem = i; highestPriority = handle->getGrabPriority(); + smallestDist = distance; } - else if (handle->getGrabPriority() == highestPriority && dist[i] < dist[activeElem]) + else if (handle->getGrabPriority() == highestPriority && distance < smallestDist) { activeElem = i; + smallestDist = distance; } } } } - if (activeElem != -1) activeElemWasUpBeforeDrag = elements.getUnchecked (activeElem)->getCoordinates().z >= 0.0f; + + if (activeElem != -1) activeElemWasUpBeforeDrag = elements.getUnchecked (activeElem)->getCoordinates().z >= 0.0f; if (oldActiveElem != activeElem) repaint(); } + void mouseDrag (const MouseEvent &event) override { const bool rightClick = event.mods.isRightButtonDown(); if (activeElem != -1) { - elements.getUnchecked (activeElem)->moveElement (event, centre, radius, activeElemWasUpBeforeDrag, linearElevation, rightClick); repaint(); } @@ -544,8 +550,8 @@ void addElement (Element* const element) { jassert (element != nullptr); - if (element !=0) - elements.add (element); + if (element != nullptr) + elements.addIfNotAlreadyThere (element); }; void removeElement (Element* const element) @@ -553,19 +559,6 @@ elements.removeFirstMatchingValue (element); }; - int indexofSmallestElement (float *array, int size) - { - int index = 0; - - for (int i = 1; i < size; i++) - { - if(array[i] < array[index]) - index = i; - } - - return index; - } - void setElevationStyle (bool linear) { linearElevation = linear; diff -Nru iem-plugin-suite-1.11.0/resources/LabelAttachment.h iem-plugin-suite-1.11.1/resources/LabelAttachment.h --- iem-plugin-suite-1.11.0/resources/LabelAttachment.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/LabelAttachment.h 2020-04-02 15:28:39.000000000 +0000 @@ -63,8 +63,8 @@ void sendInitialUpdate() { - if (float* v = state.getRawParameterValue (paramID)) - parameterChanged (paramID, *v); + if (std::atomic* v = state.getRawParameterValue (paramID)) + parameterChanged (paramID, *v); } void parameterChanged (const String&, float newValue) override diff -Nru iem-plugin-suite-1.11.0/resources/lookAndFeel/IEM_LaF.h iem-plugin-suite-1.11.1/resources/lookAndFeel/IEM_LaF.h --- iem-plugin-suite-1.11.0/resources/lookAndFeel/IEM_LaF.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/lookAndFeel/IEM_LaF.h 2020-04-02 15:28:39.000000000 +0000 @@ -393,20 +393,16 @@ slbg.addRoundedRectangle (r,sliderRadius/2.0,sliderRadius/2.0); if (isTwoValue) - { - clbar.addRoundedRectangle(Rectangle(Point(minSliderPos, iy), Point(maxSliderPos, iy+sliderRadius)),sliderRadius/2.0,sliderRadius/2.0); - } + clbar.addRoundedRectangle (Rectangle (juce::Point (minSliderPos, iy), Point (maxSliderPos, iy + sliderRadius)), sliderRadius / 2.0, sliderRadius / 2.0); else - { - clbar.addRoundedRectangle(Rectangle(Point(x+width*zeroPos, iy), Point(sliderPos, iy+sliderRadius)),sliderRadius/2.0,sliderRadius/2.0); - } + clbar.addRoundedRectangle (Rectangle (juce::Point (x + width * zeroPos, iy), Point (sliderPos, iy + sliderRadius)), sliderRadius / 2.0, sliderRadius / 2.0); } else { const float ix = x + width * 0.5f - sliderRadius * 0.5f; Rectangle r (ix, y - sliderRadius * 0.5f, sliderRadius, height + sliderRadius); slbg.addRoundedRectangle (r,sliderRadius/2.0,sliderRadius/2.0); - clbar.addRoundedRectangle(Rectangle(Point(ix+1.0f,y+ height * (1.0f-zeroPos)), Point(ix-1.0f+sliderRadius,sliderPos)),sliderRadius/2.0,sliderRadius/2.0); + clbar.addRoundedRectangle (Rectangle (juce::Point (ix + 1.0f, y + height * (1.0f - zeroPos)), Point (ix - 1.0f + sliderRadius, sliderPos)), sliderRadius / 2.0, sliderRadius / 2.0); } diff -Nru iem-plugin-suite-1.11.0/resources/NewtonApple/NewtonApple_hull3D.cpp iem-plugin-suite-1.11.1/resources/NewtonApple/NewtonApple_hull3D.cpp --- iem-plugin-suite-1.11.0/resources/NewtonApple/NewtonApple_hull3D.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/NewtonApple/NewtonApple_hull3D.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -608,6 +608,10 @@ // second side of the struck out triangle int ac = hull[xid].ac; // facet adjacent to line ac + + if (ac == -1) // quick fix + return -1; + Tri &tAC = hull[ac]; R1 = pts[tAC.a].x; // point on next triangle @@ -1475,6 +1479,10 @@ // second side of the struck out triangle int ac = hull[xid].ac; // facet adjacent to line ac + + if (ac == -1) // quick fix + return -1; + Tri &tAC = hull[ac]; R1 = pts[tAC.a].x; // point on next triangle diff -Nru iem-plugin-suite-1.11.0/resources/Standalone/MyStandaloneFilterWindow.h iem-plugin-suite-1.11.1/resources/Standalone/MyStandaloneFilterWindow.h --- iem-plugin-suite-1.11.0/resources/Standalone/MyStandaloneFilterWindow.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/resources/Standalone/MyStandaloneFilterWindow.h 2020-04-02 15:28:39.000000000 +0000 @@ -129,12 +129,12 @@ deviceManager.createAudioDeviceTypes (types); for (auto* t : types) - deviceManager.addAudioDeviceType (t); + deviceManager.addAudioDeviceType (std::unique_ptr (t)); types.clearQuick (false); #if BUILD_WITH_JACK_SUPPORT - deviceManager.addAudioDeviceType (new iem::JackAudioIODeviceType()); + deviceManager.addAudioDeviceType (std::make_unique ()); #endif auto inChannels = (channelConfiguration.size() > 0 ? channelConfiguration[0].numIns @@ -907,7 +907,7 @@ } private: - bool muted; + bool muted = false; SimpleLabel lbMuted; std::unique_ptr jackDeviceName; TextButton settingsButton; diff -Nru iem-plugin-suite-1.11.0/RoomEncoder/RoomEncoder.jucer iem-plugin-suite-1.11.1/RoomEncoder/RoomEncoder.jucer --- iem-plugin-suite-1.11.0/RoomEncoder/RoomEncoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/RoomEncoder/RoomEncoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginEditor.cpp iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginEditor.cpp --- iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginEditor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginEditor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -314,7 +314,7 @@ fv.addCoefficients(processor.highShelfCoefficients, Colours::orangered, &slHighShelfFreq, &slHighShelfGain); addAndMakeVisible(&rv); - rv.setDataPointers(p.allGains, p.mRadius, p.numRefl); + rv.setDataPointers (p.allGains, p.mRadius, p.numRefl); Vector3D dims(slRoomX.getValue(), slRoomY.getValue(), slRoomZ.getValue()); float scale = jmin(xyPlane.setDimensions(dims), zyPlane.setDimensions(dims)); diff -Nru iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -116,8 +116,8 @@ FloatVectorOperations::clear((float *) &SHsampleOld[i], 64); } - lowShelfCoefficients = IIR::Coefficients::makeLowShelf(48000, *lowShelfFreq, 0.707f, Decibels::decibelsToGain(*lowShelfGain)); - highShelfCoefficients = IIR::Coefficients::makeHighShelf(48000, *highShelfFreq, 0.707f, Decibels::decibelsToGain(*highShelfGain)); + lowShelfCoefficients = IIR::Coefficients::makeLowShelf(48000, *lowShelfFreq, 0.707f, Decibels::decibelsToGain (lowShelfGain->load())); + highShelfCoefficients = IIR::Coefficients::makeHighShelf(48000, *highShelfFreq, 0.707f, Decibels::decibelsToGain (highShelfGain->load())); lowShelfArray.clear(); @@ -264,7 +264,7 @@ clear (*interleavedData.getLast()); } - zero = AudioBlock (zeroData, IIRfloat_elements(), samplesPerBlock); + zero = AudioBlock (zeroData, IIRfloat_elements, samplesPerBlock); zero.clear(); updateFv = true; @@ -277,14 +277,14 @@ const float rYHalfBound = rY / 2 - 0.1f; const float rZHalfBound = rZ / 2 - 0.1f; - sourcePos = Vector3D (jlimit (-rXHalfBound, rXHalfBound, *sourceX), - jlimit (-rYHalfBound, rYHalfBound, *sourceY), - jlimit (-rZHalfBound, rZHalfBound, *sourceZ)); + sourcePos = Vector3D (jlimit (-rXHalfBound, rXHalfBound, sourceX->load()), + jlimit (-rYHalfBound, rYHalfBound, sourceY->load()), + jlimit (-rZHalfBound, rZHalfBound, sourceZ->load())); - listenerPos = Vector3D (jlimit (-rXHalfBound, rXHalfBound, *listenerX), - jlimit (-rYHalfBound, rYHalfBound, *listenerY), - jlimit (-rZHalfBound, rZHalfBound, *listenerZ)); + listenerPos = Vector3D (jlimit (-rXHalfBound, rXHalfBound, listenerX->load()), + jlimit (-rYHalfBound, rYHalfBound, listenerY->load()), + jlimit (-rZHalfBound, rZHalfBound, listenerZ->load())); calculateImageSourcePositions (rX, rY, rZ); @@ -363,11 +363,11 @@ void RoomEncoderAudioProcessor::updateFilterCoefficients (double sampleRate) { - const auto lowFreq = jmin (static_cast (0.5 * sampleRate), *lowShelfFreq); - *lowShelfCoefficients = *IIR::Coefficients::makeLowShelf (sampleRate, lowFreq, 0.707f, Decibels::decibelsToGain (*lowShelfGain)); + const auto lowFreq = jmin (static_cast (0.5 * sampleRate), lowShelfFreq->load()); + *lowShelfCoefficients = *IIR::Coefficients::makeLowShelf (sampleRate, lowFreq, 0.707f, Decibels::decibelsToGain (lowShelfGain->load())); - const auto highFreq = jmin (static_cast (0.5 * sampleRate), *highShelfFreq); - *highShelfCoefficients = *IIR::Coefficients::makeHighShelf (sampleRate, highFreq, 0.707f, Decibels::decibelsToGain (*highShelfGain)); + const auto highFreq = jmin (static_cast (0.5 * sampleRate), highShelfFreq->load()); + *highShelfCoefficients = *IIR::Coefficients::makeHighShelf (sampleRate, highFreq, 0.707f, Decibels::decibelsToGain (highShelfGain->load())); userChangedFilterSettings = false; updateFv = true; @@ -416,23 +416,27 @@ float* pBufferWrite = buffer.getWritePointer(0); const float* pBufferRead = buffer.getReadPointer(0); - const int nSIMDFilters = 1 + (maxNChIn-1)/IIRfloat_elements(); + const int nSIMDFilters = 1 + (maxNChIn-1)/IIRfloat_elements; const auto delayBufferWritePtrArray = delayBuffer.getArrayOfWritePointers(); + + if (maxNChIn < 1) + return; + // update iir filter coefficients if (userChangedFilterSettings) updateFilterCoefficients(sampleRate); //interleave input data - int partial = maxNChIn%IIRfloat_elements(); + int partial = maxNChIn%IIRfloat_elements; if (partial == 0) { for (int i = 0; i (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } } else @@ -440,32 +444,32 @@ int i; for (i = 0; i (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } - const float* addr[IIRfloat_elements()]; + const float* addr[IIRfloat_elements]; size_t ch; for (ch = 0; ch < partial; ++ch) { - addr[ch] = buffer.getReadPointer(i * static_cast (IIRfloat_elements() + ch)); + addr[ch] = buffer.getReadPointer(i * static_cast (IIRfloat_elements + ch)); } - for (; ch < IIRfloat_elements(); ++ch) + for (; ch < IIRfloat_elements; ++ch) { addr[ch] = zero.getChannelPointer(ch); } AudioDataConverters::interleaveSamples(addr, reinterpret_cast (interleavedData[i]->getChannelPointer (0)), L, - static_cast (IIRfloat_elements())); + static_cast (IIRfloat_elements)); } - int currNumRefl = roundToInt(*numRefl); + int currNumRefl = roundToInt (numRefl->load()); int workingNumRefl = (currNumRefl < _numRefl) ? _numRefl : currNumRefl; // calculating reflection coefficients (only if parameter changed) - float reflCoeffGain = Decibels::decibelsToGain(*reflCoeff); + float reflCoeffGain = Decibels::decibelsToGain (reflCoeff->load()); if (powReflCoeff[1] != reflCoeffGain) { powReflCoeff[0] = 1; @@ -538,10 +542,10 @@ { for (int i = 0; i* chPtr[1]; + const IIRfloat* chPtr[1]; chPtr[0] = interleavedData[i]->getChannelPointer (0); - AudioBlock> ab (const_cast**> (chPtr), 1, L); - ProcessContextReplacing> context (ab); + AudioBlock ab (const_cast (chPtr), 1, L); + ProcessContextReplacing context (ab); lowShelfArray[idx]->getUnchecked (i)->process (context); highShelfArray[idx]->getUnchecked (i)->process (context); @@ -553,15 +557,15 @@ * the following section is broken, as it hardcodes asumptions about how * many floats can be stored in IIRfloat */ - IIRfloat SHsample[16]; //TODO: can be smaller: (N+1)^2/IIRfloat_elements() + IIRfloat SHsample[16]; //TODO: can be smaller: (N+1)^2/IIRfloat_elements IIRfloat SHsampleStep[16]; #if JUCE_USE_SIMD FloatVectorOperations::clear((float *) &SHsample->value, - IIRfloat_elements() * sizeof(SHsample) / sizeof(*SHsample)); + IIRfloat_elements * sizeof(SHsample) / sizeof(*SHsample)); SHEval(directivityOrder, smx[q], smy[q], smz[q],(float *) &SHsample->value, false); // deoding -> false #else /* !JUCE_USE_SIMD */ FloatVectorOperations::clear((float *) SHsample, - IIRfloat_elements() * sizeof(SHsample) / sizeof(*SHsample)); + IIRfloat_elements * sizeof(SHsample) / sizeof(*SHsample)); SHEval(directivityOrder, smx[q], smy[q], smz[q],(float *) SHsample, false); // deoding -> false #endif /* JUCE_USE_SIMD */ @@ -1135,7 +1139,7 @@ inline void RoomEncoderAudioProcessor::clear (AudioBlock& ab) { - const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements(); + const int N = static_cast (ab.getNumSamples()) * IIRfloat_elements; const int nCh = static_cast (ab.getNumChannels()); for (int ch = 0; ch < nCh; ++ch) diff -Nru iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/RoomEncoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/RoomEncoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -39,11 +39,11 @@ #endif #if JUCE_USE_SIMD -# define IIRfloat juce::dsp::SIMDRegister -# define IIRfloat_elements() IIRfloat::size() + using IIRfloat = juce::dsp::SIMDRegister; + static constexpr int IIRfloat_elements = juce::dsp::SIMDRegister::size(); #else /* !JUCE_USE_SIMD */ -# define IIRfloat float -# define IIRfloat_elements() 1 + using IIRfloat = float; + static constexpr int IIRfloat_elements = 1; #endif /* JUCE_USE_SIMD */ #define ProcessorClass RoomEncoderAudioProcessor @@ -147,7 +147,7 @@ void updateFilterCoefficients (double sampleRate); void calculateImageSourcePositions (const float t, const float b, const float h); - float* numRefl; + std::atomic* numRefl; float mRadius[nImgSrc]; void updateBuffers() override; @@ -164,45 +164,45 @@ double theta; // Parameters - float *directivityOrderSetting; - float *inputIsSN3D; - float *orderSetting; - float *useSN3D; - - float* roomX; - float* roomY; - float* roomZ; - - float* sourceX; - float* sourceY; - float* sourceZ; - - float* listenerX; - float* listenerY; - float* listenerZ; - - float* reflCoeff; - - float* lowShelfFreq; - float* lowShelfGain; - float* highShelfFreq; - float* highShelfGain; - - float* syncChannel; - float* syncRoomSize; - float* syncReflection; - float* syncListener; - - float* renderDirectPath; - float* directPathZeroDelay; - float* directPathUnityGain; - - float* wallAttenuationFront; - float* wallAttenuationBack; - float* wallAttenuationLeft; - float* wallAttenuationRight; - float* wallAttenuationCeiling; - float* wallAttenuationFloor; + std::atomic* directivityOrderSetting; + std::atomic* inputIsSN3D; + std::atomic* orderSetting; + std::atomic* useSN3D; + + std::atomic* roomX; + std::atomic* roomY; + std::atomic* roomZ; + + std::atomic* sourceX; + std::atomic* sourceY; + std::atomic* sourceZ; + + std::atomic* listenerX; + std::atomic* listenerY; + std::atomic* listenerZ; + + std::atomic* reflCoeff; + + std::atomic* lowShelfFreq; + std::atomic* lowShelfGain; + std::atomic* highShelfFreq; + std::atomic* highShelfGain; + + std::atomic* syncChannel; + std::atomic* syncRoomSize; + std::atomic* syncReflection; + std::atomic* syncListener; + + std::atomic* renderDirectPath; + std::atomic* directPathZeroDelay; + std::atomic* directPathUnityGain; + + std::atomic* wallAttenuationFront; + std::atomic* wallAttenuationBack; + std::atomic* wallAttenuationLeft; + std::atomic* wallAttenuationRight; + std::atomic* wallAttenuationCeiling; + std::atomic* wallAttenuationFloor; int _numRefl; diff -Nru iem-plugin-suite-1.11.0/RoomEncoder/Source/ReflectionsVisualizer.h iem-plugin-suite-1.11.1/RoomEncoder/Source/ReflectionsVisualizer.h --- iem-plugin-suite-1.11.0/RoomEncoder/Source/ReflectionsVisualizer.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/RoomEncoder/Source/ReflectionsVisualizer.h 2020-04-02 15:28:39.000000000 +0000 @@ -86,7 +86,7 @@ if (radiusPtr != nullptr) { - int numRef = roundToInt(*numReflPtr); + int numRef = roundToInt (numReflPtr->load()); float gainDb = Decibels::gainToDecibels(gainPtr[0]); if (gainDb > -60.0f && gainDb <= 20.0f) @@ -129,7 +129,7 @@ xRangeInMs = jmin(xRangeInMs, 550); xRangeInMs = jmax(xRangeInMs, 40); } - void setDataPointers(float* Gain, float* Radius, float* NumRefl) { + void setDataPointers(float* Gain, float* Radius, std::atomic* NumRefl) { gainPtr = Gain; numReflPtr = NumRefl; radiusPtr = Radius; @@ -177,7 +177,7 @@ float plotWidth = 1.0f; float plotHeight = 1.0f; int xRangeInMs = 100; - float* numReflPtr = nullptr; + std::atomic* numReflPtr = nullptr; float* gainPtr = nullptr; float* radiusPtr = nullptr; diff -Nru iem-plugin-suite-1.11.0/SceneRotator/SceneRotator.jucer iem-plugin-suite-1.11.1/SceneRotator/SceneRotator.jucer --- iem-plugin-suite-1.11.0/SceneRotator/SceneRotator.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SceneRotator/SceneRotator.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru iem-plugin-suite-1.11.0/SceneRotator/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/SceneRotator/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/SceneRotator/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SceneRotator/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -639,6 +639,7 @@ // pitch (y-axis rotation) float t0 = 2.0f * (p0 * p2 + e * p1 * p3); + t0 = jlimit (-1.0f, 1.0f, t0); ypr[1] = asin (t0); if (ypr[1] == MathConstants::pi || ypr[1] == - MathConstants::pi) diff -Nru iem-plugin-suite-1.11.0/SceneRotator/Source/PluginProcessor.h iem-plugin-suite-1.11.1/SceneRotator/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/SceneRotator/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SceneRotator/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -127,21 +127,21 @@ Atomic usingYpr = true; // list of used audio parameters - float* orderSetting; - float* useSN3D; + std::atomic* orderSetting; + std::atomic* useSN3D; - float* yaw; - float* pitch; - float* roll; - float* qw; - float* qx; - float* qy; - float* qz; - float* invertYaw; - float* invertPitch; - float* invertRoll; - float* invertQuaternion; - float* rotationSequence; + std::atomic* yaw; + std::atomic* pitch; + std::atomic* roll; + std::atomic* qw; + std::atomic* qx; + std::atomic* qy; + std::atomic* qz; + std::atomic* invertYaw; + std::atomic* invertPitch; + std::atomic* invertRoll; + std::atomic* invertQuaternion; + std::atomic* rotationSequence; Atomic updatingParams {false}; Atomic rotationParamsHaveChanged {true}; diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/SimpleDecoder.jucer iem-plugin-suite-1.11.1/SimpleDecoder/SimpleDecoder.jucer --- iem-plugin-suite-1.11.0/SimpleDecoder/SimpleDecoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/SimpleDecoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@ + + + + + + + + + + + + diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/SimpleDecoder/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -133,8 +133,7 @@ //============================================================================== int SimpleDecoderAudioProcessor::getNumPrograms() { - return 1; // NB: some hosts don't cope very well if you tell them there are 0 programs, - // so this should be at least 1, even if you're not really implementing programs. + return 11; } int SimpleDecoderAudioProcessor::getCurrentProgram() @@ -144,11 +143,89 @@ void SimpleDecoderAudioProcessor::setCurrentProgram (int index) { + String preset; + switch (index) + { + case 0: + return; + case 1: + preset = String (BinaryData::CUBE_json, BinaryData::CUBE_jsonSize); + break; + + case 2: + preset = String (BinaryData::Produktionsstudio_json, BinaryData::Produktionsstudio_jsonSize); + break; + + case 3: + preset = String (BinaryData::MSDecoder_json, BinaryData::MSDecoder_jsonSize); + break; + + case 4: + preset = String (BinaryData::Quadraphonic_json, BinaryData::Quadraphonic_jsonSize); + break; + + case 5: + preset = String (BinaryData::_5point1_json, BinaryData::_5point1_jsonSize); + break; + + case 6: + preset = String (BinaryData::_7point1_json, BinaryData::_7point1_jsonSize); + break; + + case 7: + preset = String (BinaryData::_5point1point4_json, BinaryData::_5point1point4_jsonSize); + break; + + case 8: + preset = String (BinaryData::_7point1point4_json, BinaryData::_7point1point4_jsonSize); + break; + + case 9: + preset = String (BinaryData::Cube_8ch_json, BinaryData::Cube_8ch_jsonSize); + break; + + case 10: + preset = String (BinaryData::_22_2_NHK_json, BinaryData::_22_2_NHK_jsonSize); + break; + + default: + preset = ""; + break; + } + + loadConfigFromString (preset); } const String SimpleDecoderAudioProcessor::getProgramName (int index) { - return {}; + switch (index) + { + case 0: + return "---"; + case 1: + return "IEM CUBE"; + case 2: + return "IEM Produktionsstudio"; + case 3: + return "Stereo"; + case 4: + return "Quadraphonic"; + case 5: + return "5.1"; + case 6: + return "7.1"; + case 7: + return "5.1.4"; + case 8: + return "7.1.4"; + case 9: + return "8ch Cube"; + case 10: + return "22.2 NHK"; + + default: + return {}; + } } void SimpleDecoderAudioProcessor::changeProgramName (int index, const String& newName) @@ -236,6 +313,8 @@ parameters.getParameter ("swChannel")->setValueNotifyingHost (parameters.getParameterRange ("swChannel").convertTo0to1 (decoder.getCurrentDecoder()->getSettings().subwooferChannel)); parameters.getParameter ("swMode")->setValueNotifyingHost (parameters.getParameterRange ("swMode").convertTo0to1 (1)); //discrete } + else + parameters.getParameter ("swMode")->setValueNotifyingHost (parameters.getParameterRange ("swMode").convertTo0to1 (0)); // off // calculate mean omni-signal-gain Matrix& decoderMatrix = retainedDecoder->getMatrix(); @@ -277,7 +356,7 @@ ProcessContextReplacing lowPassContext(lowPassAudioBlock); lowPass1->process(lowPassContext); lowPass2->process(lowPassContext); - swBuffer.applyGain(0, 0, swBuffer.getNumSamples(), Decibels::decibelsToGain(*lowPassGain)); + swBuffer.applyGain(0, 0, swBuffer.getNumSamples(), Decibels::decibelsToGain (lowPassGain->load())); AudioBlock highPassAudioBlock = AudioBlock(buffer.getArrayOfWritePointers(), nChIn, buffer.getNumSamples()); ProcessContextReplacing highPassContext (highPassAudioBlock); @@ -287,7 +366,7 @@ // update current weights setting auto settings = retainedDecoder->getSettings(); - settings.weights = ReferenceCountedDecoder::Weights (roundToInt (*weights)); + settings.weights = ReferenceCountedDecoder::Weights (roundToInt (weights->load())); retainedDecoder->setSettings (settings); // ambisonic decoding @@ -319,7 +398,7 @@ } } // =================== Master Gain ========================================= - auto overallGainInDecibels = *parameters.getRawParameterValue ("overallGain"); + const float overallGainInDecibels = *parameters.getRawParameterValue ("overallGain"); masterGain.setGainDecibels (overallGainInDecibels); AudioBlock ab (buffer.getArrayOfWritePointers(), nChOut, buffer.getNumSamples()); ProcessContextReplacing masterContext (ab); @@ -342,7 +421,7 @@ { auto state = parameters.copyState(); - state.setProperty ("lastOpenedPresetFile", var (lastFile.getFullPathName()), nullptr); + state.setProperty ("configString", var (lastConfigString), nullptr);; auto oscConfig = state.getOrCreateChildWithName ("OSCConfig", nullptr); oscConfig.copyPropertiesFrom (oscParameterInterface.getConfig(), nullptr); @@ -362,19 +441,37 @@ if (xmlState != nullptr) if (xmlState->hasTagName (parameters.state.getType()) || xmlState->hasTagName ("Decoder")) // compatibility for old "Decoder" state tagName parameters.state = ValueTree::fromXml (*xmlState); + + auto* weightsParam = parameters.getParameter ("weights"); + const auto savedWeights = weightsParam->getValue(); + auto* swModeParam = parameters.getParameter ("swMode"); + const auto savedSwMode = swModeParam->getValue(); + auto* swChannelParam = parameters.getParameter ("swChannel"); + const auto savedSwChannel = swChannelParam->getValue(); + + if (parameters.state.hasProperty ("lastOpenedPresetFile")) { Value val = parameters.state.getPropertyAsValue ("lastOpenedPresetFile", nullptr); if (val.getValue().toString() != "") { - auto* weightsParam = parameters.getParameter ("weights"); - const auto savedWeights = weightsParam->getValue(); const File f (val.getValue().toString()); - loadConfiguration(f); + loadConfiguration (f); weightsParam->setValueNotifyingHost (savedWeights); } + parameters.state.removeProperty ("lastOpenedPresetFile", nullptr); + } + else if (parameters.state.hasProperty ("configString")) + { + var configString = parameters.state.getProperty ("configString"); + if (configString.isString()) + loadConfigFromString (configString); } + weightsParam->setValueNotifyingHost (savedWeights); + swModeParam->setValueNotifyingHost (savedSwMode); + swChannelParam->setValueNotifyingHost (savedSwChannel); + if (parameters.state.hasProperty ("OSCPort")) // legacy { oscParameterInterface.getOSCReceiver().connect (parameters.state.getProperty ("OSCPort", var (-1))); @@ -420,23 +517,58 @@ { ReferenceCountedDecoder::Ptr tempDecoder = nullptr; - Result result = ConfigurationHelper::parseFileForDecoder (presetFile, &tempDecoder); + if (! presetFile.exists()) + { + messageForEditor = "File '" + presetFile.getFullPathName() + "' does not exist!"; + messageChanged = true; + return; + } + + const String jsonString = presetFile.loadFileAsString(); + + loadConfigFromString (jsonString); +} + +void SimpleDecoderAudioProcessor::loadConfigFromString (String configString) +{ + if (configString.isEmpty()) + return; + + lastConfigString = configString; + + var parsedJson; + Result result = JSON::parse (configString, parsedJson); + + if (result.failed()) + return; + + ReferenceCountedDecoder::Ptr tempDecoder = nullptr; + + result = ConfigurationHelper::parseVarForDecoder (parsedJson, &tempDecoder); if (result.failed()) messageForEditor = result.getErrorMessage(); if (tempDecoder != nullptr) { - lastFile = presetFile; messageForEditor = ""; tempDecoder->removeAppliedWeights(); parameters.getParameterAsValue ("weights").setValue (static_cast (tempDecoder->getSettings().weights)); } - decoder.setDecoder (tempDecoder); decoderConfig = tempDecoder; + if (decoderConfig->getSettings().subwooferChannel != -1) + { + parameters.getParameter ("swMode")->setValueNotifyingHost (parameters.getParameterRange ("swMode").convertTo0to1 (1)); + parameters.getParameter ("swChannel")->setValueNotifyingHost (parameters.getParameterRange ("swChannel").convertTo0to1 (decoderConfig->getSettings().subwooferChannel)); + } + else + parameters.getParameter ("swMode")->setValueNotifyingHost (parameters.getParameterRange ("swMode").convertTo0to1 (0)); + + + updateDecoderInfo = true; messageChanged = true; } diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/SimpleDecoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -104,21 +104,27 @@ void updateLowPassCoefficients (double sampleRate, float frequency); void updateHighPassCoefficients (double sampleRate, float frequency); + void loadConfigFromString (String string); + // list of used audio parameters - float *inputOrderSetting, *useSN3D; - float *lowPassFrequency, *lowPassGain; - float *highPassFrequency; - - float *swMode; - float *swChannel; - float *weights; + std::atomic* inputOrderSetting; + std::atomic* useSN3D; + std::atomic* lowPassFrequency; + std::atomic* lowPassGain; + std::atomic* highPassFrequency; + + std::atomic* swMode; + std::atomic* swChannel; + std::atomic* weights; // ========================================= float omniGain = 0.0f; File lastDir; - File lastFile; + + String lastConfigString; + std::unique_ptr properties; AudioBuffer swBuffer; diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/22_2_NHK.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/22_2_NHK.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/22_2_NHK.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/22_2_NHK.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,1621 @@ +{ + "Decoder": { + "Name": "22.2 NHK", + "Description": "AllRAD-decoder for a 22.2 loudspeaker layout with stereo subwoofers.", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.03310225531458854675, + 0.02213085815310478210, + 0.00329327187500894070, + 0.04935869947075843811, + 0.04125791415572166443, + 0.00255896523594856262, + -0.02850615978240966797, + 0.00575093459337949753, + 0.03669725731015205383, + 0.05019125342369079590, + 0.00513867987319827080, + -0.01335488446056842804, + -0.00450558494776487350, + -0.02932209335267543793, + 0.00460679316893219948, + 0.01573733240365982056, + 0.04703781008720397949, + 0.00646721711382269859, + -0.01879251003265380859, + -0.00215430627577006817, + 0.01429620943963527679, + -0.00470704445615410805, + -0.01608021929860115051, + 0.00204958114773035049, + -0.00567290885373950005, + 0.03457100316882133484, + 0.00612456072121858597, + -0.01729719899594783783, + -0.00269874488003551960, + 0.00501938676461577415, + 0.00175738334655761719, + 0.01036491803824901581, + -0.00222560041584074497, + -0.00459609273821115494, + -0.00073744246037676930, + -0.02093969471752643585, + 0.01837057247757911682, + 0.00447601685300469398, + -0.01178452372550964355, + -0.00180258171167224646, + 0.00439758365973830223, + 0.00009518604201730341, + -0.00249111512675881386, + -0.00006455284892581403, + 0.00299044325947761536, + -0.00030597543809562922, + 0.00249541760422289371, + -0.00274001993238925934, + -0.02680098079144954681, + 0.00422561680898070335, + 0.00232662656344473362, + -0.00560644594952464104, + -0.00037271037581376731, + 0.00138937833253294230, + -0.00120641395915299654, + 0.00010149936861125752, + 0.00176326511427760124, + 0.00104016705881804228, + -0.00139844650402665138, + -0.00056882231729105115, + 0.00040503434138372540, + 0.00485470378771424294, + -0.00347903952933847904, + -0.02393191121518611908 + ], + [ + 0.03309301659464836121, + -0.02212361618876457214, + 0.00328899337910115719, + 0.04934812337160110474, + -0.04124686121940612793, + -0.00255928095430135727, + -0.02850653789937496185, + 0.00574380299076437950, + 0.03669396042823791504, + -0.05018157139420509338, + -0.00513959629461169243, + 0.01335685979574918747, + -0.00450403336435556412, + -0.02933005802333354950, + 0.00459884013980627060, + 0.01574186049401760101, + -0.04703379794955253601, + -0.00646815355867147446, + 0.01880022697150707245, + 0.00215713935904204845, + 0.01430578995496034622, + -0.00470890058204531670, + -0.01608968339860439301, + 0.00204071169719099998, + -0.00566331483423709869, + -0.03457401320338249207, + -0.00612479401752352715, + 0.01730943657457828522, + 0.00270431488752365112, + -0.00502449972555041313, + 0.00176314439158886671, + 0.01037637051194906235, + -0.00222897226922214031, + -0.00460127880796790123, + -0.00074678566306829453, + -0.02092973515391349792, + -0.01837885379791259766, + -0.00447535607963800430, + 0.01179682184010744095, + 0.00180944753810763359, + -0.00440491316840052605, + -0.00009698337089503184, + -0.00249536125920712948, + -0.00005543903898796998, + 0.00299534620717167854, + -0.00030934464302845299, + 0.00249732891097664833, + -0.00274913990870118141, + -0.02679499238729476929, + -0.00423528999090194702, + -0.00232533505186438560, + 0.00561390444636344910, + 0.00037955498555675149, + -0.00139474088791757822, + 0.00120588857680559158, + -0.00010055641905637458, + 0.00175938988104462624, + 0.00104154692962765694, + -0.00138959125615656376, + -0.00057026813738048077, + 0.00040225358679890633, + 0.00486244214698672295, + -0.00348754227161407471, + -0.02393197081983089447 + ], + [ + 0.01853341981768608093, + 0.00000157802560352138, + 0.00149224337656050920, + 0.03110158629715442657, + 0.00000327604311678442, + 0.00000157362205754907, + -0.01819522865116596222, + 0.00306447059847414494, + 0.03300305455923080444, + 0.00000494017558594351, + 0.00000388089893021970, + -0.00000038127546986289, + -0.00261855730786919594, + -0.02337793260812759399, + 0.00366533990018069744, + 0.03311257064342498779, + 0.00000651329173706472, + 0.00000648836248728912, + 0.00000012177025610072, + -0.00000235419065575115, + 0.01346801966428756714, + -0.00382639002054929733, + -0.02090241201221942902, + 0.00398839497938752174, + 0.03189145401120185852, + 0.00000793791332398541, + 0.00000902326064533554, + 0.00000121429718547006, + -0.00000477270123155904, + -0.00000131080525989091, + 0.00242834654636681080, + 0.01552049722522497177, + -0.00361467548646032810, + -0.01809289865195751190, + 0.00407429039478302002, + 0.02964567206799983978, + 0.00000910795370145934, + 0.00001117921601689886, + 0.00000249679033004213, + -0.00000677494927003863, + -0.00000371126316167647, + 0.00000196014457287674, + -0.00825008191168308258, + 0.00278108986094594002, + 0.01228373777121305466, + -0.00316750677302479744, + -0.01501799840480089188, + 0.00395779125392436981, + 0.02664165943861007690, + 0.00000986565009952756, + 0.00001272884946956765, + 0.00000355492170456273, + -0.00000810846995591419, + -0.00000646405214865808, + 0.00000283495023722935, + 0.00000279332812169741, + -0.00131282838992774487, + -0.00856814533472061157, + 0.00201104604639112949, + 0.00925428885966539383, + -0.00256119272671639919, + -0.01180896814912557602, + 0.00367458420805633068, + 0.02313372865319252014 + ], + [ + 0.12118127197027206421, + 0.07807104289531707764, + -0.08137162774801254272, + -0.09684120118618011475, + -0.09999740123748779297, + -0.02849675342440605164, + 0.00138857949059456587, + 0.03787555545568466187, + 0.00619027763605117798, + 0.06057235971093177795, + 0.02979528345167636871, + -0.01885635964572429657, + -0.00896285567432641983, + 0.01268242113292217255, + 0.01244819723069667816, + 0.04712467268109321594, + -0.01013410557061433792, + -0.00688927294686436653, + 0.01094559580087661743, + 0.00147408689372241497, + 0.01400792039930820465, + 0.00317332241684198380, + -0.00443966314196586609, + -0.02453578449785709381, + -0.04583415389060974121, + -0.01059280335903167725, + -0.01111993473023176193, + -0.00007676894892938435, + 0.00965042784810066223, + 0.00733115710318088531, + 0.00550902029499411583, + -0.00002727697392401751, + -0.00426260847598314285, + -0.00091730413259938359, + 0.00937419757246971130, + 0.02081814594566822052, + 0.00486718025058507919, + 0.00961506366729736328, + -0.00342602492310106754, + -0.01249435357749462128, + -0.00649188086390495300, + 0.00302884262055158615, + -0.00229972903616726398, + -0.00932174175977706909, + -0.00373574648983776569, + -0.00362058868631720543, + 0.00047208412433974445, + 0.00371843390166759491, + -0.00463593937456607819, + 0.00270209251902997494, + -0.00000847924911795417, + 0.00171152956318110228, + 0.00453044380992650986, + -0.00030973431421443820, + -0.00284763518720865250, + -0.00130445451941341162, + -0.00277726142667233944, + -0.00137810886371880770, + 0.00085899647092446685, + 0.00646687019616365433, + 0.00813213456422090530, + 0.00435270648449659348, + -0.00492006400600075722, + 0.00442133285105228424 + ], + [ + 0.12118364870548248291, + -0.07807558029890060425, + -0.08138324320316314697, + -0.09683643281459808350, + 0.09999712556600570679, + 0.02849839255213737488, + 0.00139313517138361931, + 0.03788735717535018921, + 0.00617882423102855682, + -0.06056344881653785706, + -0.02980021201074123383, + 0.01885871030390262604, + -0.00896942894905805588, + 0.01268371939659118652, + 0.01243626698851585388, + 0.04713245108723640442, + 0.01012587826699018478, + 0.00689991191029548645, + -0.01094727590680122375, + -0.00146799674257636070, + 0.01402355264872312546, + 0.00317806960083544254, + -0.00444233836606144905, + -0.02452692948281764984, + -0.04583295434713363647, + 0.01059421896934509277, + 0.01110695488750934601, + 0.00007938260387163609, + -0.00965782068669795990, + -0.00733615597710013390, + 0.00550429383292794228, + -0.00003763919812627137, + -0.00426531815901398659, + -0.00090935698244720697, + 0.00937287323176860809, + 0.02081602811813354492, + -0.00486803613603115082, + -0.00960677675902843475, + 0.00341564696282148361, + 0.01250351872295141220, + 0.00649224221706390381, + -0.00302624935284256935, + -0.00228945142589509487, + -0.00932517368346452713, + -0.00372885400429368019, + -0.00362278008833527565, + 0.00046583981020376086, + 0.00371170276775956154, + -0.00463876128196716309, + -0.00269702752120792866, + 0.00000987034400168341, + -0.00170053949113935232, + -0.00453664176166057587, + 0.00030660282936878502, + 0.00285009364597499371, + 0.00129490485414862633, + -0.00278982869349420071, + -0.00138758076354861259, + 0.00086694670608267188, + 0.00646185036748647690, + 0.00813829060643911362, + 0.00434663658961653709, + -0.00491241272538900375, + 0.00442379293963313103 + ], + [ + 0.03239376097917556763, + 0.04422052577137947083, + 0.00695387832820415497, + 0.02880400605499744415, + 0.04852158576250076294, + 0.01235512923449277878, + -0.02877842448651790619, + 0.00605393154546618462, + -0.02107596769928932190, + 0.00884793326258659363, + 0.01217826083302497864, + -0.02754659019410610199, + -0.01119821611791849136, + -0.01899878308176994324, + -0.00949344318360090256, + -0.04788357391953468323, + -0.02935169078409671783, + -0.00328151672147214413, + -0.02497593127191066742, + -0.01356180850416421890, + 0.01649706065654754639, + -0.00663654366508126259, + 0.00854114256799221039, + -0.01498617418110370636, + -0.02950791083276271820, + -0.03257958218455314636, + -0.01356818340718746185, + -0.00681114383041858673, + -0.01000530831515789032, + 0.01236012764275074005, + 0.00854095350950956345, + 0.00976802408695220947, + 0.00788411404937505722, + 0.01856858655810356140, + -0.00301538431085646152, + 0.00516654085367918015, + -0.01157952193170785904, + -0.00684985844418406487, + 0.00655257655307650566, + 0.00227851769886910915, + 0.01013792399317026138, + 0.00739157525822520256, + -0.00641359621658921242, + 0.00353106344118714333, + -0.00149057304952293634, + 0.00935558881610631943, + 0.01250044442713260651, + 0.00937040429562330246, + 0.02104253694415092468, + 0.00525809125974774361, + 0.00480114389210939407, + 0.00918602850288152695, + 0.00642223702743649483, + 0.00428482471033930779, + 0.00334119237959384918, + -0.00359263876453042030, + -0.00270127831026911736, + -0.00369075755588710308, + -0.00298791145905852318, + -0.00499613955616950989, + 0.00089805043535307050, + 0.00303671881556510925, + 0.00758116133511066437, + 0.01491875015199184418 + ], + [ + 0.03240429982542991638, + -0.04423142597079277039, + 0.00694913230836391449, + 0.02881555259227752686, + -0.04853393137454986572, + -0.01235094293951988220, + -0.02878836356103420258, + 0.00604408653452992439, + -0.02107239328324794769, + -0.00886146072298288345, + -0.01216388028115034103, + 0.02755512297153472900, + -0.01119278743863105774, + -0.01900498569011688232, + -0.00950185954570770264, + -0.04788179695606231689, + 0.02933120913803577423, + 0.00330292084254324436, + 0.02498103864490985870, + 0.01356172561645507812, + 0.01650167070329189301, + -0.00662725232541561127, + 0.00854433700442314148, + -0.01498022116720676422, + -0.02951555512845516205, + 0.03256776556372642517, + 0.01357894856482744217, + 0.00680852355435490608, + 0.00999787729233503342, + -0.01236360520124435425, + 0.00854001939296722412, + 0.00976572558283805847, + 0.00789691135287284851, + 0.01857132092118263245, + -0.00299264071509242058, + 0.00513805216178297997, + 0.01159810647368431091, + 0.00684008374810218811, + -0.00655629346147179604, + -0.00229694764129817486, + -0.01013209391385316849, + -0.00739711336791515350, + -0.00641156360507011414, + 0.00352561310864984989, + -0.00149835483171045780, + 0.00936123821884393692, + 0.01249741017818450928, + 0.00939283799380064011, + 0.02101179957389831543, + -0.00522341299802064896, + -0.00482024066150188446, + -0.00918650440871715546, + -0.00644074054434895515, + -0.00427029794082045555, + -0.00333912228234112263, + 0.00359185691922903061, + -0.00270316959358751774, + -0.00368203083053231239, + -0.00300179258920252323, + -0.00499422615393996239, + 0.00088821270037442446, + 0.00303125986829400063, + 0.00758860772475600243, + 0.01491698529571294785 + ], + [ + 0.11320815980434417725, + -0.00000302678904517961, + -0.08640217781066894531, + -0.11564314365386962891, + 0.00000764343712944537, + -0.00000698986059433082, + 0.00620642350986599922, + 0.06042741239070892334, + 0.08872661739587783813, + -0.00001044098189595388, + 0.00001114455335482489, + 0.00000513300210513989, + -0.00116868526674807072, + 0.01712112128734588623, + -0.03334476798772811890, + -0.06916483491659164429, + 0.00001024911853164667, + -0.00001310186598857399, + -0.00000440136500401422, + 0.00000027210737130190, + 0.01521136611700057983, + -0.00855285022407770157, + -0.01512971241027116776, + 0.02247256971895694733, + 0.04912601038813591003, + -0.00000762519448471721, + 0.00001328607322648168, + -0.00000064649896103219, + -0.00000072064295864038, + 0.00000435168112744577, + 0.00013261711865197867, + -0.00789953954517841339, + -0.00176238594576716423, + 0.00449204863980412483, + -0.01346852630376815796, + -0.02715717256069183350, + 0.00000382212601834908, + -0.00001195802997244755, + 0.00000739042206987506, + 0.00000117436184154940, + -0.00000833850754133891, + -0.00000376336811314104, + -0.00661393534392118454, + -0.00551876751706004143, + 0.01083910651504993439, + 0.00942686107009649277, + 0.00317075592465698719, + 0.00073457823600620031, + 0.01004129182547330856, + -0.00000031512138320977, + 0.00000954299866862129, + -0.00001278098443435738, + -0.00000115541365630634, + 0.00001021342905005440, + 0.00000264064919974771, + 0.00000091356218945293, + -0.00178405072074383497, + 0.00560761149972677231, + 0.00070212059654295444, + -0.00814006663858890533, + -0.01186436694115400314, + -0.00236002868041396141, + 0.00716022402048110962, + -0.00024326800485141575 + ], + [ + 0.12102497369050979614, + 0.11477577686309814453, + -0.08304928988218307495, + -0.01723389700055122375, + -0.01011852547526359558, + -0.03914003074169158936, + 0.00304927444085478783, + 0.01004061009734869003, + -0.10242468118667602539, + -0.07510413229465484619, + -0.00978098437190055847, + -0.02546575665473937988, + -0.00768516073003411293, + -0.00548628438264131546, + 0.03649863600730895996, + 0.01407257094979286194, + 0.01135615631937980652, + 0.02211514115333557129, + 0.00272454461082816124, + -0.00089080724865198135, + 0.01232680212706327438, + 0.00326031143777072430, + 0.00511698704212903976, + 0.01070878840982913971, + 0.04933306947350502014, + 0.02400941587984561920, + 0.01370012480765581131, + 0.00110072700772434473, + 0.00652111135423183441, + 0.00743640633299946785, + 0.00508429994806647301, + 0.00591764692217111588, + 0.01104772090911865234, + 0.00037555117160081863, + -0.01441853120923042297, + -0.00860813260078430176, + -0.00393183389678597450, + -0.00432269228622317314, + 0.00110732985194772482, + 0.01104066334664821625, + 0.00293282256461679935, + 0.00565836951136589050, + -0.00172208633739501238, + -0.00564944976940751076, + -0.00601623998954892159, + -0.00642779469490051270, + 0.00342666078358888626, + -0.01123249158263206482, + -0.00688037322834134102, + 0.00368668627925217152, + -0.00785307493060827255, + 0.00047028998960740864, + -0.00480525614693760872, + -0.00510504143312573433, + -0.00233471719548106194, + 0.00068994209868833423, + -0.00224527204409241676, + -0.00148216297384351492, + -0.00323048024438321590, + -0.00544178532436490059, + -0.01087999809533357620, + -0.00252493144944310188, + -0.00010722524893935770, + 0.00047246369649656117 + ], + [ + 0.12101804465055465698, + -0.11476867645978927612, + -0.08304852247238159180, + -0.01722818799316883087, + 0.01011285372078418732, + 0.03913991153240203857, + 0.00305179692804813385, + 0.01004218123853206635, + -0.10242519527673721313, + 0.07511141896247863770, + 0.00977601669728755951, + 0.02546193078160285950, + -0.00767989736050367355, + -0.00548042915761470795, + 0.03649460896849632263, + 0.01407164894044399261, + -0.01136145275086164474, + -0.02210596576333045959, + -0.00273149018175899982, + 0.00088769494323059916, + 0.01232782378792762756, + 0.00324839726090431213, + 0.00511136325076222420, + 0.01070540584623813629, + 0.04934294149279594421, + -0.02401684038341045380, + -0.01370403729379177094, + -0.00109002331737428904, + -0.00650728307664394379, + -0.00744476728141307831, + 0.00508039398118853569, + 0.00591966090723872185, + 0.01104756724089384079, + 0.00037424592301249504, + -0.01440785638988018036, + -0.00861788168549537659, + 0.00394269824028015137, + 0.00431659119203686714, + -0.00111479067709296942, + -0.01104546803981065750, + -0.00293217645958065987, + -0.00565041461959481239, + -0.00173149944748729467, + -0.00565498322248458862, + -0.00602011382579803467, + -0.00641823327168822289, + 0.00343794538639485836, + -0.01124369353055953979, + -0.00688273832201957703, + -0.00368951121345162392, + 0.00786620564758777618, + -0.00047629678738303483, + 0.00479673827067017555, + 0.00510751921683549881, + 0.00234134518541395664, + -0.00068597594508901238, + -0.00224431813694536686, + -0.00146976823452860117, + -0.00322874588891863823, + -0.00543785886839032173, + -0.01088554505258798599, + -0.00254106777720153332, + -0.00010471042332937941, + 0.00048062860150821507 + ], + [ + 0.03823474794626235962, + 0.03187474980950355530, + 0.04089117422699928284, + 0.03427171707153320312, + 0.03653768450021743774, + 0.04081404581665992737, + 0.01189336646348237991, + 0.04275364056229591370, + 0.00325565971434116364, + 0.02218830399215221405, + 0.04993490129709243774, + 0.02536705508828163147, + -0.01420121919363737106, + 0.02482498250901699066, + 0.00301166996359825134, + -0.01602412201464176178, + 0.00490671582520008087, + 0.02999027818441390991, + 0.03650078549981117249, + 0.00373037299141287804, + -0.01845825649797916412, + 0.00175561464857310057, + 0.00000049981491656581, + -0.02379847690463066101, + -0.01914730481803417206, + -0.00574001949280500412, + 0.00516914296895265579, + 0.02142363972961902618, + 0.01339192502200603485, + -0.00648570014163851738, + -0.00841861125081777573, + -0.00743031501770019531, + -0.00225081387907266617, + -0.02044946886599063873, + -0.02678047493100166321, + -0.01271659694612026215, + -0.00854636449366807938, + -0.00868586171418428421, + 0.00127533054910600185, + 0.00764723354950547218, + 0.00072201585862785578, + -0.00486515415832400322, + -0.00027963044703938067, + -0.00406514061614871025, + -0.00155360694043338299, + -0.01120263524353504181, + -0.02044701389968395233, + -0.01618387550115585327, + -0.00454626558348536491, + -0.00652281939983367920, + -0.01076653320342302322, + -0.00749076716601848602, + -0.00239693326875567436, + 0.00137506844475865364, + 0.00048401401727460325, + -0.00102192722260951996, + 0.00072872545570135117, + 0.00012669610441662371, + 0.00048412196338176727, + -0.00444584200158715248, + -0.00871635042130947113, + -0.00963514018803834915, + -0.00486033363267779350, + 0.00103001715615391731 + ], + [ + 0.03822791576385498047, + -0.03186966478824615479, + 0.04088449105620384216, + 0.03426788374781608582, + -0.03653265908360481262, + -0.04080950468778610229, + 0.01188989076763391495, + 0.04275313764810562134, + 0.00325486692599952221, + -0.02218409255146980286, + -0.04993303492665290833, + -0.02536479942500591278, + -0.01420719083398580551, + 0.02483038790524005890, + 0.00301250279881060123, + -0.01602375134825706482, + -0.00490302639082074165, + -0.02998798340559005737, + -0.03650434687733650208, + -0.00372582348063588142, + -0.01847072876989841461, + 0.00176017137710005045, + 0.00000587770318816183, + -0.02380034886300563812, + -0.01914648525416851044, + 0.00574311986565589905, + -0.00516308331862092018, + -0.02142616547644138336, + -0.01339503191411495209, + 0.00649569928646087646, + -0.00843247398734092712, + -0.00743417441844940186, + -0.00224194396287202835, + -0.02044957503676414490, + -0.02678380534052848816, + -0.01271522045135498047, + 0.00854803062975406647, + 0.00869627017527818680, + -0.00127208884805440903, + -0.00765171553939580917, + -0.00072013773024082184, + 0.00487778894603252411, + -0.00028629839653149247, + -0.00407550763338804245, + -0.00154729292262345552, + -0.01119642145931720734, + -0.02044899575412273407, + -0.01618505455553531647, + -0.00454480201005935669, + 0.00652313837781548500, + 0.01077846996486186981, + 0.00749965710565447807, + 0.00239360216073691845, + -0.00137783808168023825, + -0.00047965475823730230, + 0.00103314779698848724, + 0.00073176372097805142, + 0.00011957731476286426, + 0.00048437964869663119, + -0.00443928549066185951, + -0.00870899297297000885, + -0.00963459815829992294, + -0.00485669262707233429, + 0.00102971738670021296 + ], + [ + 0.04416621848940849304, + -0.00000196840733224235, + 0.04441894218325614929, + 0.05566719919443130493, + -0.00000332029890159902, + -0.00000162266655934218, + 0.00802783016115427017, + 0.06569921970367431641, + 0.04400639608502388000, + -0.00000364653647011437, + -0.00000282796668216179, + -0.00000009451760973889, + -0.01984800957143306732, + 0.03262102603912353516, + 0.05616516619920730591, + 0.03198552876710891724, + -0.00000311281064568902, + -0.00000269574957201257, + -0.00000079875667324814, + 0.00000067332200615056, + -0.01875725574791431427, + -0.00337755866348743439, + 0.03541867807507514954, + 0.04231523722410202026, + 0.02121961861848831177, + -0.00000214405281440122, + -0.00000121517462048359, + -0.00000086875400029385, + 0.00000022306319635845, + 0.00000056103021961462, + -0.00414814334362745285, + -0.01206964347511529922, + 0.00798735953867435455, + 0.02917726151645183563, + 0.02824143320322036743, + 0.01239884924143552780, + -0.00000123533948226395, + 0.00000105947685824503, + 0.00000018554118241809, + -0.00000060809873048129, + 0.00000069488305598497, + 0.00000001441140540237, + 0.00244903960265219212, + -0.00228783464990556240, + -0.00173095404170453548, + 0.00994849111884832382, + 0.01965933479368686676, + 0.01611355692148208618, + 0.00572343263775110245, + -0.00000072502302828070, + 0.00000314748376695206, + 0.00000240639587900660, + -0.00000136172241127497, + 0.00000028975142640775, + 0.00000066525188913147, + -0.00000120427637284592, + -0.00065475510200485587, + 0.00315915746614336967, + 0.00284748314879834652, + 0.00251126196235418320, + 0.00693463068455457687, + 0.01041267439723014832, + 0.00686440058052539825, + 0.00109652744140475988 + ], + [ + 0.07281720638275146484, + 0.00000479510708828457, + 0.11256048083305358887, + 0.00000158623981860728, + 0.00000262338312495558, + 0.00000748489901525318, + 0.11455319076776504517, + 0.00000166379084021173, + -0.00000170267958310433, + 0.00000758178020987543, + 0.00000451263395007118, + 0.00000681224310028483, + 0.09189040958881378174, + -0.00000050595411948962, + -0.00000308924268210831, + -0.00000076674194815496, + -0.00000292071240437508, + 0.00001504963165643858, + 0.00000436275331594516, + 0.00000361774209522991, + 0.05685766041278839111, + -0.00000425718644692097, + -0.00000344748195857392, + -0.00000150183529967762, + 0.00000384549684895319, + -0.00000103230252079811, + -0.00000655638314128737, + 0.00001840779259509873, + 0.00000157421288804471, + 0.00000069087155907255, + 0.02194879762828350067, + -0.00000763839307182934, + -0.00000242998362409708, + -0.00000179261314769974, + 0.00000840832399262581, + 0.00000162672517944884, + 0.00000109700692974002, + -0.00000224292762140976, + -0.00000952730351855280, + 0.00001382416758133331, + -0.00000273904629466415, + 0.00000057070320735875, + -0.00341858575120568275, + -0.00000867986818775535, + -0.00000061376175608530, + -0.00000127483770029357, + 0.00001176234582089819, + 0.00000408288269682089, + -0.00000074871593369608, + -0.00000251556730290758, + 0.00000284353677670879, + -0.00000298471513815457, + -0.00000977909439825453, + 0.00000187434784493234, + -0.00000629932992524118, + 0.00000355144538843888, + -0.01525186095386743546, + -0.00000672792975819902, + 0.00000085505195102087, + -0.00000008109199001183, + 0.00001135606271418510, + 0.00000681638539390406, + -0.00000182859673714120, + -0.00000030995465749584 + ], + [ + 0.04255681112408638000, + 0.04173205420374870300, + 0.04346428066492080688, + -0.03260423988103866577, + -0.03937913849949836731, + 0.04838372394442558289, + 0.00908870156854391098, + -0.04135344177484512329, + -0.01176848635077476501, + 0.00809266697615385056, + -0.05251901596784591675, + 0.02256275899708271027, + -0.01829426735639572144, + -0.02511933818459510803, + -0.01044798828661441803, + 0.02822538092732429504, + 0.01356768235564231873, + 0.01632467471063137054, + -0.03641969338059425354, + -0.00429996335878968239, + -0.01866151578724384308, + -0.00311706238426268101, + 0.00066450319718569517, + 0.03606395423412322998, + -0.01393706444650888443, + -0.01132219750434160233, + 0.01430916599929332733, + 0.01998918130993843079, + -0.01139316800981760025, + -0.00946002360433340073, + -0.00531163858249783516, + 0.00666854996234178543, + 0.00821592286229133606, + 0.02238329127430915833, + -0.02186447009444236755, + -0.00355935981497168541, + 0.00067853479413315654, + -0.01525670103728771210, + 0.00354918185621500015, + 0.01601615920662879944, + 0.00055392348440364003, + -0.00086133641889318824, + 0.00169973995070904493, + 0.00450497027486562729, + 0.00485236942768096924, + 0.00415507657453417778, + -0.02004948817193508148, + -0.00128066120669245720, + 0.00642480840906500816, + 0.00256504514254629612, + 0.00234015495516359806, + -0.01016800384968519211, + -0.00661959685385227203, + 0.00773026188835501671, + -0.00104010058566927910, + 0.00334537657909095287, + -0.00026996177621185780, + 0.00068530446151271462, + -0.00250769080594182014, + -0.00163134676404297352, + -0.01165615394711494446, + 0.00466040754690766335, + 0.00732497591525316238, + -0.00113260210491716862 + ], + [ + 0.04257141426205635071, + -0.04174359142780303955, + 0.04347521066665649414, + -0.03262184560298919678, + 0.03938955441117286682, + -0.04839505255222320557, + 0.00907947029918432236, + -0.04137481003999710083, + -0.01176173239946365356, + -0.00809803884476423264, + 0.05253594368696212769, + -0.02256058901548385620, + -0.01831789687275886536, + -0.02512573823332786560, + -0.01043687388300895691, + 0.02821734733879566193, + -0.01355526223778724670, + -0.01633682288229465485, + 0.03642925620079040527, + 0.00431525940075516701, + -0.01867849752306938171, + -0.00310342013835906982, + 0.00067347654839977622, + 0.03605738654732704163, + -0.01392675563693046570, + 0.01130340341478586197, + -0.01429543178528547287, + -0.01999925449490547180, + 0.01138660591095685959, + 0.00947435852140188217, + -0.00531075987964868546, + 0.00668587349355220795, + 0.00821567419916391373, + 0.02238157205283641815, + -0.02185708656907081604, + -0.00355823175050318241, + -0.00066876353230327368, + 0.01523929182440042496, + -0.00354460417293012142, + -0.01601284556090831757, + -0.00056559278164058924, + 0.00086713751079514623, + 0.00170818588230758905, + 0.00450738565996289253, + 0.00484438287094235420, + 0.00415645306929945946, + -0.02004782855510711670, + -0.00128087343182414770, + 0.00641181739047169685, + -0.00256273522973060608, + -0.00232900679111480713, + 0.01016344223171472549, + 0.00661271484568715096, + -0.00771739613264799118, + 0.00103950570337474346, + -0.00333954370580613613, + -0.00026695750420913100, + 0.00067421921994537115, + -0.00251012342050671577, + -0.00162596325390040874, + -0.01165342703461647034, + 0.00465370528399944305, + 0.00731671648100018501, + -0.00112236768472939730 + ], + [ + 0.04146321862936019897, + 0.05115205422043800354, + 0.04280475899577140808, + 0.00543248094618320465, + 0.01005687471479177475, + 0.06237914413213729858, + 0.00977543648332357407, + 0.00422528292983770370, + -0.03881517797708511353, + -0.02622063457965850830, + 0.00899330340325832367, + 0.03412314504384994507, + -0.01728373952209949493, + -0.00146694970317184925, + -0.05197246372699737549, + -0.01252603624016046524, + -0.01252782158553600311, + -0.03745229542255401611, + -0.00047491249279119074, + 0.00029487765277735889, + -0.01861651800572872162, + -0.00442963140085339546, + -0.03637790679931640625, + -0.01230998057872056961, + 0.01533244457095861435, + 0.00714616989716887474, + -0.01314484886825084686, + -0.02982755005359649658, + -0.00701938150450587273, + -0.01100792922079563141, + -0.00609066197648644447, + -0.00175154802855104208, + -0.01177202817052602768, + -0.00153063470497727394, + 0.02318283542990684509, + 0.01049940939992666245, + 0.00731982337310910225, + 0.01162811648100614548, + -0.00315893930383026600, + -0.01388078741729259491, + -0.00426121382042765617, + -0.00438014091923832893, + 0.00118607981130480766, + 0.00211049313656985760, + 0.00024263488012365997, + 0.00737468153238296509, + 0.02015557140111923218, + 0.01149313244968652725, + -0.00194662902504205704, + 0.00055830151541158557, + 0.00814121309667825699, + 0.01093912869691848755, + 0.00616821506991982460, + -0.00422541471198201180, + 0.00204135640524327755, + 0.00125386530999094248, + -0.00005853497350472026, + 0.00244656740687787533, + -0.00100075290538370609, + 0.00586561812087893486, + 0.01086379773914813995, + 0.00358152389526367188, + -0.00383815472014248371, + -0.00397027423605322838 + ], + [ + 0.04146879911422729492, + -0.05115505680441856384, + 0.04281285405158996582, + 0.00542806135490536690, + -0.01005000434815883636, + -0.06238571181893348694, + 0.00978205259889364243, + 0.00421982677653431892, + -0.03881289809942245483, + 0.02621347270905971527, + -0.00898331310600042343, + -0.03413049504160881042, + -0.01728084683418273926, + -0.00146799080539494753, + -0.05197319015860557556, + -0.01251959241926670074, + 0.01252331584692001343, + 0.03744679316878318787, + 0.00047967347200028598, + -0.00029802307835780084, + -0.01861553266644477844, + -0.00442415662109851837, + -0.03638226166367530823, + -0.01230059936642646790, + 0.01532245147973299026, + -0.00713590672239661217, + 0.01314011123031377792, + 0.02982696518301963806, + 0.00701426528394222260, + 0.01100881770253181458, + -0.00608609383925795555, + -0.00174418662209063768, + -0.01177495345473289490, + -0.00152615038678050041, + 0.02317313849925994873, + 0.01049686968326568604, + -0.00731882173568010330, + -0.01161735318601131439, + 0.00315957167185842991, + 0.01388146635144948959, + 0.00425209524109959602, + 0.00437660422176122665, + 0.00119645532686263323, + 0.00211410527117550373, + 0.00024265093088615686, + 0.00737013574689626694, + 0.02015086263418197632, + 0.01149354781955480576, + -0.00193792022764682770, + -0.00056498055346310139, + -0.00814465247094631195, + -0.01093358825892210007, + -0.00616080360487103462, + 0.00422636093571782112, + -0.00204605516046285629, + -0.00126840907614678144, + -0.00004962267848895863, + 0.00244696461595594883, + -0.00100462068803608418, + 0.00585822062566876411, + 0.01086187828332185745, + 0.00358784082345664501, + -0.00382868479937314987, + -0.00397066259756684303 + ], + [ + 0.05298346653580665588, + 0.00000848548370413482, + 0.04969559237360954285, + -0.06773263961076736450, + -0.00001280817923543509, + 0.00000739041797714890, + 0.00232456275261938572, + -0.07484346628189086914, + 0.05077829211950302124, + 0.00001095926836569561, + -0.00001211442395288032, + -0.00000034558905781523, + -0.02827247977256774902, + -0.02899013645946979523, + 0.06227054819464683533, + -0.03125916421413421631, + -0.00000452411268270225, + 0.00001039404924085829, + -0.00000168355029472878, + -0.00000479839854961028, + -0.01931094750761985779, + 0.01323632895946502686, + 0.03513285145163536072, + -0.04206258431077003479, + 0.01366549450904130936, + -0.00000241708198700508, + -0.00000222398398364021, + 0.00000285380247078137, + 0.00000584206600251491, + -0.00000164754078468832, + 0.00212561874650418758, + 0.01545732095837593079, + 0.00318697653710842133, + -0.02978770248591899872, + 0.02102696336805820465, + -0.00089506176300346851, + 0.00000593861386732897, + -0.00000779416677687550, + 0.00000024601811787761, + -0.00000194711083167931, + 0.00000392816127714468, + 0.00000394288008465082, + 0.00654366286471486092, + -0.00288687227293848991, + -0.00469856802374124527, + -0.01050878595560789108, + 0.01889660768210887909, + -0.00408558826893568039, + -0.00595616362988948822, + -0.00000440360463471734, + 0.00001370260360999964, + -0.00000684525002725422, + -0.00000230854175242712, + -0.00000103199010936805, + -0.00000220993888433441, + 0.00000569973417441361, + -0.00263694999739527702, + -0.00844548083841800690, + 0.00427753711119294167, + -0.00219392520375549793, + 0.01103174686431884766, + -0.00735001778230071068, + -0.00617626123130321503, + 0.00750808184966444969 + ], + [ + 0.08860497921705245972, + -0.00000747947433410445, + -0.09977780282497406006, + 0.04842934012413024902, + -0.00001293482728215167, + 0.00000538772383151809, + 0.04328290000557899475, + -0.05197134613990783691, + 0.04557596892118453979, + -0.00001370072186546167, + 0.00000957633892539889, + 0.00000180435790753108, + 0.00683208042755723000, + 0.01767544820904731750, + -0.05371300131082534790, + 0.03699811547994613647, + -0.00001022499054670334, + 0.00000986349914455786, + 0.00000326969097841356, + -0.00000304119248539791, + -0.01430520042777061462, + 0.01165596395730972290, + 0.02682796493172645569, + -0.04622834920883178711, + 0.02413720823824405670, + -0.00000406403114538989, + 0.00000627687859378057, + 0.00000426427141064778, + -0.00000792049377196236, + -0.00000396203677155427, + -0.00088764715474098921, + -0.01052875909954309464, + 0.00174345017876476049, + 0.02753023430705070496, + -0.03072325326502323151, + 0.01232710387557744980, + 0.00000190461673810205, + -0.00000058965662219634, + 0.00000399669670514413, + -0.00001052573588822270, + -0.00000150046832914086, + 0.00001006257843982894, + 0.00668386043980717659, + -0.00419794535264372826, + -0.00603555468842387199, + -0.00458329962566494942, + 0.01942573301494121552, + -0.01488498784601688385, + 0.00483621750026941299, + 0.00000508786524733296, + -0.00000780161190050421, + 0.00000482265113532776, + -0.00000688650425217929, + 0.00000236881874116079, + 0.00001211616290675011, + -0.00000824065227789106, + 0.00038853811565786600, + 0.00730463443323969841, + -0.00439881859347224236, + -0.00122335250489413738, + -0.00513854529708623886, + 0.00827761180698871613, + -0.00464855739846825600, + 0.00082823954289779067 + ], + [ + 0.08972264081239700317, + 0.04567824304103851318, + -0.09954756498336791992, + 0.03031627275049686432, + 0.04928301647305488586, + -0.04801107570528984070, + 0.04095518216490745544, + -0.03178725019097328186, + -0.00765838101506233215, + 0.02013937197625637054, + -0.05819375067949295044, + 0.01464220322668552399, + 0.00837755575776100159, + 0.00964654795825481415, + 0.00698326714336872101, + -0.02661720104515552521, + -0.00526029150933027267, + -0.02792088873684406281, + 0.02928539924323558807, + 0.01271451357752084732, + -0.01297695469111204147, + 0.00813990551978349686, + -0.00073583144694566727, + 0.03071047551929950714, + -0.01917571760714054108, + -0.00897552911192178726, + 0.00369363953359425068, + 0.02053070999681949615, + 0.00160265271551907063, + -0.01051816251128911972, + -0.00324103306047618389, + -0.00594761734828352928, + -0.00274786259979009628, + -0.01475491095334291458, + 0.02472115866839885712, + -0.00479494687169790268, + -0.00212221173569560051, + 0.01087632123380899429, + 0.00213136756792664528, + -0.00720088230445981026, + -0.00655756937339901924, + -0.00370339886285364628, + 0.00713589088991284370, + -0.00407300284132361412, + 0.00042535894317552447, + -0.00073499255813658237, + -0.01574602164328098297, + 0.00771573791280388832, + 0.00018010413623414934, + -0.00004315430123824626, + 0.00297173531726002693, + -0.00573941646143794060, + -0.00499340100213885307, + 0.00026016548508778214, + -0.00421499833464622498, + 0.00602487241849303246, + 0.00170039106160402298, + 0.00541046401485800743, + 0.00220571411773562431, + 0.00107139104511588812, + 0.00377531629055738449, + -0.00708660529926419258, + 0.00021930043294560164, + -0.00196873885579407215 + ], + [ + 0.08972083032131195068, + -0.04567986726760864258, + -0.09954183548688888550, + 0.03031749650835990906, + -0.04928637295961380005, + 0.04801104962825775146, + 0.04094434529542922974, + -0.03178620710968971252, + -0.00765990233048796654, + -0.02013917639851570129, + 0.05819743126630783081, + -0.01463609561324119568, + 0.00838930625468492508, + 0.00964179541915655136, + 0.00698654539883136749, + -0.02661913819611072540, + 0.00526091270148754120, + 0.02792080491781234741, + -0.02928473241627216339, + -0.01272528991103172302, + -0.01298376545310020447, + 0.00814526341855525970, + -0.00073598034214228392, + 0.03071626834571361542, + -0.01917336508631706238, + 0.00897043012082576752, + -0.00369631219655275345, + -0.02053183317184448242, + -0.00160801503807306290, + 0.01052524428814649582, + -0.00323860393837094307, + -0.00595047883689403534, + -0.00275407102890312672, + -0.01475845556706190109, + 0.02472428046166896820, + -0.00479073682799935341, + 0.00211225450038909912, + -0.01087698154151439667, + -0.00213006837293505669, + 0.00720300106331706047, + 0.00656223343685269356, + 0.00370388152077794075, + 0.00713067315518856049, + -0.00407098513096570969, + 0.00043130785343237221, + -0.00073967204662039876, + -0.01575363241136074066, + 0.00771688064560294151, + 0.00017789939010981470, + 0.00003728080992004834, + -0.00297193648293614388, + 0.00574553618207573891, + 0.00499623967334628105, + -0.00025990590802393854, + 0.00421429518610239029, + -0.00602429592981934547, + 0.00171170593239367008, + 0.00540549727156758308, + 0.00220836931839585304, + 0.00107919692527502775, + 0.00377938733436167240, + -0.00709370849654078484, + 0.00022295613598544151, + -0.00197907793335616589 + ], + [ + 0.02, + 0.0115470054, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + [ + 0.02, + -0.0115470054, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + ], + "Routing": [ + 1, + 2, + 3, + 5, + 6, + 7, + 8, + 9, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 4, + 10 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/5point1.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/5point1.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/5point1.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/5point1.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,349 @@ +{ + "Decoder": { + "Name": "5.1 Decoder", + "Description": "Channel order: L R C LFE LRS RRS", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "SubwooferChannel" : 4, + "Matrix": [ + [ + 0.1835727840662003, + 0.1962659507989883, + -0.00002023239539994393, + 0.1198548227548599, + 0.1316904872655869, + -8.54512791192974e-7, + -0.03784657269716263, + -7.525155979237752e-6, + -0.05580505728721619, + 0.0273569393903017, + 3.906422534782905e-6, + 0.01615919545292854, + -0.00001529296241642442, + -0.00261409068480134, + -0.00001273954057978699, + -0.04994162544608116, + 0.02212232165038586, + 1.541957772133173e-6, + 0.01761613972485065, + -5.089194473839598e-6, + -0.008058404549956322, + 4.304968115320662e-6, + -0.02062506787478924, + -0.00001127914038079325, + -0.01847962848842144, + 0.01706661097705364, + 2.382405000389554e-6, + 0.0003640245122369379, + 6.664946340606548e-6, + 0.004540919791907072, + -0.00001087371947505744, + 0.0004737972631119192, + -9.429877536604181e-6, + -0.01346032042056322, + -0.00001190493185276864, + -0.02747499756515026, + 0.000919832440558821, + -4.451489132861752e-7, + 0.00493537774309516, + -3.405028792258236e-6, + 0.007272735703736544, + -3.315939011372393e-6, + -0.00263583566993475, + 7.672621904930566e-6, + -0.006797285284847021, + -0.00001089116904040566, + -0.006775482092052698, + -0.00001068267192749772, + -0.01935072802007198, + 0.003072859020903707, + 7.223592319860472e-7, + 0.001727826194837689, + 2.723112856983789e-6, + 0.001049467013217509, + 1.931930000864668e-6, + 0.003818130120635033, + -0.00001362185503239743, + -0.0009156291489489377, + -3.554236855052295e-6, + -0.005798544734716415, + -8.115895980154164e-6, + -0.01082264352589846, + -8.780921234574635e-6, + -0.01140359882265329 + ], + [ + 0.1835729330778122, + -0.1962646245956421, + -0.00001472742405894678, + 0.119860514998436, + -0.131694883108139, + 2.104941110303571e-8, + -0.03784090280532837, + -0.00001309808067162521, + -0.05580553784966469, + -0.02735547348856926, + 4.134601283567463e-7, + -0.01616048254072666, + -5.344629244063981e-6, + -0.002600232837721705, + -0.00001323065953329206, + -0.04994357377290726, + -0.02212202362716198, + 6.809029287069279e-7, + -0.01763027906417847, + -3.045632865905645e-7, + -0.008046111091971397, + -2.080298372675315e-6, + -0.02062703482806683, + -0.00001065439209924079, + -0.01847893372178078, + -0.01706675998866558, + -7.713370564488287e-7, + -0.0003573736757971346, + 2.474270672792045e-7, + -0.004551108926534653, + -3.396068223082693e-6, + 0.00048462935956195, + -7.979513611644506e-6, + -0.01346558146178722, + -0.00001001656437438214, + -0.02747587114572525, + -0.0009187821997329593, + 6.79527488500753e-7, + -0.004937799647450447, + 2.851134922821075e-6, + -0.007291384041309357, + -5.359170245355926e-6, + -0.00262620416469872, + 5.242428414931055e-6, + -0.00679755350574851, + -9.384202712681144e-6, + -0.006769374012947083, + -9.5882987807272e-6, + -0.0193515308201313, + -0.003071634797379375, + -4.67331688014383e-7, + -0.001728275790810585, + 1.330402596977365e-6, + -0.001046934747137129, + 3.636781684690504e-6, + -0.003835727460682392, + -0.00001604489989404101, + -0.0009168845717795193, + -5.037477421865333e-7, + -0.005809118039906025, + -5.356833298719721e-6, + -0.01082766242325306, + -7.381940122286323e-6, + -0.01140323560684919 + ], + [ + 0.08563540875911713, + 8.251770850620233e-6, + 0.00001537024581921287, + 0.118137888610363, + 0.00001092279671865981, + -4.321663254813757e-6, + -0.01355757843703032, + -1.915629127324792e-6, + 0.1057497039437294, + 0.00001172471820609644, + -7.715509127592668e-6, + 7.001296125963563e-6, + 0.00002907117413997184, + 0.009390297345817089, + 2.84789825855114e-6, + 0.08909163624048233, + 9.796723134058993e-6, + -6.778948772989679e-6, + 1.095471361622913e-6, + 1.842511352379006e-7, + -0.000548217270988971, + 0.000010044963346445, + 0.02069498971104622, + 7.669635124329943e-6, + 0.07055941969156265, + 5.018072897655657e-6, + -3.366994860698469e-6, + -3.410983708818094e-6, + -7.267401088029146e-6, + 0.0000190193641174119, + 0.00001555805283715017, + 0.005497736856341362, + 0.00001382365371682681, + 0.02318562753498554, + 0.00001459782379242824, + 0.0519632026553154, + -1.61901095907524e-6, + 6.179639200354359e-8, + -3.788811909544165e-6, + -0.00001127396535594016, + 0.00001750433148117736, + 9.975439752452075e-6, + 0.0008986905450001359, + -0.00001082852577383164, + 0.009924359619617462, + 6.311729066510452e-6, + 0.02082160860300064, + 0.00001946098745975178, + 0.03478369489312172, + -8.194625479518436e-6, + 1.962976284630713e-6, + -9.856585165834986e-7, + -8.429323315795045e-6, + 7.020510111033218e-6, + 9.083255463337991e-6, + 0.00001829924804042093, + 0.00002259070788568351, + 0.004058654420077801, + 7.662873940716963e-6, + 0.01140573062002659, + 4.813188297703164e-6, + 0.01601835526525974, + 0.00002010180469369516, + 0.0201298464089632 + ], + [ + 0.2463568150997162, + 0.2106136083602905, + -1.265691139451519e-6, + -0.1790089905261993, + -0.0920080840587616, + -3.355299440954695e-6, + -0.0864509716629982, + -3.663813913590275e-6, + -0.01308957301080227, + -0.006432636175304651, + -4.30720865551848e-6, + -0.008451339788734913, + 5.929731287324103e-6, + 0.009141754359006882, + -2.689918346732156e-6, + -0.01552063971757889, + -0.005542101338505745, + -5.428022177511593e-6, + -0.01645250059664249, + 4.125318753267493e-7, + -0.01149714458733797, + 1.916391283884877e-6, + -0.002771748695522547, + 9.641499900681083e-7, + 0.01462869811803102, + -0.009205627255141735, + -4.559931312542176e-6, + 0.001082501257769763, + 9.743206419443595e-7, + -0.003045216901227832, + 6.27105282546836e-6, + 0.005616145208477974, + 2.86411960814803e-7, + -0.001053939806297421, + 3.453312729106983e-6, + 0.002713631372898817, + 0.004755552858114243, + -6.347908083625953e-7, + -0.002977065509185195, + -1.101715497497935e-6, + -0.003363078692927957, + -1.645071279199328e-6, + -0.004143149126321077, + -2.086441782012116e-6, + -0.003387315897271037, + -1.557899508952687e-6, + 0.007169138174504042, + 4.215041826682864e-6, + 0.002800451125949621, + 0.0006408127374015749, + 4.234051402818295e-7, + -0.0008467927691526711, + -3.080729982229968e-7, + -0.0005842077080160379, + 8.743466423766222e-6, + -0.002480375347658992, + 3.093138332133094e-7, + 0.002002612920477986, + 2.907573559696175e-7, + 0.0005663340562023222, + 5.245200100034708e-6, + -0.0006777937524020672, + 5.81421500100987e-6, + 0.005411919206380844 + ], + [ + 0.2463529855012894, + -0.210605800151825, + -3.404144081287086e-6, + -0.1790167093276978, + 0.09201009571552277, + -1.570191670907661e-6, + -0.08645190298557281, + 2.023775095949532e-6, + -0.01309226546436548, + 0.006440579425543547, + 2.465732677592314e-6, + 0.008462748490273952, + -1.362760826850717e-6, + 0.009133795276284218, + -1.657321718084859e-6, + -0.01551982294768095, + 0.005547115579247475, + 1.115929990191944e-6, + 0.01644010841846466, + -5.835501724504866e-6, + -0.01150926761329174, + 7.456210823875153e-6, + -0.002768430626019835, + -7.14153713943233e-8, + 0.01463171653449535, + 0.009208467788994312, + 2.953185003207182e-6, + -0.001074359635822475, + 2.706489112824784e-6, + 0.003055099863559008, + -1.256817313333158e-6, + 0.005606239661574364, + 3.223242970307183e-7, + -0.001049696584232152, + 8.387576713175804e-7, + 0.002718857955187559, + -0.004756058100610971, + 5.023804305892554e-7, + 0.002971392590552568, + -9.427669283468276e-6, + 0.003362975316122174, + 1.665609374867927e-6, + -0.004150053020566702, + -2.821948783093831e-6, + -0.003387493314221501, + -2.974672725031269e-6, + 0.007162627764046192, + 2.529405037421384e-6, + 0.00280700926668942, + -0.0006431671208702028, + 1.136187506745046e-6, + 0.0008438610821031034, + -1.609714331607393e-6, + 0.0005988735356368124, + 7.544775598944398e-6, + 0.002481003757566214, + 2.96561370305426e-6, + 0.00200005411170423, + -2.538525677664438e-6, + 0.0005741395289078355, + 5.056566010352981e-7, + -0.0006750605534762144, + 4.01540955863311e-6, + 0.005417934153228998 + ] + ], + "Routing": [ + 1, + 2, + 3, + 5, + 6 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/5point1point4.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/5point1point4.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/5point1point4.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/5point1point4.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,617 @@ +{ + "Decoder": { + "Name": "5.1.4 Decoder", + "Description": "Channel order: L R C LFE LRS RRS TL TR TRL TRR", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "SubwooferChannel" : 4, + "Matrix": [ + [ + 0.2131343632936478, + 0.1674741059541702, + -0.116998091340065, + 0.1030930504202843, + 0.09895569831132889, + -0.05179676786065102, + -0.02049557119607925, + -0.01443309150636196, + -0.04926532506942749, + 0.004381249193102121, + -0.02851440571248531, + -0.03579326719045639, + -0.01780759915709496, + -0.02566001377999783, + 0.02800518646836281, + -0.03290984779596329, + 0.009384578093886375, + -0.005163434892892838, + -0.01325422246009111, + -0.007311674300581217, + 0.01569737680256367, + -0.01824660785496235, + 0.003865944920107722, + 0.02330395765602589, + -0.006012026220560074, + 0.00574416434392333, + -0.004061505198478699, + -0.005599016789346933, + -0.01302408613264561, + 0.01026901416480541, + 0.02206166088581085, + 0.002972666407003999, + -0.003738107159733772, + 0.003977301530539989, + 0.01858540810644627, + -0.01691609062254429, + -0.004822124727070332, + 0.001729590469039977, + -0.0002825063420459628, + -0.0001394564169459045, + 0.008678832091391087, + 0.01028678007423878, + 0.003859091550111771, + 0.01589048840105534, + -0.007600294426083565, + 0.002243288094177842, + 0.002485617762431502, + 0.01166260801255703, + -0.009816505014896393, + -3.651362021628302e-6, + 0.0003401100111659616, + -0.001081545022316277, + 0.0004671092028729618, + 0.002936662174761295, + 0.007323960307985544, + 0.00236745341680944, + -0.01051582209765911, + 0.007816862314939499, + 0.004386984743177891, + -0.009450918063521385, + -0.0003131439734715968, + -0.0004713792586699128, + 0.003663951298221946, + -0.0065753567032516 + ], + [ + 0.2131378203630447, + -0.1674749553203583, + -0.1169960275292397, + 0.1030998528003693, + -0.09895913302898407, + 0.05179562047123909, + -0.02050137519836426, + -0.01443195063620806, + -0.04926136136054993, + -0.004386078100651503, + 0.0285143256187439, + 0.03579915687441826, + -0.01781081221997738, + -0.02566314302384853, + 0.02800740115344524, + -0.03290968388319016, + -0.009386975318193436, + 0.005160728003829718, + 0.01325224246829748, + 0.007312167435884476, + 0.01570453122258186, + -0.01824441365897655, + 0.00386469648219645, + 0.02330319583415985, + -0.006014125421643257, + -0.00574782770127058, + 0.004066440742462873, + 0.005606212187558413, + 0.01302505563944578, + -0.01027174014598131, + 0.02206327207386494, + 0.002965877531096339, + -0.003738689469173551, + 0.003971731755882502, + 0.01858300156891346, + -0.01691387034952641, + 0.0048108771443367, + -0.001730288262479007, + 0.0002871394972316921, + 0.0001404949725838378, + -0.008670942857861519, + -0.01029145531356335, + 0.003854754380881786, + 0.0158957876265049, + -0.007597245741635561, + 0.002246623625978827, + 0.002494432730600238, + 0.01167117618024349, + -0.009818447753787041, + 3.673138962767553e-6, + -0.0003433194651734084, + 0.001080694724805653, + -0.0004708112392108887, + -0.002943152561783791, + -0.007329343352466822, + -0.002364087849855423, + -0.010515958070755, + 0.007813847623765469, + 0.004383926279842854, + -0.009444478899240494, + -0.0003122979833278805, + -0.0004742431920021772, + 0.003661262802779675, + -0.006581482011824846 + ], + [ + 0.1385433822870255, + -7.627794730069581e-6, + -0.1096221208572388, + 0.114499643445015, + -0.00001127652285504155, + 6.822429554631526e-7, + 0.01869873329997063, + -0.04773789271712303, + 0.1013377010822296, + -9.330385182693135e-6, + -7.031072755125933e-7, + 6.5787139647e-6, + -0.003952054306864738, + -0.02122083678841591, + -0.04193402826786041, + 0.07587461918592453, + 7.839922773200669e-7, + 6.294983734278503e-8, + 0.0000116498522402253, + 1.209421839121205e-6, + 0.008502040058374405, + 0.007139584515243769, + -0.003518362529575825, + -0.02618056535720825, + 0.04913502559065819, + 0.00001339830760116456, + -5.782316634395102e-7, + 8.298970897158142e-6, + 3.908120902451628e-7, + -9.82128858595388e-6, + -0.0003188119444530457, + 0.006940619554370642, + -0.00403235899284482, + 0.001273841597139835, + -0.01139947865158319, + 0.02714450284838676, + 0.00002178584873036016, + -9.88133933788049e-7, + -1.396012521581724e-6, + -1.120974047807977e-6, + -0.00001333451473328751, + 3.813029252341948e-6, + -0.001505736610852182, + -0.002404434373602271, + 0.007142175454646349, + -0.007360849063843489, + 0.001383096328936517, + -0.002559605985879898, + 0.009687526151537895, + 0.00002168364881072193, + -1.023572622216307e-6, + -0.00001368769062537467, + -6.22471702627081e-7, + -6.877625764900586e-6, + 6.235582532099215e-6, + 3.549399252733565e-6, + 0.0008696673903614283, + -0.002444526180624962, + -0.003929803613573313, + 0.006373327691107988, + -0.00684571685269475, + 0.00198239553719759, + 0.004419095814228058, + -0.0002968320623040199 + ], + [ + 0.2410472482442856, + 0.1583183109760284, + -0.1339948326349258, + -0.1522572338581085, + -0.1029797121882439, + -0.04666431248188019, + -0.03140560537576675, + 0.04206055030226707, + 0.003014175919815898, + 0.006844057701528072, + 0.02853880077600479, + -0.0336250327527523, + -0.006387683097273111, + 0.03662766888737679, + -0.004001487977802753, + -0.0001110766825149767, + -0.005173773970454931, + -0.005297730676829815, + 0.012012779712677, + -0.009282392449676991, + 0.01866131275892258, + 0.009005320258438587, + 0.001171328942291439, + -0.002936179051175714, + 0.02375304326415062, + 0.006415932439267635, + 0.00241460744291544, + -0.004663394764065742, + 0.01502843294292688, + 0.009005321189761162, + 0.019215052947402, + -0.01010269671678543, + -0.001254963572137058, + -0.00213824026286602, + 0.003583651501685381, + -0.006228093989193439, + 0.005745604168623686, + 0.002375342417508364, + 0.0002512884384486824, + -0.002185701625421643, + -0.008133162744343281, + 0.01109582372009754, + 0.0001489237474743277, + -0.01183168217539787, + 0.0004152948968112469, + -0.002018587663769722, + 0.003481453750282526, + -0.003693794598802924, + 0.002700120210647583, + -0.001251366687938571, + -0.001804866245947778, + 0.00008940707630245015, + 0.0005599387804977596, + 0.00323397433385253, + -0.007459593936800957, + 0.003251048969104886, + -0.00873391330242157, + -0.003473407821729779, + 0.001041697338223457, + 0.00296603818424046, + -0.003083861898630857, + -0.0007219695835374296, + 0.001053665182553232, + -0.003808183828368783 + ], + [ + 0.2410495728254318, + -0.1583219468593597, + -0.1339981704950333, + -0.1522519141435623, + 0.1029736176133156, + 0.04666051641106606, + -0.03140822425484657, + 0.04206659644842148, + 0.003009303007274866, + -0.006844535004347563, + -0.0285347867757082, + 0.03362725675106049, + -0.006384389940649271, + 0.03662717342376709, + -0.004007285460829735, + -0.0001115850682253949, + 0.005173736251890659, + 0.005293817725032568, + -0.01200651284307241, + 0.009285535663366318, + 0.01866509206593037, + 0.008998597040772438, + 0.001168618095107377, + -0.002934011863544583, + 0.02374568767845631, + -0.006410667672753334, + -0.002415267983451486, + 0.004664637614041567, + -0.0150279039517045, + -0.009010208770632744, + 0.01921622455120087, + -0.01009664684534073, + -0.00125374342314899, + -0.002125917468219995, + 0.003584468504413962, + -0.006230130326002836, + -0.005737173371016979, + -0.002372789429500699, + -0.0002545110473874956, + 0.002183031756430864, + 0.00812670961022377, + -0.01109185256063938, + 0.0001450065901735798, + -0.01184249669313431, + 0.000416831549955532, + -0.002016216283664107, + 0.003478382946923375, + -0.003702079644426703, + 0.00270344945602119, + 0.001248873537406325, + 0.001807674183510244, + -0.00009408187179360539, + -0.0005604398902505636, + -0.003235979937016964, + 0.007456664927303791, + -0.003249532310292125, + -0.008738766424357891, + -0.003470413386821747, + 0.001048192963935435, + 0.002957399236038327, + -0.003087846795096993, + -0.000720077776350081, + 0.00106138875707984, + -0.003801100421696901 + ], + [ + 0.117279514670372, + 0.07449584454298019, + 0.1312312483787537, + 0.07035288959741592, + 0.03932807967066765, + 0.09107264131307602, + 0.05537265911698341, + 0.08541097491979599, + -0.00138741557020694, + 0.0001816697040339932, + 0.05415387451648712, + 0.04953418299555779, + -0.009774397127330303, + 0.04548725113272667, + -0.002027959330007434, + 0.0006240854854695499, + 0.001003771089017391, + 0.001663930015638471, + 0.03823327645659447, + -0.0002013769262703136, + -0.01477029733359814, + -0.001610805164091289, + -0.001198122394271195, + -0.001145039917901158, + 0.007443945854902267, + 0.0002035427460214123, + 0.001465356792323291, + 0.002715294016525149, + 0.009540459141135216, + -0.01491845212876797, + 0.01081611216068268, + -0.01528681162744761, + 0.0005884714191779494, + -0.002869714051485062, + 0.01044593378901482, + 0.0004524742544163018, + -0.003504063235595822, + 0.002168773673474789, + 0.001205459586344659, + 0.001066681579686701, + -0.006190451327711344, + -0.001492234063334763, + 0.0188657883554697, + -0.00255616893991828, + 0.00159897527191788, + -0.001176108722575009, + 0.007562165148556232, + 0.001984996255487204, + 0.0006965188076719642, + -0.001015517511405051, + -0.003156330203637481, + 0.003927631769329309, + 0.0006409672205336392, + -0.002609690418466926, + -0.002867696806788445, + 0.008020411245524883, + 0.003744025016203523, + 0.006612040568143129, + 0.0009362766286358237, + 0.003057422116398811, + 0.00221218541264534, + 0.003279171884059906, + 0.0006856560939922929, + 0.001114946091547608 + ], + [ + 0.1172831356525421, + -0.07450202107429504, + 0.1312324702739716, + 0.07034012675285339, + -0.03931686282157898, + -0.09107699990272522, + 0.05536960065364838, + 0.08539476245641708, + -0.001394179067574441, + -0.0001834745489759371, + -0.05414193123579025, + -0.04953332245349884, + -0.009777174331247807, + 0.04547782242298126, + -0.002033886732533574, + 0.0006313277408480644, + -0.001012332621030509, + -0.001667905482463539, + -0.03822833672165871, + 0.0002028031449299306, + -0.01477327104657888, + -0.001611095969565213, + -0.001198607846163213, + -0.001135740429162979, + 0.007434080820530653, + -0.00019733706722036, + -0.001474436023272574, + -0.002721208380535245, + -0.00954060535877943, + 0.0149181243032217, + 0.01080748625099659, + -0.01528357993811369, + 0.0005904767313040793, + -0.002863140078261495, + 0.01043628621846437, + 0.0004478311166167259, + 0.003499137004837394, + -0.002164230681955814, + -0.001209995592944324, + -0.001072965678758919, + 0.006190035026520491, + 0.00149436411447823, + 0.01885397918522358, + -0.002552474848926067, + 0.001598927774466574, + -0.001171636045910418, + 0.007553578820079565, + 0.00198423070833087, + 0.0007050136919133365, + 0.001006168546155095, + 0.003150321077555418, + -0.003925491124391556, + -0.0006436511175706983, + 0.002605494810268283, + 0.002864944515749812, + -0.00801501702517271, + 0.003739176550880075, + 0.006619936786592007, + 0.0009353681234642863, + 0.003063006326556206, + 0.002197836525738239, + 0.003283013124018908, + 0.0006924770423211157, + 0.001111702411435544 + ], + [ + 0.1142724975943565, + 0.07219275832176208, + 0.1271106600761414, + -0.07254419475793839, + -0.04206861555576324, + 0.08791207522153854, + 0.0521911047399044, + -0.08749482035636902, + 0.002059323480352759, + 0.002643517684191465, + -0.05781934410333633, + 0.04715748503804207, + -0.01105662994086742, + -0.04552473872900009, + 0.002020535059273243, + -0.001675697625614703, + -0.002144239377230406, + 0.00522055895999074, + -0.04093967378139496, + -0.001194978016428649, + -0.01410663221031427, + 0.003065786324441433, + 0.0004389339010231197, + 0.0002088725450448692, + 0.009581496007740498, + 0.002301763975992799, + -0.002708239480853081, + 0.005659993272274733, + -0.01090091653168201, + -0.01504653412848711, + 0.01273521222174168, + 0.01596005260944366, + -0.0005764058441855013, + 0.00319921295158565, + 0.01285108830779791, + -0.001965663861483335, + 0.003170138224959373, + 0.00474468944594264, + -0.001630060956813395, + 0.002698080381378531, + 0.005251675378531218, + -0.001397814834490418, + 0.02082083560526371, + 0.001358179259113967, + -6.080494586058194e-6, + 0.00265667331404984, + 0.008282425813376904, + -0.004322445951402187, + 0.0006700933445245028, + -0.001809847657568753, + 0.002449668245390058, + 0.005313228815793991, + -0.0003073486732318997, + -0.001670917263254523, + 0.00182314938865602, + 0.008180703036487103, + 0.004649169277399778, + -0.0083226403221488, + 0.0009004523744806647, + -0.001861077616922557, + 0.001090868026949465, + -0.005125280003994703, + 0.001092267222702503, + -0.00189383898396045 + ], + [ + 0.1142620146274567, + -0.07219088822603226, + 0.127106249332428, + -0.07253754138946533, + 0.04208158701658249, + -0.08791543543338776, + 0.05220003426074982, + -0.08748643100261688, + 0.002056184224784374, + -0.002651892136782408, + 0.05782745406031609, + -0.04716665670275688, + -0.0110476715490222, + -0.045518659055233, + 0.002015415579080582, + -0.001663944683969021, + 0.002145974198356271, + -0.005226722918450832, + 0.04093541204929352, + 0.001188577967695892, + -0.01410672161728144, + 0.003069469472393394, + 0.0004330530355218798, + 0.0002135957474820316, + 0.009582218714058399, + -0.002314304001629353, + 0.002712389919906855, + -0.00565691152587533, + 0.01089642476290464, + 0.015049091540277, + 0.01273586973547935, + 0.01596160605549812, + -0.0005820627557113767, + 0.003187509952113032, + 0.01285232231020927, + -0.001968233846127987, + -0.003163420828059316, + -0.004753136076033115, + 0.001636724337004125, + -0.002691986737772822, + -0.005244079977273941, + 0.001404855633154511, + 0.02083195745944977, + 0.001354943378828466, + -9.945854799298104e-6, + 0.002641543745994568, + 0.00828951969742775, + -0.00432283990085125, + 0.0006638308404944837, + 0.00181074975989759, + -0.00244504795409739, + -0.005310703068971634, + 0.0003152824356220663, + 0.001668114680796862, + -0.001811727415770292, + -0.008176333270967007, + 0.004661530256271362, + -0.008332506753504276, + 0.0009008821216411889, + -0.00186099810525775, + 0.001105490024201572, + -0.005123547744005919, + 0.001086531090550125, + -0.001894972752779722 + ] + ], + "Routing": [ + 1, + 2, + 3, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/7point1.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/7point1.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/7point1.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/7point1.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,483 @@ +{ + "Decoder": { + "Name": "7.1 Decoder", + "Description": "Channel order: L R C LFE LRS RRS LS RS", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "SubwooferChannel" : 4, + "Matrix": [ + [ + 0.1247100457549095, + 0.1156333684921265, + -0.00001732831697154325, + 0.1220642551779747, + 0.1349939107894897, + 2.276328132211347e-6, + -0.02509522438049316, + -9.187912837660406e-6, + 0.01104891113936901, + 0.07653194665908813, + 3.176553263983806e-6, + 0.01142172608524561, + -0.00001426382004865445, + 0.0005167138879187405, + -0.0000113395944936201, + -0.0539543516933918, + 0.01769397594034672, + 4.023310793854762e-6, + 0.0227437075227499, + 1.835525836213492e-6, + -0.00332503579556942, + -9.756521421877551e-7, + -0.008843930438160896, + -0.00001205112857860513, + -0.05033057183027267, + -0.0005822542007081211, + 1.639125798647001e-6, + 0.011294218711555, + -1.150469415733824e-6, + 0.004953095223754644, + -0.00001645842348807491, + 0.001491092727519572, + -9.249350114259869e-6, + -0.01935980468988419, + -0.00001273622001463082, + -0.02312725223600864, + 0.004541286733001471, + 6.480582896983833e-7, + -0.0008916010847315192, + 2.891224539780524e-6, + 0.009377460926771164, + 2.541055664551095e-6, + -0.0008882987895049155, + 6.440585366362939e-6, + -0.003331201616674662, + -7.095425189618254e-6, + -0.01371833030134439, + -0.00001055760640156223, + -0.01151451840996742, + 0.005410703364759684, + 6.624863431170525e-7, + -0.001142910216003656, + 2.936938471975736e-6, + 0.005089737474918365, + -6.108877641963772e-6, + 0.004304434172809124, + -0.00002504302028683014, + 0.0001156914368038997, + -0.00001010729920380982, + -0.008191497996449471, + -0.00001528158645669464, + -0.005706622265279293, + -0.00001051885828928789, + -0.01375880744308233 + ], + [ + 0.1247239336371422, + -0.1156497895717621, + -0.00001472433177696075, + 0.1220667958259583, + -0.1349934190511703, + -1.288488874706673e-6, + -0.0250899400562048, + -0.00001314271685259882, + 0.01103533338755369, + -0.07651913911104202, + 9.390388413521578e-7, + -0.01142883859574795, + -8.023525879252702e-6, + 0.0005280375480651855, + -0.00001549333319417201, + -0.05395233258605003, + -0.01769709587097168, + 3.260402763771708e-6, + -0.02274879813194275, + 2.806157453960623e-6, + -0.003316686255857348, + -7.632826850567653e-7, + -0.008842228911817074, + -9.987480552808847e-6, + -0.05031812936067581, + 0.0005695740110240877, + -1.467264155508019e-6, + -0.01129832677543163, + 1.60983208985499e-8, + -0.004973653238266706, + -4.330408501118654e-6, + 0.001509967027232051, + -7.766344424453564e-6, + -0.01935970224440098, + -7.266725333465729e-6, + -0.02313168905675411, + -0.004536372609436512, + -2.411039076832822e-6, + 0.0008906878647394478, + 4.077669927937677e-6, + -0.009391854517161846, + 7.566279123238928e-7, + -0.0008939043618738651, + 0.00001073208932211855, + -0.003336124354973435, + -8.049911230045836e-6, + -0.01372120156884193, + -0.00001073491330316756, + -0.01152807474136353, + -0.005397038068622351, + 1.610948061170348e-6, + 0.001145445159636438, + 4.340551242876245e-7, + -0.005098059773445129, + -6.180822310852818e-6, + -0.004320260137319565, + -9.368234714202117e-6, + 0.0001332847023149952, + 3.26376380144211e-6, + -0.008194556459784508, + -5.534343927138252e-6, + -0.005707568489015102, + -0.00001036150842992356, + -0.01375462021678686 + ], + [ + 0.08563337475061417, + 8.251575309259351e-6, + 0.00001536988202133216, + 0.1181350871920586, + 0.00001092253751266981, + -4.321560936659807e-6, + -0.01355725713074207, + -1.915583652589703e-6, + 0.1057471930980682, + 0.0000117244399007177, + -7.715326319157612e-6, + 7.00113014318049e-6, + 0.0000290704847429879, + 0.009390074759721756, + 2.847830728569534e-6, + 0.0890895277261734, + 9.796491212910041e-6, + -6.778787792427465e-6, + 1.095445441023912e-6, + 1.842467582946483e-7, + -0.0005482042324729264, + 0.00001004472505883314, + 0.02069449983537197, + 7.669453225389589e-6, + 0.07055775076150894, + 5.017953753849724e-6, + -3.366915052538388e-6, + -3.410902763789636e-6, + -7.26722873878316e-6, + 0.00001901891300803982, + 0.00001555768540129066, + 0.005497606471180916, + 0.00001382332629873417, + 0.02318507805466652, + 0.00001459747727494687, + 0.05196196958422661, + -1.61897253292409e-6, + 6.179492828550792e-8, + -3.788722096942365e-6, + -0.00001127369796449784, + 0.00001750391675159335, + 9.975203283829615e-6, + 0.0008986691827885807, + -0.00001082826929632574, + 0.009924123995006084, + 6.31157945463201e-6, + 0.02082111500203609, + 0.00001946052543644328, + 0.03478286787867546, + -8.194431757146958e-6, + 1.962929673027247e-6, + -9.856350970949279e-7, + -8.429123226960655e-6, + 7.020343673502794e-6, + 9.083039913093671e-6, + 0.00001829881330195349, + 0.00002259017128380947, + 0.004058558493852615, + 7.662692041776609e-6, + 0.01140546053647995, + 4.813074156118091e-6, + 0.0160179752856493, + 0.00002010132811847143, + 0.020129369571805 + ], + [ + 0.125044122338295, + 0.1719053983688354, + -6.644491350016324e-6, + 0.01072375010699034, + 0.01807435601949692, + -7.394652129733004e-6, + -0.03872308880090714, + -7.358165703408304e-7, + -0.1355278789997101, + -0.08815377950668335, + -2.47987395596283e-6, + -0.005030196625739336, + 1.428383825441415e-6, + -0.009483424946665764, + -3.46525348504656e-6, + -0.01655526831746101, + -0.007466370239853859, + -7.933785127534065e-6, + -0.01163783203810453, + -9.55409268499352e-6, + -0.00475060660392046, + 9.409310223418288e-6, + -0.01577771827578545, + 1.028064502861525e-6, + 0.04472066462039948, + 0.01423724554479122, + -3.32823151438788e-6, + -0.01864507049322128, + 0.00001211178096127696, + -0.0005244587082415819, + 0.00001050007631420158, + -0.0009046233608387411, + 1.742203494359273e-6, + 0.009591965936124325, + 4.192195319774328e-6, + -0.003668332006782293, + -0.01108239032328129, + -2.373284360146499e-6, + 0.006846482865512371, + -6.579930868610973e-6, + -0.002829453209415078, + -3.138773308819509e-6, + -0.002639853628352284, + 2.013844778048224e-6, + -0.004881116561591625, + -5.234396212472348e-6, + 0.0121299410238862, + 5.115542080602609e-6, + 0.001445311820134521, + 0.005997776985168457, + 2.258898575746571e-6, + 0.003571235574781895, + -9.253392363461899e-7, + -0.006140760146081448, + 0.00001151179549196968, + -0.000776633620262146, + 0.00001239711218659068, + -0.001867997227236629, + 3.052967258554418e-6, + 0.003327178303152323, + 7.228869890241185e-6, + -0.005052681546658278, + 5.297529696690617e-6, + 0.01205192692577839 + ], + [ + 0.1250298470258713, + -0.1718924641609192, + 9.119144124269951e-7, + 0.01072252076119184, + -0.01807441189885139, + -8.45396073145821e-8, + -0.03872854262590408, + -1.321247623309318e-6, + -0.1355290859937668, + 0.08816170692443848, + 1.491632588113134e-6, + 0.005046742502599955, + 3.996989562438102e-6, + -0.009477246552705765, + -2.870428090773203e-7, + -0.01655827462673187, + 0.007472996599972248, + 1.018344278236327e-6, + 0.01162177603691816, + -5.178715582587756e-6, + -0.004743746947497129, + 1.138304241976584e-6, + -0.01577440835535526, + 3.450058372322928e-8, + 0.04472515359520912, + -0.01423386484384537, + 2.209846115874825e-6, + 0.01865271665155888, + -3.193575139448512e-6, + 0.0005389876896515489, + -1.723405830489355e-6, + -0.0009205946698784828, + 1.499549284744717e-6, + 0.009584235958755016, + -4.86621559048217e-7, + -0.003662407165393233, + 0.01108276564627886, + 4.20329752159887e-6, + -0.006851442623883486, + -5.18966453455505e-6, + 0.002825404750183225, + -6.489960469480138e-6, + -0.002617415506392717, + -0.00001033109401760157, + -0.00487607391551137, + -2.206682893302059e-6, + 0.01213769149035215, + 3.191495352439233e-6, + 0.00145298580173403, + -0.006002514157444239, + -1.939052935995278e-6, + -0.003572994843125343, + -2.203834355896106e-6, + 0.006156403105705976, + 0.00001565591628605034, + 0.0007751290686428547, + -9.631459761294536e-6, + -0.001902192598208785, + -5.785118446510751e-6, + 0.003316047601401806, + -1.53309008510405e-6, + -0.005061488598585129, + 6.142880920378957e-6, + 0.01205914933234453 + ], + [ + 0.1601133197546005, + 0.09381464868783951, + 4.154684120294405e-6, + -0.1915152966976166, + -0.1137058585882187, + 2.810961859722738e-6, + -0.06652813404798508, + -2.816786036419217e-6, + 0.07919143885374069, + 0.05572371184825897, + -2.264338263557875e-6, + -0.01467252429574728, + 4.063506366946967e-6, + 0.01789657399058342, + 6.507551688628155e-7, + 0.006722507998347282, + 0.009436933323740959, + 2.307628619746538e-6, + -0.006130654364824295, + 7.201795142464107e-6, + -0.004792885854840279, + -5.040197720518336e-6, + 0.01549618411809206, + 2.55257987191726e-7, + -0.02118153311312199, + -0.02749543264508247, + -2.160195663236664e-6, + 0.0188131108880043, + -7.693028237554245e-6, + -0.00183330150321126, + 6.533618801540797e-8, + 0.006793906912207603, + 6.160473908778386e-9, + -0.009421944618225098, + -1.353331413156411e-6, + -0.001853985828347504, + 0.008630247786641121, + 7.781019917274534e-7, + -0.009264625608921051, + 5.822322236781474e-6, + -0.0003452128148637712, + 6.558332188433269e-6, + -0.001835503266192973, + -4.864658876613248e-6, + 0.000782845716457814, + 1.696819140306616e-6, + -0.004234346561133862, + 1.510154788775253e-6, + 0.01256418786942959, + 0.007660035975277424, + 1.234104843206296e-6, + -0.005360366310924292, + 2.375367245122106e-7, + 0.004576594568789005, + -2.789229483823874e-6, + -0.001867634477093816, + -0.00001518022691016085, + 0.003439286490902305, + -8.859688023221679e-6, + -0.002762055490165949, + -3.267068905188353e-6, + 0.004756701178848743, + 4.080802114003745e-7, + -0.002132919849827886 + ], + [ + 0.1601294726133347, + -0.09383247792720795, + -3.135952056254609e-6, + -0.1915212273597717, + 0.1137079373002052, + -3.862960511469282e-6, + -0.0665331706404686, + 3.064033080590889e-6, + 0.07917341589927673, + -0.05570525676012039, + 1.9700744360307e-6, + 0.01467948779463768, + -6.865258001198526e-6, + 0.01788598299026489, + -4.172739409114001e-6, + 0.006727628409862518, + -0.009440797381103039, + 2.582000661277561e-6, + 0.006129092071205378, + 1.095011270990653e-6, + -0.004805970471352339, + 7.628702405781951e-6, + 0.01550203189253807, + 1.602959741831e-6, + -0.02116462215781212, + 0.02747705020010471, + -9.660185469329008e-7, + -0.01881385780870914, + 3.107293196080718e-6, + 0.001827841624617577, + 1.882573883449368e-6, + 0.006798884365707636, + -4.945904379383137e-7, + -0.009411458857357502, + 2.567425099186949e-6, + -0.001858227886259556, + -0.008625457994639874, + -3.635219627540209e-6, + 0.009260739199817181, + -2.604922656246345e-6, + 0.000344663712894544, + 5.937964488111902e-6, + -0.001859159674495459, + 4.234058906149585e-6, + 0.0007765325717628002, + -2.998630634465371e-6, + -0.004249743651598692, + -1.480958189858939e-6, + 0.01254552416503429, + -0.007640199735760689, + 2.758805976554868e-6, + 0.005362811498343945, + -2.798956586502754e-7, + -0.004571453668177128, + -3.568385864127777e-6, + 0.001863400684669614, + 9.375492481922265e-6, + 0.003461923915892839, + 3.110063289568643e-6, + -0.002748837228864431, + 5.75082958675921e-6, + 0.004763651173561811, + -1.963136810445576e-6, + -0.002125859726220369 + ] + ], + "Routing": [ + 1, + 2, + 3, + 7, + 8, + 5, + 6 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/7point1point4.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/7point1point4.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/7point1point4.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/7point1point4.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,751 @@ +{ + "Decoder": { + "Name": "7.1.4 Decoder", + "Description": "Channel order: L R C LFE LRS RRS LS RS TL TR TRL TRR", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "SubwooferChannel" : 4, + "Matrix": [ + [ + 0.07602158188819885, + 0.0729529932141304, + -0.03254383429884911, + 0.08391683548688889, + 0.09641458839178085, + -0.03169817104935646, + -0.03714026138186455, + -0.03727851063013077, + 0.01422078907489777, + 0.06404634565114975, + -0.03950107842683792, + -0.01754380576312542, + 0.01850355044007301, + -0.02011017128825188, + -0.007169399876147509, + -0.03884304314851761, + 0.01810699515044689, + -0.0234779566526413, + -0.01145872659981251, + 0.004681415855884552, + 0.01166571583598852, + 0.006182819604873657, + -0.00161024066619575, + 0.01146614551544189, + -0.04643530026078224, + -0.005146782379597425, + -0.00770674692466855, + -0.002584397327154875, + -0.004428152926266193, + 0.008993078954517841, + 0.0004880805499851704, + 0.01051362603902817, + 0.0003166971437167376, + 0.001664615701884031, + 0.009405205026268959, + -0.02709770761430264, + -0.005370182916522026, + -0.005631642416119576, + 0.0003689444274641573, + -0.0080417450517416, + 0.01121861301362514, + 0.001802101964130998, + -0.007477368228137493, + 0.001515639247372746, + 0.002028647810220718, + 0.006358061451464891, + -0.0009661444346420467, + 0.001849257503636181, + -0.01113015692681074, + -0.001170566654764116, + -0.009534263052046299, + -0.0008232159889303148, + -0.002622353611513972, + 0.007076071109622717, + 0.001953020226210356, + -0.00340651860460639, + -0.001659130211919546, + -0.004246472381055355, + -0.0003077496658079326, + -0.003357808571308851, + 0.01074563898146152, + -0.002376009244471788, + 0.002130096079781651, + -0.007647058460861444 + ], + [ + 0.07602200657129288, + -0.07295776158571243, + -0.03254181891679764, + 0.08391617238521576, + -0.09641574323177338, + 0.0316954180598259, + -0.0371457040309906, + -0.0372839979827404, + 0.01421255990862846, + -0.06403768807649612, + 0.03950182721018791, + 0.01754477247595787, + 0.01851043850183487, + -0.02010802924633026, + -0.007180836983025074, + -0.03885063901543617, + -0.01809384115040302, + 0.02348707802593708, + 0.01145289558917284, + -0.004680616781115532, + 0.01165846455842257, + 0.00618512649089098, + -0.001609516446478665, + 0.01145287323743105, + -0.04643497616052628, + 0.005158224608749151, + 0.007724930066615343, + 0.002579520456492901, + 0.004432096611708403, + -0.008987493813037872, + 0.000494829670060426, + 0.01051451824605465, + 0.0003194555756635964, + 0.00165610434487462, + 0.009397850371897221, + -0.02709135971963406, + 0.005380101501941681, + 0.005652063526213169, + -0.0003632707812357694, + 0.0080453185364604, + -0.01121622044593096, + -0.001802866347134113, + -0.007486896123737097, + 0.001516472431831062, + 0.002039025770500302, + 0.006364472210407257, + -0.0009773465571925044, + 0.001853989786468446, + -0.01112054195255041, + 0.001178347156383097, + 0.00954708456993103, + 0.0008350109565071762, + 0.002621369436383247, + -0.007082755211740732, + -0.001949315308593214, + 0.003407340496778488, + -0.001645858166739345, + -0.004255552776157856, + -0.0003051633248105645, + -0.003343725576996803, + 0.01075461413711309, + -0.002378283068537712, + 0.002144113415852189, + -0.007632825523614883 + ], + [ + 0.06988571584224701, + 1.445615112061205e-6, + -0.007285496685653925, + 0.1046555191278458, + 8.914059321796231e-7, + -3.210128625141806e-7, + -0.03481035307049751, + -0.007632039021700621, + 0.09688157588243484, + -1.343848111901025e-6, + -2.8499101745183e-7, + 4.657323188439477e-6, + -0.007065853103995323, + -0.02218718454241753, + -0.006250624544918537, + 0.08201749622821808, + -4.054861165059265e-6, + -3.684835974127054e-7, + 9.905158549372572e-6, + -1.986782081075944e-6, + 0.002122925594449043, + -0.01651777699589729, + -0.005563803482800722, + -0.007123568095266819, + 0.06377921998500824, + -5.986368705634959e-6, + -1.447640670448891e-6, + 0.00001195937147713266, + -4.387044555187458e-6, + -2.310701347596478e-6, + 0.01026842370629311, + -0.003566588507965207, + -0.01641907542943954, + 0.003223019884899259, + -0.009331919252872467, + 0.04502971470355988, + -6.259508154471405e-6, + -3.243950914111338e-6, + 0.00001043567226588493, + -3.661520395326079e-6, + 9.091960464502336e-7, + 2.735015186772216e-6, + 0.005593786016106606, + 0.007287046872079372, + -0.003668767400085926, + -0.01356131304055452, + 0.006081522442400455, + -0.01153850369155407, + 0.02792242914438248, + -4.656655619328376e-6, + -4.572390480461763e-6, + 6.584491529793013e-6, + -4.626805036878068e-7, + 5.335679361451184e-6, + 7.76315914663428e-7, + -2.660850441316143e-6, + -0.0004414583381731063, + 0.007810692768543959, + 0.001176425372250378, + -0.0007891626446507871, + -0.01029638759791851, + 0.005204993765801191, + -0.01267385203391314, + 0.01386342756450176 + ], + [ + 0.1275509893894196, + 0.07823073863983154, + -0.04519945755600929, + -0.1543653905391693, + -0.09767741709947586, + -0.03122458420693874, + -0.06104816868901253, + 0.05132931098341942, + 0.06720191240310669, + 0.05402782186865807, + 0.03364762291312218, + -0.01912866719067097, + 0.01835272274911404, + 0.03352182731032372, + -0.01295501831918955, + 0.0008297133608721197, + -0.001066146534867585, + -0.01003557071089745, + 0.01188268885016441, + 0.002408030442893505, + 0.01473662164062262, + 0.003683335147798061, + -0.003516352735459805, + -0.009624864906072617, + -0.01451588328927755, + -0.01844052039086819, + -0.008810512721538544, + -0.002144440077245235, + 0.009294889867305756, + 0.009183053858578205, + 0.008023623377084732, + -0.0108958687633276, + -0.01183727197349072, + -0.003908498678356409, + 0.005741320084780455, + -0.001685844152234495, + 0.008993463590741158, + 0.007301083765923977, + -0.0002935647498816252, + -0.0128490012139082, + -0.009783502668142319, + 0.003641401883214712, + -0.005677232518792152, + -0.008286934345960617, + 0.0005911279004067183, + 0.003223401261493564, + 0.001584621844813228, + 0.00442961510270834, + 0.01056474074721336, + 0.002154662972316146, + 0.002551131183281541, + -0.001705209841020405, + 0.005117131397128105, + 0.003067855490371585, + -0.004734531044960022, + -0.002614175202324986, + -0.003484193934127688, + -0.0006818380788899958, + 0.002293536672368646, + 0.004404782317578793, + 0.003962473478168249, + 0.000570247822906822, + -0.003891312284395099, + -0.003897017333656549 + ], + [ + 0.1275629252195358, + -0.0782419815659523, + -0.04520237818360329, + -0.1543713212013245, + 0.09768784791231155, + 0.0312149990350008, + -0.06104164198040962, + 0.05132667347788811, + 0.06719599664211273, + -0.05402814596891403, + -0.03363681957125664, + 0.01913542859256268, + 0.01833560131490231, + 0.03351403027772903, + -0.01295784767717123, + 0.0008358370396308601, + 0.001062530209310353, + 0.01003214344382286, + -0.0118823004886508, + -0.002405005507171154, + 0.0147412046790123, + 0.003695219056680799, + -0.003511970629915595, + -0.009617085568606853, + -0.01451427210122347, + 0.01844220049679279, + 0.008804473094642162, + 0.002140766242519021, + -0.009298967197537422, + -0.009177782572805882, + 0.008017344400286674, + -0.0108927683904767, + -0.01184000167995691, + -0.003899238305166364, + 0.005735405255109072, + -0.001688220421783626, + -0.008996913209557533, + -0.007292849477380514, + 0.0002896864316426218, + 0.01285100635141134, + 0.009776187129318714, + -0.003641193732619286, + -0.005658653564751148, + -0.008283414877951145, + 0.0005931201740168035, + 0.003218883648514748, + 0.001569646876305342, + 0.004428214859217405, + 0.01056199427694082, + -0.002149396343156695, + -0.002551729558035731, + 0.001712788129225373, + -0.005115760024636984, + -0.003066351870074868, + 0.004731190856546164, + 0.002611666219308972, + -0.003490372793748975, + -0.0006948147783987224, + 0.002295984420925379, + 0.004397716373205185, + 0.003968425560742617, + 0.0005737738101743162, + -0.003885727841407061, + -0.003893956774845719 + ], + [ + 0.1089406460523605, + 0.1553604155778885, + -0.02423824183642864, + 0.0121248522773385, + 0.018740588799119, + -0.03108053654432297, + -0.05337629094719887, + -0.005299608688801527, + -0.1242311075329781, + -0.07971992343664169, + -0.008099082857370377, + -0.03337014839053154, + 0.002236034721136093, + -0.00278517440892756, + 0.02067289687693119, + -0.01652029529213905, + -0.007608437445014715, + 0.01039987616240978, + -0.001911081257276237, + -0.0127909230068326, + 0.007718504872173071, + 0.0006928316433914006, + 0.007559923455119133, + 0.007058948744088411, + 0.03750989586114883, + 0.007785493973642588, + 0.003566469298675656, + -0.004486647434532642, + -0.0007935830508358777, + 0.002548934426158667, + 0.01079329662024975, + 0.001431425916962326, + 0.01640216819941998, + 0.0002362326922593638, + -0.003910603001713753, + -0.002588198287412524, + -0.008895434439182281, + -0.001659926725551486, + -0.0005460103275254369, + 0.01206788793206215, + 0.002197521040216088, + 0.008081566542387009, + 0.001929723657667637, + 0.0003389221092220396, + -0.0001264361344510689, + 0.001811394584365189, + 0.006512111518532038, + -0.00003510119131533429, + 0.006694148294627666, + 0.009308796375989914, + 0.001796595519408584, + 0.003550620283931494, + 0.001224011648446321, + -0.0002312766300747171, + 0.0002292411954840645, + 0.005286421626806259, + -0.001341877388767898, + -0.000529875629581511, + -0.0005988302291370928, + -0.00205945479683578, + -0.00532134436070919, + 0.0001452933502150699, + 0.001922798692248762, + 0.009190654382109642 + ], + [ + 0.1089273542165756, + -0.1553483307361603, + -0.02424043975770473, + 0.01212739292532206, + -0.01874457485973835, + 0.03108966536819935, + -0.05338074266910553, + -0.005300404038280249, + -0.124229408800602, + 0.079726442694664, + 0.008098460733890533, + 0.03337763994932175, + 0.002248880686238408, + -0.002786614233627915, + 0.02067851833999157, + -0.01652389764785767, + 0.007609208580106497, + -0.01039634831249714, + 0.001914022141136229, + 0.01278271060436964, + 0.007723703049123287, + 0.0006861266447231174, + 0.00756035465747118, + 0.007058383896946907, + 0.03751910850405693, + -0.007792357355356216, + -0.003566610394045711, + 0.004495353903621435, + 0.000801704591140151, + -0.002555542625486851, + 0.01079191826283932, + 0.001435554120689631, + 0.01640841364860535, + 0.0002356902987230569, + -0.003900190582498908, + -0.002590753138065338, + 0.008899454958736897, + 0.001650996971875429, + 0.0005499146063812077, + -0.01208259351551533, + -0.002195677720010281, + -0.008081897161900997, + 0.00192294386215508, + 0.0003381163405720145, + -0.000126813116366975, + 0.001818640273995697, + 0.006524001248180866, + -0.00003594649751903489, + 0.006692460738122463, + -0.009312329813838005, + -0.001795429037883878, + -0.003557827323675156, + -0.001225239131599665, + 0.0002269320102641359, + -0.0002326056128367782, + -0.005285784136503935, + -0.001341705559752882, + -0.0005169896176084876, + -0.0005986144533380866, + -0.00205698749050498, + -0.005333185195922852, + 0.0001491743169026449, + 0.001922566676512361, + 0.009193513542413712 + ], + [ + 0.10899418592453, + 0.07017328590154648, + 0.1235116645693779, + 0.07037607580423355, + 0.05171019211411476, + 0.08431491255760193, + 0.05584463477134705, + 0.08440995961427689, + 0.0002745233941823244, + 0.01178977079689503, + 0.06254377961158752, + 0.04483330994844437, + -0.003594234585762024, + 0.04469256103038788, + 0.0001617757661733776, + -0.01132090296596289, + 0.0002858458901755512, + 0.01191830821335316, + 0.03377533331513405, + 0.0004498490015976131, + -0.01130446419119835, + 0.0002996980038005859, + -0.0001342060859315097, + -0.01158929336816072, + 0.001025213045068085, + 0.004605520516633987, + 0.0002396858617430553, + 0.001971194287762046, + 0.001125482725910842, + -0.01149043720215559, + 0.007544785737991333, + -0.01143052987754345, + -0.0001952982129296288, + -0.002121173776686192, + 0.003407289041206241, + 0.004400265403091908, + 0.005494734272360802, + 0.005487891845405102, + -0.00003868433486786671, + -0.006823236588388681, + -0.005586289335042238, + -0.001017369912005961, + 0.0138303879648447, + -0.0008616368868388236, + 0.00002911851333919913, + 0.006496638990938663, + 0.005788044538348913, + 0.005242646671831608, + 0.00005995020183036104, + 0.002169177168980241, + 0.005109293386340141, + 0.00272314390167594, + -0.0002046060399152339, + -0.006164321210235357, + 0.005269186105579138, + 0.004445946309715509, + 0.003803680650889874, + 0.004461302887648344, + 0.0001740230363793671, + 0.006138116586953402, + 0.005874241702258587, + 0.002651386894285679, + -0.00004053002339787781, + -0.001763356034643948 + ], + [ + 0.1089954823255539, + -0.07017271965742111, + 0.1235111132264137, + 0.0703754648566246, + -0.05170270428061485, + -0.08431327342987061, + 0.05584052577614784, + 0.08440886437892914, + 0.0002728359249886125, + -0.01178464293479919, + -0.06253291666507721, + -0.04483170807361603, + -0.003599943593144417, + 0.04469205439090729, + 0.0001580626849317923, + -0.01131740584969521, + -0.0002874349302146584, + -0.01190664619207382, + -0.03377103805541992, + -0.0004500607028603554, + -0.01130786631256342, + 0.0003000920987688005, + -0.000138132250867784, + -0.01158605422824621, + 0.001024456578306854, + -0.004606435541063547, + -0.000235427898587659, + -0.001961722271516919, + -0.001132600009441376, + 0.01148819364607334, + 0.007545873057097197, + -0.01143060624599457, + -0.0001976633939193562, + -0.002122615464031696, + 0.003407836658880115, + 0.004395506344735622, + -0.005498164333403111, + -0.00548210134729743, + 0.00004453880683286116, + 0.006821842864155769, + 0.005576013587415218, + 0.001014040433801711, + 0.01383409090340137, + -0.0008623195462860167, + 0.00002772232619463466, + 0.006489625200629234, + 0.005788958165794611, + 0.005239825695753098, + 0.00005550750938709825, + -0.002176131587475538, + -0.005105679389089346, + -0.002717998344451189, + 0.000203033778234385, + 0.006157349329441786, + -0.005271258763968945, + -0.004449326545000076, + 0.00380461965687573, + 0.004461896140128374, + 0.0001731276424834505, + 0.006130354013293982, + 0.005874007474631071, + 0.002651121467351913, + -0.00003931875107809901, + -0.001773658790625632 + ], + [ + 0.1106875613331795, + 0.06746696680784225, + 0.1250011324882507, + -0.07285697013139725, + -0.04619936645030975, + 0.08287846297025681, + 0.0552481897175312, + -0.08726610243320465, + 0.002585650188848376, + 0.004268362186849117, + -0.05913673713803291, + 0.04655253142118454, + -0.00583104370161891, + -0.04504033550620079, + 0.003207054454833269, + 0.008931798860430717, + 0.007627120707184076, + 0.006668494082987309, + -0.03645111620426178, + 0.002633726224303246, + -0.01263261679559946, + 0.002449746010825038, + 0.0009079234441742301, + 0.008562059141695499, + 0.003713981946930289, + -0.002020001178607345, + 0.00586598040536046, + 0.004666512366384268, + -0.005526028573513031, + -0.01195696368813515, + 0.008833968080580235, + 0.01411772426217794, + -0.002282909350469708, + 0.001025443896651268, + 0.006399159319698811, + -0.007050176151096821, + -0.0009963751072064042, + -0.00009843026782618836, + -0.001912718173116446, + -0.0009523994522169232, + 0.005607919301837683, + -0.003165210830047727, + 0.01615312695503235, + 0.0001400343171553686, + -0.002701760036870837, + -0.004821540787816048, + 0.006569572724401951, + -0.007922700606286526, + 0.001980604603886604, + -0.0003917829017154872, + -0.001012322492897511, + 0.003662817878648639, + -0.005856466479599476, + -0.005227227695286274, + -0.001584258046932518, + 0.003774311626330018, + 0.004163111094385386, + -0.007565736304968596, + 0.0001439017214579508, + -0.003907716367393732, + 0.004292430821806192, + -0.003073602681979537, + 0.001816111151129007, + 0.00096976786153391 + ], + [ + 0.1106883212924004, + -0.06746820360422134, + 0.1250046491622925, + -0.07285060733556747, + 0.04619225487112999, + -0.08288215845823288, + 0.05525192618370056, + -0.08726175874471664, + 0.002583838300779462, + -0.004268737975507975, + 0.05912910029292107, + -0.0465548038482666, + -0.005833076313138008, + -0.04504081606864929, + 0.003203485161066055, + 0.008923515677452087, + -0.007620780263096094, + -0.006667317822575569, + 0.03644744679331779, + -0.002629996510222554, + -0.01263726782053709, + 0.002449385821819305, + 0.0009053611429408193, + 0.008554806001484394, + 0.003716799663379788, + 0.002020074753090739, + -0.005860716104507446, + -0.004664798732846975, + 0.005527138710021973, + 0.01196293346583843, + 0.008836319670081139, + 0.01411975175142288, + -0.002281788969412446, + 0.00102347310166806, + 0.006396717857569456, + -0.007053674198687077, + 0.0009992747800424695, + 0.0001051936196745373, + 0.001915471744723618, + 0.0009512846590951085, + -0.00560272391885519, + 0.003166009206324816, + 0.01616258174180984, + 0.0001405938965035602, + -0.002698273165151477, + -0.004820531234145164, + 0.006561354734003544, + -0.00792218279093504, + 0.001988182542845607, + 0.000389533000998199, + 0.00101261236704886, + -0.003653089748695493, + 0.00585994403809309, + 0.005222943611443043, + 0.001590084983035922, + -0.003778312122449279, + 0.004169158171862364, + -0.007567664608359337, + 0.000146392485476099, + -0.003905733115971088, + 0.004286040551960468, + -0.003066899022087455, + 0.001826871070079505, + 0.0009720409289002419 + ] + ], + "Routing": [ + 1, + 2, + 3, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Cube_8ch.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Cube_8ch.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Cube_8ch.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Cube_8ch.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,549 @@ +{ + "Decoder": { + "Name": "8ch Cube", + "Description": "Channel order: FL FR RL RR TFL TFR TRL TRR", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.1903220266103745, + 0.1390426158905029, + 0.1396176815032959, + 0.1390356570482254, + 0.09134297072887421, + 0.091666579246521, + 0.0002020866959355772, + 0.09166141599416733, + -6.458687380472838e-7, + 0.0046482696197927, + 0.06480231136083603, + 0.003540602279826999, + -0.006226413883268833, + 0.003536406671628356, + 1.178809839075257e-6, + -0.00464248051866889, + 3.522307679304504e-6, + 0.009140546433627605, + 0.009753846563398838, + -0.003837856696918607, + 0.0244592297822237, + -0.003840704448521137, + 4.253649876773125e-8, + -0.009136480279266834, + 0.02061823755502701, + 0.006874806247651577, + -3.186675030519837e-6, + -0.001230292138643563, + -0.0002106773608829826, + 0.00770453829318285, + 0.008086193352937698, + 0.007708031684160233, + -9.515355259281932e-7, + 0.00123294407967478, + 0.006776362657546997, + 0.006874260026961565, + -0.004422304686158895, + 0.00636694161221385, + -4.368401732790517e-6, + -0.006919262930750847, + 0.008635330945253372, + -0.002108218148350716, + -0.00164728204254061, + -0.002102528233081102, + 1.734638658490439e-6, + 0.006922717206180096, + 0.003727983683347702, + 0.006373971700668335, + 2.769864295260049e-6, + -0.003650592872872949, + 0.005465771071612835, + 0.001606671488843858, + -1.257933718079585e-6, + -0.001108874450437725, + 0.006163589656352997, + -0.003957131411880255, + 0.003569969208911061, + -0.003957345616072416, + 1.112527002078423e-6, + 0.001111574936658144, + 0.004306755494326353, + 0.001614200416952372, + -1.48136928146414e-6, + 0.003658403642475605 + ], + [ + 0.1903227120637894, + -0.1390424966812134, + 0.1396161615848541, + 0.1390381306409836, + -0.09134392440319061, + -0.09166771173477173, + 0.0001992419420275837, + 0.09165753424167633, + -1.621399725593164e-8, + -0.004647057503461838, + -0.06479956209659576, + -0.003539906116202474, + -0.006227580830454826, + 0.003534658113494515, + -2.769907041511033e-6, + -0.004643845837563276, + -4.954192718287231e-7, + -0.009142688475549221, + -0.009750724770128727, + 0.00384005787782371, + 0.02445715665817261, + -0.003836657153442502, + 3.127881598175009e-7, + -0.009134705178439617, + 0.02061888016760349, + -0.006875935476273298, + -4.197630005364772e-6, + 0.001228078384883702, + 0.0002133824455086142, + -0.007706201169639826, + 0.008082401007413864, + 0.007708220742642879, + 2.224036734332913e-6, + 0.001237571937963367, + 0.006772977765649557, + 0.006876233965158463, + 0.004418523982167244, + -0.006366255693137646, + -2.339599632250611e-6, + 0.006921566557139158, + -0.008635101839900017, + 0.002104903105646372, + -0.001649357262067497, + -0.002104066079482436, + -1.107443381442863e-6, + 0.006925979163497686, + 0.003726805793121457, + 0.006370059214532375, + -2.101745849358849e-6, + 0.003653611987829208, + -0.005461440421640873, + -0.001606898615136743, + 1.392149556522781e-6, + 0.001109890174120665, + -0.006167046725749969, + 0.003957553301006556, + 0.003569245571270585, + -0.003953917417675257, + -6.555544018738146e-7, + 0.001110700657591224, + 0.004308267962187529, + 0.001612310763448477, + 5.880122898815898e-6, + 0.003648169338703156 + ], + [ + 0.1903221905231476, + 0.1390326321125031, + 0.1396197974681854, + -0.1390391737222672, + -0.09133708477020264, + 0.09165957570075989, + 0.000202195908059366, + -0.0916687548160553, + -1.139992605203588e-6, + 0.004636254627257586, + -0.06480943411588669, + 0.0035304119810462, + -0.006229536607861519, + -0.003543570404872298, + 7.104434871507692e-7, + 0.00464370334520936, + 1.223532080985024e-6, + 0.009139541536569595, + -0.009754673577845097, + -0.003845134517177939, + 0.02445535361766815, + 0.003839306998997927, + 5.408027845987817e-6, + 0.00914567057043314, + 0.02061938866972923, + 0.00687565328553319, + 1.307496404479025e-6, + -0.001238880096934736, + 0.0002160192816518247, + 0.007712013088166714, + 0.008081077598035336, + -0.007702346425503492, + 2.28218050324358e-6, + -0.00123053090646863, + 0.006768213585019112, + -0.006869714241474867, + 0.004425749648362398, + 0.006368730682879686, + 4.410488600115059e-6, + -0.006932892370969057, + -0.008638556115329266, + -0.002098353812471032, + -0.001650907099246979, + 0.00210892828181386, + -3.263628741478897e-6, + -0.006922502070665359, + 0.003725737798959017, + -0.006369034294039011, + -4.698949396697572e-6, + -0.003654310014098883, + -0.005461916793137789, + 0.00161591125652194, + 5.056732788943918e-6, + -0.001111946068704128, + -0.006167601328343153, + -0.003953041508793831, + 0.003569780150428414, + 0.003957793116569519, + -1.291419380322623e-6, + -0.001107585267163813, + 0.004302985034883022, + -0.001610321225598454, + 4.242242084728787e-6, + -0.003651530249044299 + ], + [ + 0.1903205215930939, + -0.1390322297811508, + 0.1396201252937317, + -0.1390398293733597, + 0.09133875370025635, + -0.09166053682565689, + 0.0002025805733865127, + -0.09166773408651352, + 2.656107199072721e-6, + -0.004636927973479033, + 0.06480672210454941, + -0.003535576863214374, + -0.006228275131434202, + -0.003535352647304535, + 3.556590115749714e-7, + 0.004640784114599228, + -6.647266673098784e-6, + -0.009136793203651905, + 0.00975485984236002, + 0.003843093058094382, + 0.0244621429592371, + 0.003842965234071016, + -5.54970665689325e-6, + 0.009140004403889179, + 0.02062555402517319, + -0.00687072891741991, + 4.466838163352804e-6, + 0.001240501063875854, + -0.0002115490206051618, + -0.007706914097070694, + 0.008086568675935268, + -0.00771033763885498, + -1.743732582326629e-6, + -0.001230994006618857, + 0.006770838983356953, + -0.006883258931338787, + -0.004421469755470753, + -0.006370107643306255, + 2.533367933210684e-6, + 0.006931028794497252, + 0.008639742620289326, + 0.002102752914652228, + -0.001652290113270283, + 0.00210627494379878, + 4.420239747560117e-6, + -0.006922466680407524, + 0.003729293355718255, + -0.006358031183481216, + 6.526061952172313e-6, + 0.003653155639767647, + 0.005456875544041395, + -0.001614072942174971, + -9.099091471398424e-7, + 0.001110942335799336, + 0.006164911203086376, + 0.003955121152102947, + 0.003569579450413585, + 0.003961138427257538, + 1.241510290128645e-6, + -0.001110085984691978, + 0.004309543874114752, + -0.001607380225323141, + -4.12939607485896e-6, + -0.003651387989521027 + ], + [ + 0.1903233528137207, + 0.1390350013971329, + -0.1396207958459854, + 0.1390397846698761, + 0.09134220331907272, + -0.09166095405817032, + 0.0002061197446892038, + -0.09166312217712402, + 7.016242307145149e-7, + 0.004637517035007477, + -0.06480719894170761, + 0.003535188734531403, + 0.006219170987606049, + 0.003534988267347217, + -9.410488246430759e-7, + -0.004644445143640041, + -5.453853646031348e-6, + -0.009137518703937531, + 0.009756015613675117, + 0.003839315148070455, + 0.02446798607707024, + 0.003841976867988706, + 2.921947839240602e-7, + 0.009138154797255993, + 0.02062293142080307, + 0.006872354075312614, + -1.831285430853313e-6, + -0.001236132229678333, + 0.0002120821445714682, + 0.007710447534918785, + -0.00808962807059288, + 0.007705077063292265, + 1.24097562093084e-6, + 0.001232182839885354, + -0.006778163369745016, + 0.006874530110508204, + -0.00442874850705266, + -0.006371970288455486, + -1.752751700223598e-6, + 0.006925443187355995, + 0.008631863631308079, + 0.002104785526171327, + -0.001646933029405773, + 0.00210567400790751, + -1.048545072990237e-6, + -0.00692220451310277, + 0.00373197253793478, + -0.006368080154061317, + -2.30151749747165e-6, + -0.003657879075035453, + -0.005459130741655827, + 0.001613929867744446, + -6.455443326558452e-7, + -0.00110973184928298, + -0.006157903000712395, + -0.003957723267376423, + -0.003572527784854174, + -0.003954126499593258, + -1.742822178130154e-6, + 0.001113271224312484, + -0.004306594841182232, + 0.001612016232684255, + 9.985208180296468e-7, + 0.003653366351500154 + ], + [ + 0.1903200149536133, + -0.139036163687706, + -0.1396147906780243, + 0.1390404403209686, + -0.09133744239807129, + 0.09166537225246429, + 0.0001963763788808137, + -0.09166603535413742, + 8.288764661301684e-7, + -0.004637871868908405, + 0.06480434536933899, + -0.00353772914968431, + 0.006234693340957165, + 0.003540892153978348, + 1.338792912974895e-6, + -0.00463970610871911, + 6.146391910988314e-7, + 0.009138395078480244, + -0.009754939004778862, + -0.003842708189040422, + 0.02445223368704319, + 0.003838051343336701, + -8.204373216358363e-7, + 0.00913792010396719, + 0.02062354795634747, + -0.006872836034744978, + 3.773962134800968e-6, + 0.00123650161549449, + -0.0002146030456060544, + -0.007708541583269835, + -0.008079518564045429, + 0.007706867530941963, + -9.221435561812541e-7, + 0.001229651621542871, + -0.006774442736059427, + 0.006872935686260462, + 0.004428821615874767, + 0.006368701346218586, + 2.422495981591055e-6, + -0.006928037852048874, + -0.008635217323899269, + -0.002101030666381121, + -0.001656155334785581, + 0.002104758284986019, + 2.968164665162476e-7, + -0.006923729553818703, + 0.003728135721758008, + -0.006365177221596241, + 1.876081114460249e-6, + 0.003653967054560781, + 0.005460156127810478, + -0.001610215986147523, + -1.194551714434056e-6, + 0.001109344186261296, + 0.006166077684611082, + 0.003956143744289875, + -0.003562397556379437, + -0.003957416396588087, + 1.580216576257953e-6, + 0.001112123369239271, + -0.004310747142881155, + 0.001606481149792671, + -1.882840024336474e-6, + 0.003659181529656053 + ], + [ + 0.1903187185525894, + 0.1390408277511597, + -0.1396111398935318, + -0.1390382647514343, + -0.09134466201066971, + -0.09166941791772842, + 0.000195418469957076, + 0.09165694564580917, + 2.592274313428788e-6, + 0.004647223278880119, + 0.06480830907821655, + 0.003542357357218862, + 0.006230214145034552, + -0.003532330971211195, + 4.552790869638557e-6, + 0.004639362450689077, + -2.25393523578532e-6, + -0.009145386517047882, + -0.009755173698067665, + 0.003840406890958548, + 0.02445471473038197, + -0.003838030621409416, + -5.078472895547748e-6, + -0.009137861430644989, + 0.0206233374774456, + 0.006874480750411749, + 5.491300271387445e-6, + -0.001229588408023119, + -0.0002159027353627607, + 0.007704206742346287, + -0.008078611455857754, + -0.007711007725447416, + -8.744179922359763e-7, + -0.00123486144002527, + -0.006774248089641333, + -0.006878888234496117, + 0.004422471858561039, + -0.006366417277604342, + -4.865235041506821e-6, + 0.006922993343323469, + -0.008631465956568718, + 0.002106365747749805, + -0.0016552759334445, + -0.002101109130308032, + 2.794319470922346e-6, + 0.006928607355803251, + 0.003729605581611395, + 0.006370379589498043, + 4.61463332612766e-6, + -0.003652092069387436, + 0.005458016879856586, + 0.001609557890333235, + 2.943889967355062e-6, + -0.001108825556002557, + 0.006163111422210932, + -0.0039570527151227, + -0.003563358681276441, + 0.003954393789172173, + -1.667374476710393e-6, + -0.00111233931966126, + -0.004310606047511101, + -0.001611376996152103, + -7.269812613230897e-6, + -0.003654631320387125 + ], + [ + 0.1903252005577087, + -0.1390447914600372, + -0.1396203935146332, + -0.1390368193387985, + 0.09134635329246521, + 0.09166131168603897, + 0.0002061007398879156, + 0.09166301786899567, + -6.086380381020717e-6, + -0.004644419532269239, + -0.06480132788419724, + -0.003535301424562931, + 0.006219398230314255, + -0.003540849778801203, + -3.31281603394018e-6, + 0.004646716639399529, + 3.434962991377688e-6, + 0.009138556197285652, + 0.00975639745593071, + -0.003838134463876486, + 0.02446427009999752, + -0.003839238313958049, + 4.891898697678698e-6, + -0.009134018793702126, + 0.02061770856380463, + -0.006875107530504465, + -8.132914217640064e-7, + 0.001229123445227742, + 0.0002126990293618292, + -0.007705053314566612, + -0.008089950308203697, + -0.007704153191298246, + 7.818258609404438e-7, + -0.001232752809301019, + -0.006778879556804895, + -0.006867388729006052, + -0.004429827909916639, + 0.006371753755956888, + -3.087917775701499e-6, + -0.006922392174601555, + 0.008627898059785366, + -0.002105845371261239, + -0.001642975490540266, + -0.002103289822116494, + -1.137669528361585e-6, + 0.006924272514879704, + 0.003728291485458612, + 0.006369542796164751, + -2.486666517143021e-6, + 0.003653926542028785, + -0.005463678389787674, + -0.00160497275646776, + -8.391010055674997e-7, + 0.001112055033445358, + -0.006162986624985933, + 0.003955352585762739, + -0.003571745939552784, + 0.003954457119107246, + 6.101179224060616e-7, + -0.001112817088142037, + -0.004308595322072506, + -0.00161299598403275, + 5.468999006552622e-6, + -0.003659440670162439 + ] + ], + "Routing": [ + 5, + 6, + 7, + 8, + 1, + 2, + 3, + 4 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/CUBE.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/CUBE.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/CUBE.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/CUBE.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,36 @@ +{ + "Name" : "IEM CUBE", + "Description" : "Configuration file for the IEM CUBE.", + "Decoder" : { + "Name" : "IEM CUBE decoder", + "Description" : "This is a decoder for the IEM Cube.", + "ExpectedInputNormalization" : "n3d", + "Weights" : "none", + "WeightsAlreadyApplied" : true, + "SubwooferChannel" : 25, + "Matrix" : [[0.166702,-0.003183,-0.052713,0.239635,-0.005049,0.002583,-0.075233,-0.071178,0.204638,-0.005113,0.004299,-0.000456,0.017663,-0.049608,-0.053085,0.150731,-0.003785,0.004245,-0.001385,-0.000746,0.013367,0.00113,-0.019423,-0.03204,0.09187,-0.00182,0.00262,-0.001242,-0.000439,0.000415,0.003557,0.007012,-0.004482,-0.005005,-0.013609,0.039218], + [0.144976,-0.082015,-0.067758,0.188735,-0.12723,0.039477,-0.058285,-0.0884,0.119246,-0.120264,0.056505,0.013264,0.033813,-0.031832,-0.050698,0.043593,-0.077752,0.045477,0.008199,-0.006884,0.010683,0.015349,-0.008622,-0.014692,-0.004222,-0.029963,0.020712,0.001968,-0.002271,-0.003048,-0.002127,0.007203,0.002036,-0.001189,0.002193,-0.014562], + [0.17499,-0.183338,-0.065106,0.166759,-0.208717,0.063399,-0.071724,-0.057157,-0.02016,-0.091245,0.061932,0.035166,0.019715,-0.030711,0.007078,-0.122825,0.018115,0.020396,0.018048,-0.002639,0.016231,0.001026,0.003081,0.030051,-0.090401,0.033389,-0.004065,0.001956,0.003983,-0.006953,0.001287,0.006053,-0.000749,0.004304,0.013846,-0.019808], + [0.171911,-0.23436,-0.077293,0.066131,-0.106803,0.106518,-0.070071,-0.028062,-0.173134,0.097714,0.04099,0.038423,0.038897,-0.011387,0.073285,-0.108006,0.077282,-0.036483,0.007665,-0.017307,0.010189,0.003548,0.01063,0.034599,0.036847,-0.00495,-0.017227,-0.001054,-9.6E-5,-0.007004,-0.00088,0.00238,-0.002314,0.002326,-0.010894,0.03455], + [0.23246,-0.316133,-0.088456,-0.073918,0.116154,0.111333,-0.093876,0.033385,-0.236556,0.139236,-0.047168,0.057152,0.029351,0.012063,0.068568,0.112535,-0.075667,-0.02788,-0.008137,-0.005441,0.019876,-0.004646,0.019581,-0.037647,0.060282,-0.015516,0.017097,-0.004019,0.000774,-0.011341,0.000791,-0.002702,0.004246,-0.002637,-0.004969,-0.031001], + [0.266779,-0.238065,-0.103348,-0.283218,0.287272,0.086924,-0.109163,0.105688,0.049561,-0.161867,-0.092397,0.04208,0.039162,0.049812,-0.018183,0.095418,0.030317,0.042605,-0.020939,-0.006335,0.019817,-0.008212,-0.004105,-0.022454,-0.088794,0.011444,-0.006259,0.003334,-0.003495,-0.007061,0.001599,-0.009367,0.000296,-0.001566,0.013943,0.0277], + [0.289251,0.001135,-0.114345,-0.39841,-0.002342,0.000899,-0.116833,0.149737,0.308841,0.002721,-0.001073,-0.000903,0.043019,0.069383,-0.100177,-0.193257,-0.002191,0.001122,0.000407,0.00026,0.021309,-0.011464,-0.022783,0.048258,0.09168,0.001046,-0.000773,-9.4E-5,0.000127,-0.000583,0.001472,-0.012322,-0.003994,0.004412,-0.013607,-0.026595], + [0.272359,0.244435,-0.111778,-0.284948,-0.290531,-0.094353,-0.107776,0.112079,0.044701,0.159056,0.098893,-0.041483,0.039998,0.049724,-0.018036,0.099496,-0.026604,-0.045151,0.021626,0.005431,0.022908,-0.008857,-0.004354,-0.024685,-0.088099,-0.012162,0.00638,-0.003886,0.003535,0.00914,0.000854,-0.011029,0.000964,-0.001838,0.014957,0.025666], + [0.239623,0.330189,-0.085779,-0.066612,-0.104798,-0.111485,-0.102525,0.030827,-0.251398,-0.152654,0.044842,-0.062002,0.032652,0.011178,0.070228,0.101113,0.067605,0.029699,0.006167,0.006409,0.017748,-0.006462,0.020763,-0.0362,0.070097,0.020195,-0.016482,0.004136,-0.002151,0.010105,0.00243,-0.001251,0.00482,-0.001054,-0.006271,-0.027562], + [0.17452,0.231181,-0.081948,0.080071,0.126701,-0.108137,-0.066211,-0.034661,-0.159384,-0.076876,-0.050069,-0.035005,0.037234,-0.014369,0.069691,-0.123425,-0.083333,0.030401,-0.009622,0.01667,0.011854,0.005708,0.008003,0.04106,0.017817,-0.004871,0.019365,-0.000216,0.00149,0.007298,-0.00269,0.002622,-0.001982,0.002697,-0.006727,0.034234], + [0.172931,0.17526,-0.055968,0.175592,0.210421,-0.055175,-0.077088,-0.0531,0.000558,0.108725,-0.057816,-0.034458,0.019659,-0.034929,0.002135,-0.107924,0.000319,-0.023782,-0.017757,0.001408,0.013141,0.001285,0.000234,0.026621,-0.091724,-0.02695,0.001205,-0.00204,-0.00409,0.005667,0.003392,0.004788,-0.000175,0.002854,0.015604,-0.027041], + [0.137259,0.072587,-0.06853,0.177366,0.113867,-0.035193,-0.049121,-0.086452,0.115166,0.109404,-0.051359,-0.012167,0.028076,-0.027466,-0.051444,0.046182,0.072259,-0.042489,-0.007623,0.006606,0.013319,0.013099,-0.007196,-0.017249,0.000551,0.028636,-0.020074,-0.001697,0.002441,0.002753,-0.003962,0.008281,0.001373,-0.000813,0.000257,-0.011605], + [0.176554,-0.077957,0.141983,0.21233,-0.10559,-0.065552,-0.022706,0.193886,0.119026,-0.080529,-0.090484,-0.005259,-0.088487,0.040965,0.112023,0.039254,-0.038285,-0.063341,-0.020094,0.021492,-0.040633,-0.041571,0.03863,0.0357,0.001866,-0.009518,-0.022294,-0.014053,0.01022,0.008962,0.00139,-0.022937,-0.002678,0.012809,0.002466,-0.003592], + [0.179238,-0.219605,0.143276,0.067954,-0.092365,-0.197727,-0.024342,0.05965,-0.132589,0.055078,-0.082978,-0.03821,-0.08955,0.007018,-0.119704,-0.071437,0.034978,0.044084,-0.02097,0.044196,-0.039386,-0.01943,-0.036445,-0.059054,0.013488,-0.001145,0.021471,0.012041,0.009196,0.022377,0.002528,-0.009196,0.005073,-0.014329,0.007068,0.009082], + [0.128215,-0.156988,0.092394,-0.077016,0.105758,-0.130381,-0.037259,-0.063559,-0.081471,0.015951,0.089902,-0.005553,-0.076523,-0.00247,-0.070228,0.081685,-0.038935,0.0136,0.017758,0.048515,-0.025133,0.023441,-0.014354,0.064939,-0.011246,0.009025,-0.023818,0.003325,-0.012212,0.019237,0.00844,0.009162,0.009788,0.014028,-0.006282,-0.00921], + [0.172728,-0.069285,0.140813,-0.209251,0.096372,-0.057914,-0.018851,-0.193131,0.122408,-0.077344,0.081807,-0.004103,-0.084863,-0.043772,0.115649,-0.045399,0.040049,-0.06012,0.017055,0.019304,-0.040574,0.038784,0.040305,-0.04065,0.005528,-0.011519,0.023044,-0.012607,-0.010021,0.007741,0.000144,0.022408,-0.002376,-0.013942,0.004592,0.003151], + [0.134786,0.072473,0.095752,-0.168586,-0.09992,0.061306,-0.040542,-0.136563,0.09633,0.079218,-0.085785,0.005166,-0.079898,-0.002145,0.077905,-0.031222,-0.040582,0.061813,-0.01902,-0.020461,-0.025514,0.052748,0.011077,-0.021385,-0.000498,0.011599,-0.023105,0.013296,0.01011,-0.008988,0.009139,0.020151,-0.013285,-0.001754,-0.001531,0.004903], + [0.1316,0.161552,0.096677,-0.074116,-0.101113,0.137008,-0.035953,-0.061979,-0.086435,-0.021175,-0.086891,0.008873,-0.079221,-0.003502,-0.076441,0.077639,0.037053,-0.018746,-0.018074,-0.05042,-0.027841,0.02225,-0.017108,0.062082,-0.00708,-0.007167,0.022512,-0.004942,0.011512,-0.021458,0.00853,0.008981,0.010607,0.013601,-0.003311,-0.009084], + [0.185518,0.226927,0.146261,0.07425,0.102204,0.201532,-0.027662,0.061986,-0.134376,-0.051894,0.087244,0.036272,-0.091727,0.003682,-0.120653,-0.079913,-0.039248,-0.042253,0.017961,-0.045335,-0.038102,-0.021674,-0.036416,-0.063004,0.009202,-0.000969,-0.023212,-0.012175,-0.011136,-0.021431,0.003145,-0.00867,0.004738,-0.013383,0.004978,0.010018], + [0.137861,0.0738,0.097186,0.173344,0.103212,0.060937,-0.041742,0.13929,0.10061,0.083196,0.086883,0.003449,-0.079637,0.001593,0.081787,0.033571,0.04317,0.064592,0.01761,-0.020677,-0.023695,-0.052331,0.012619,0.024291,0.000127,0.012411,0.025144,0.013702,-0.010638,-0.008002,0.009339,-0.018727,-0.012708,0.003378,-0.000696,-0.004698], + [0.136723,-0.073699,0.184026,0.069739,-0.040433,-0.113692,0.136655,0.107495,-0.001908,-0.009206,-0.063348,-0.104296,0.057735,0.098507,-0.003027,-0.01039,0.000394,-0.013368,-0.056584,-0.061044,0.001717,0.057631,-0.002763,-0.015,-0.004145,0.000667,0.000401,-0.009274,-0.027464,-0.018742,-0.012143,0.017774,-0.001378,-0.01033,-0.004737,-0.000469], + [0.232183,-0.111444,0.31669,-0.074512,0.043206,-0.163155,0.247006,-0.112737,-0.022789,-0.00093,0.065427,-0.135972,0.126737,-0.100392,-0.033518,0.011207,0.000726,-0.000976,0.055362,-0.066336,0.038294,-0.056535,-0.026708,0.015973,-0.001227,-0.000445,0.000513,-0.000366,0.024606,-0.012859,0.004685,-0.016759,-0.010277,0.01071,-0.001202,0.001116], + [0.20767,0.110474,0.268476,-0.105037,-0.041641,0.163371,0.178905,-0.155968,-0.003414,-0.000893,-0.063703,0.138896,0.052624,-0.13372,-0.004839,0.000934,1.7E-5,-0.001105,-0.05506,0.070696,-0.020717,-0.069304,-0.003578,0.00124,0.004132,0.000887,-3.3E-5,-0.000549,-0.025579,0.015647,-0.024358,-0.016178,-0.001161,0.000741,0.00445,-0.000608], + [0.231774,0.071229,0.316458,0.112,0.041891,0.107759,0.247504,0.164116,0.02273,0.011545,0.06342,0.095731,0.127808,0.13733,0.032336,-0.0002,0.000275,0.0159,0.053689,0.05336,0.03923,0.067979,0.024455,-0.000452,-0.001491,-0.000801,0.000253,0.010192,0.023933,0.01522,0.005024,0.014079,0.008531,-0.0004,-0.001498,-0.000112]], + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/MSDecoder.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/MSDecoder.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/MSDecoder.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/MSDecoder.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,27 @@ +{ + "Decoder": { + "Name": "Stereo M/S Decoder", + "Description": "Uses Mid-Side-Decoding to create stereo signals", + "ExpectedInputNormalization": "sn3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.5, + 0.5, + 0, + 0 + ], + [ + 0.5, + -0.5, + 0, + 0 + ] + ], + "Routing": [ + 1, + 2 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Produktionsstudio.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Produktionsstudio.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Produktionsstudio.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Produktionsstudio.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,820 @@ +{ + "Name": "IEM Produktionsstudio Decoder & Layout", + "Description": "This configuration file was created with the IEM AllRADecoder v0.4.0 plug-in. 18 Jun 2018 1:35:14pm", + "Decoder": { + "Name": "IEM Produktionsstudio", + "Description": "A 7th order Ambisonics decoder for the IEM Produktionsstudio.", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "SubwooferChannel" : 4, + "Matrix": [ + [ + 0.07179858535528182983, + 0.06890045851469039917, + -0.03073602356016635895, + 0.07925526052713394165, + 0.09105876088142395020, + -0.02993733808398246765, + -0.03507712110877037048, + -0.03520768880844116211, + 0.01343082450330257416, + 0.06048857048153877258, + -0.03730679303407669067, + -0.01656924746930599213, + 0.01747567951679229736, + -0.01899305172264575958, + -0.00677113933488726616, + -0.03668531030416488647, + 0.01710115000605583191, + -0.02217375487089157104, + -0.01082219369709491730, + 0.00442136358469724655, + 0.01101768482476472855, + 0.00583936413750052452, + -0.00152079178951680660, + 0.01082920096814632416, + -0.04385581985116004944, + -0.00486087845638394356, + -0.00727863702923059464, + -0.00244083395227789879, + -0.00418216921389102936, + 0.00849351286888122559, + 0.00046096765436232090, + 0.00992959365248680115, + 0.00029910463490523398, + 0.00157214631326496601, + 0.00888274610042572021, + -0.02559242956340312958, + -0.00507186958566308022, + -0.00531880464404821396, + 0.00034844956826418638, + -0.00759502639994025230, + 0.01059541944414377213, + 0.00170199514832347631, + -0.00706200022250413895, + 0.00143144547473639250, + 0.00191595626529306173, + 0.00600487086921930313, + -0.00091247510863468051, + 0.00174653122667223215, + -0.01051187701523303986, + -0.00110554159618914127, + -0.00900463480502367020, + -0.00077748630428686738, + -0.00247668195515871048, + 0.00668299524113535881, + 0.00184452987741678953, + -0.00321728643029928207, + -0.00156696559861302376, + -0.00401058094576001167, + -0.00029065419221296906, + -0.00317128235474228859, + 0.01014871802181005478, + -0.00224402197636663914, + 0.00201176921837031841, + -0.00722226453945040703 + ], + [ + 0.07179898768663406372, + -0.06890495866537094116, + -0.03073412179946899414, + 0.07925462722778320312, + -0.09105984866619110107, + 0.02993473783135414124, + -0.03508225828409194946, + -0.03521287068724632263, + 0.01342305261641740799, + -0.06048038974404335022, + 0.03730750083923339844, + 0.01657016016542911530, + 0.01748218387365341187, + -0.01899102889001369476, + -0.00678194127976894379, + -0.03669248521327972412, + -0.01708872802555561066, + 0.02218237146735191345, + 0.01081668678671121597, + -0.00442060874775052071, + 0.01101083680987358093, + 0.00584154250100255013, + -0.00152010773308575153, + 0.01081666629761457443, + -0.04385551437735557556, + 0.00487168552353978157, + 0.00729581015184521675, + 0.00243622809648513794, + 0.00418589357286691666, + -0.00848823785781860352, + 0.00046734185889363289, + 0.00993043743073940277, + 0.00030170983518473804, + 0.00156410783529281616, + 0.00887579936534166336, + -0.02558643370866775513, + 0.00508123682811856270, + 0.00533809140324592590, + -0.00034309108741581440, + 0.00759840104728937149, + -0.01059315912425518036, + -0.00170271715614944696, + -0.00707099866122007370, + 0.00143223244231194258, + 0.00192575785331428051, + 0.00601092586293816566, + -0.00092305493308231235, + 0.00175100064370781183, + -0.01050279568880796432, + 0.00111288996413350105, + 0.00901674386113882065, + 0.00078862608643248677, + 0.00247575249522924423, + -0.00668930821120738983, + -0.00184103089850395918, + 0.00321806268766522408, + -0.00155443081166595221, + -0.00401915702968835831, + -0.00028821150772273540, + -0.00315798167139291763, + 0.01015719491988420486, + -0.00224616937339305878, + 0.00202500796876847744, + -0.00720882229506969452 + ], + [ + 0.06600356847047805786, + 0.00000136531116368133, + -0.00688078720122575760, + 0.09884190559387207031, + 0.00000084188837945476, + -0.00000030318059884848, + -0.03287663683295249939, + -0.00720807909965515137, + 0.09149980545043945312, + -0.00000126919735521369, + -0.00000026915975581687, + 0.00000439860878032050, + -0.00667334487661719322, + -0.02095468528568744659, + -0.00590340234339237213, + 0.07746142148971557617, + -0.00000382961343348143, + -0.00000034801433912435, + 0.00000935492698772578, + -0.00000187641626325785, + 0.00200499710626900196, + -0.01560021471232175827, + -0.00525473430752754211, + -0.00672785378992557526, + 0.06023628264665603638, + -0.00000565382606509957, + -0.00000136722428578651, + 0.00001129502834373852, + -0.00000414334408560535, + -0.00000218234185922483, + 0.00969801191240549088, + -0.00336846453137695789, + -0.01550699584186077118, + 0.00304398103617131710, + -0.00881353113800287247, + 0.04252831637859344482, + -0.00000591179241382633, + -0.00000306374954561761, + 0.00000985597125691129, + -0.00000345812281921098, + 0.00000085869021404505, + 0.00000258308500633575, + 0.00528305117040872574, + 0.00688225124031305313, + -0.00346496747806668282, + -0.01280798204243183136, + 0.00574369402602314949, + -0.01089753955602645874, + 0.02637133747339248657, + -0.00000439797850049217, + -0.00000431839407610823, + 0.00000621872277406510, + -0.00000043697860974135, + 0.00000503928231410100, + 0.00000073319154125784, + -0.00000251304027187871, + -0.00041693533421494067, + 0.00737680867314338684, + 0.00111107493285089731, + -0.00074532470898702741, + -0.00972442328929901123, + 0.00491585675626993179, + -0.01196981966495513916, + 0.01309331413358449936 + ], + [ + 0.10288899391889572144, + 0.14673013985157012939, + -0.02289180643856525421, + 0.01145131606608629227, + 0.01769954897463321686, + -0.02935401350259780884, + -0.05041123926639556885, + -0.00500521529465913773, + -0.11733006685972213745, + -0.07529147714376449585, + -0.00764917861670255661, + -0.03151643648743629456, + 0.00211182306520640850, + -0.00263045798055827618, + 0.01952451653778553009, + -0.01560259331017732620, + -0.00718578882515430450, + 0.00982216279953718185, + -0.00180492061190307140, + -0.01208038721233606339, + 0.00728974211961030960, + 0.00065434485441073775, + 0.00713996961712837219, + 0.00666682422161102295, + 0.03542622178792953491, + 0.00735300965607166290, + 0.00336835207417607307, + -0.00423741387203335762, + -0.00074949947884306312, + 0.00240734103135764599, + 0.01019372884184122086, + 0.00135191017761826515, + 0.01549102831631898880, + 0.00022310996428132057, + -0.00369336898438632488, + -0.00244442396797239780, + -0.00840129237622022629, + -0.00156771787442266941, + -0.00051567942136898637, + 0.01139751635491847992, + 0.00207544886507093906, + 0.00763263553380966187, + 0.00182252749800682068, + 0.00032009498681873083, + -0.00011941260163439438, + 0.00171077158302068710, + 0.00615036394447088242, + -0.00003315131834824570, + 0.00632228842005133629, + 0.00879169255495071411, + 0.00169679464306682348, + 0.00335338339209556580, + 0.00115601788274943829, + -0.00021842920978087932, + 0.00021650684357155114, + 0.00499276071786880493, + -0.00126733619254082441, + -0.00050044100498780608, + -0.00056556524941697717, + -0.00194505206309258938, + -0.00502574350684881210, + 0.00013722230505663902, + 0.00181598716881126165, + 0.00868011359125375748 + ], + [ + 0.10287643969058990479, + -0.14671874046325683594, + -0.02289388328790664673, + 0.01145371608436107635, + -0.01770331524312496185, + 0.02936263382434844971, + -0.05041544511914253235, + -0.00500596687197685242, + -0.11732846498489379883, + 0.07529763877391815186, + 0.00764859141781926155, + 0.03152351453900337219, + 0.00212395540438592434, + -0.00263181771151721478, + 0.01952982507646083832, + -0.01560599543154239655, + 0.00718651711940765381, + -0.00981883145868778229, + 0.00180769816506654024, + 0.01207263115793466568, + 0.00729465158656239510, + 0.00064801232656463981, + 0.00714037707075476646, + 0.00666629057377576828, + 0.03543492034077644348, + -0.00735949212685227394, + -0.00336848525330424309, + 0.00424563698470592499, + 0.00075716990977525711, + -0.00241358205676078796, + 0.01019242778420448303, + 0.00135580915957689285, + 0.01549692638218402863, + 0.00022259770776145160, + -0.00368353514932096004, + -0.00244683679193258286, + 0.00840509030967950821, + 0.00155928405001759529, + 0.00051936687668785453, + -0.01141140516847372055, + -0.00207370775751769543, + -0.00763294752687215805, + 0.00181612442247569561, + 0.00031933397985994816, + -0.00011976864334428683, + 0.00171761482488363981, + 0.00616159290075302124, + -0.00003394966915948316, + 0.00632069446146488190, + -0.00879502948373556137, + -0.00169569300487637520, + -0.00336018996313214302, + -0.00115717703010886908, + 0.00021432593348436058, + -0.00021968437067698687, + -0.00499215861782431602, + -0.00126717379316687584, + -0.00048827083082869649, + -0.00056536146439611912, + -0.00194272177759557962, + -0.00503692682832479477, + 0.00014088768512010574, + 0.00181576807517558336, + 0.00868281349539756775 + ], + [ + 0.12046553194522857666, + 0.07388502359390258789, + -0.04268862679600715637, + -0.14579038321971893311, + -0.09225143492221832275, + -0.02949005924165248871, + -0.05765694379806518555, + 0.04847796633839607239, + 0.06346884369850158691, + 0.05102657526731491089, + 0.03177849575877189636, + -0.01806606911122798920, + 0.01733323000371456146, + 0.03165968880057334900, + -0.01223536673933267593, + 0.00078362278873100877, + -0.00100692210253328085, + -0.00947809498757123947, + 0.01122260559350252151, + 0.00227426434867084026, + 0.01391800213605165482, + 0.00347872590646147728, + -0.00332101946696639061, + -0.00909020379185676575, + -0.01370952557772397995, + -0.01741614937782287598, + -0.00832108873873949051, + -0.00202531646937131882, + 0.00877855811268091202, + 0.00867293495684862137, + 0.00757791101932525635, + -0.01029060315340757370, + -0.01117971166968345642, + -0.00369138130918145180, + 0.00542238960042595863, + -0.00159219559282064438, + 0.00849387701600790024, + 0.00689550815150141716, + -0.00027725723339244723, + -0.01213523838669061661, + -0.00924002937972545624, + 0.00343912187963724136, + -0.00536186248064041138, + -0.00782659463584423065, + 0.00055829074699431658, + 0.00304434145800769329, + 0.00149659602902829647, + 0.00418354989960789680, + 0.00997786875814199448, + 0.00203497149050235748, + 0.00240941601805388927, + -0.00161048548761755228, + 0.00483287451788783073, + 0.00289743626490235329, + -0.00447152787819504738, + -0.00246895779855549335, + -0.00329064694233238697, + -0.00064396194647997618, + 0.00216613058000802994, + 0.00416009686887264252, + 0.00374235794879496098, + 0.00053857051534578204, + -0.00367514998652040958, + -0.00368053792044520378 + ], + [ + 0.12047680467367172241, + -0.07389564067125320435, + -0.04269138723611831665, + -0.14579600095748901367, + 0.09226128458976745605, + 0.02948100678622722626, + -0.05765077844262123108, + 0.04847547784447669983, + 0.06346326321363449097, + -0.05102688446640968323, + -0.03176829591393470764, + 0.01807245612144470215, + 0.01731706038117408752, + 0.03165232762694358826, + -0.01223803870379924774, + 0.00078940630191937089, + 0.00100350670982152224, + 0.00947485771030187607, + -0.01122223865240812302, + -0.00227140751667320728, + 0.01392233092337846756, + 0.00348994950763881207, + -0.00331688066944479942, + -0.00908285658806562424, + -0.01370800472795963287, + 0.01741773635149002075, + 0.00831538438796997070, + 0.00202184682711958885, + -0.00878241006284952164, + -0.00866795703768730164, + 0.00757198035717010498, + -0.01028767507523298264, + -0.01118228957056999207, + -0.00368263572454452515, + 0.00541680352762341499, + -0.00159443973097950220, + -0.00849713478237390518, + -0.00688773160800337791, + 0.00027359434170648456, + 0.01213713269680738449, + 0.00923311989754438400, + -0.00343892537057399750, + -0.00534431543201208115, + -0.00782327074557542801, + 0.00056017236784100533, + 0.00304007460363209248, + 0.00148245308082550764, + 0.00418222742155194283, + 0.00997527502477169037, + -0.00202999729663133621, + -0.00240998086519539356, + 0.00161764281801879406, + -0.00483157951384782791, + -0.00289601599797606468, + 0.00446837302297353745, + 0.00246658804826438427, + -0.00329648237675428391, + -0.00065621780231595039, + 0.00216844258829951286, + 0.00415342301130294800, + 0.00374797964468598366, + 0.00054190069204196334, + -0.00366987567394971848, + -0.00367764732800424099 + ], + [ + 0.08719463646411895752, + 0.06627514213323593140, + 0.09104207158088684082, + 0.06646539270877838135, + 0.04883769154548645020, + 0.07963126897811889648, + 0.02364492602646350861, + 0.07971866428852081299, + 0.00025928925606422126, + 0.01113488525152206421, + 0.05906938016414642334, + 0.04234284907579421997, + -0.03167871758341789246, + 0.04220714420080184937, + 0.00015282425738405436, + -0.01069153938442468643, + 0.00026993424398824573, + 0.01125631574541330338, + 0.03189876303076744080, + 0.00042500087874941528, + -0.03509102016687393188, + 0.00028075624140910804, + -0.00012669961142819375, + -0.01094436831772327423, + 0.00116728211287409067, + 0.00434967875480651855, + 0.00022626946156378835, + 0.00186178041622042656, + 0.00106227269861847162, + -0.01085180323570966721, + -0.01167919114232063293, + -0.01079667359590530396, + -0.00018439276027493179, + -0.00200145342387259007, + 0.00376376230269670486, + 0.00415606098249554634, + 0.00518946535885334015, + 0.00518305739387869835, + -0.00003676239430205896, + -0.00644415430724620819, + -0.00527713680639863014, + -0.00096027145627886057, + 0.00031434136326424778, + -0.00081340351607650518, + 0.00002754210436251014, + 0.00613821344450116158, + 0.00651808734983205795, + 0.00495206983759999275, + 0.00005659750968334265, + 0.00204864447005093098, + 0.00482536572962999344, + 0.00257196556776762009, + -0.00019364316540304571, + -0.00582191813737154007, + 0.00497484253719449043, + 0.00419980008155107498, + -0.00371125154197216034, + 0.00421512452885508537, + 0.00016435571887996048, + 0.00579978246241807938, + 0.00718728406354784966, + 0.00250536389648914337, + -0.00003834538438240997, + -0.00166549580171704292 + ], + [ + 0.08719597756862640381, + -0.06627465784549713135, + 0.09104175120592117310, + 0.06646483391523361206, + -0.04883062094449996948, + -0.07962969690561294556, + 0.02364103496074676514, + 0.07971761375665664673, + 0.00025769573403522372, + -0.01112996228039264679, + -0.05905931815505027771, + -0.04234127700328826904, + -0.03168413043022155762, + 0.04220667108893394470, + 0.00014931496116332710, + -0.01068824250251054764, + -0.00027150046662427485, + -0.01124515943229198456, + -0.03189539164304733276, + -0.00042492343345656991, + -0.03509424999356269836, + 0.00028112824657000601, + -0.00013040893827565014, + -0.01094129681587219238, + 0.00116656743921339512, + -0.00435055093839764595, + -0.00022245207219384611, + -0.00185266451444476843, + -0.00107037473935633898, + 0.01085036154836416245, + -0.01167817227542400360, + -0.01079675089567899704, + -0.00018662944785319269, + -0.00200281478464603424, + 0.00376427872106432915, + 0.00415157526731491089, + -0.00519278179854154587, + -0.00517755001783370972, + 0.00004183806959190406, + 0.00644293986260890961, + 0.00526509946212172508, + 0.00095829583005979657, + 0.00031783714075572789, + -0.00081405398668721318, + 0.00002622264400997665, + 0.00613158615306019783, + 0.00651894835755228996, + 0.00494939740747213364, + 0.00005240435348241590, + -0.00205527781508862972, + -0.00482215872034430504, + -0.00256692199036478996, + 0.00019135221373289824, + 0.00581528991460800171, + -0.00498008448630571365, + -0.00420134421437978745, + -0.00371036329306662083, + 0.00421568378806114197, + 0.00016351007798220962, + 0.00579245714470744133, + 0.00718706194311380386, + 0.00250511569902300835, + -0.00003720127278938890, + -0.00167522567790001631 + ], + [ + 0.08879416435956954956, + 0.06371914595365524292, + 0.09244900196790695190, + -0.06881105154752731323, + -0.04363299533724784851, + 0.07827461510896682739, + 0.02308157272636890411, + -0.08242080360651016235, + 0.00244203140027821064, + 0.00403129402548074722, + -0.05585176125168800354, + 0.04396658390760421753, + -0.03379129990935325623, + -0.04254111275076866150, + 0.00302893598563969135, + 0.00843612104654312134, + 0.00720340851694345474, + 0.00629813084378838539, + -0.03442659229040145874, + 0.00248756306245923042, + -0.03634542599320411682, + 0.00231137196533381939, + 0.00085754011524841189, + 0.00808758102357387543, + 0.00370668782852590084, + -0.00190779299009591341, + 0.00554002448916435242, + 0.00440737185999751091, + -0.00521974824368953705, + -0.01129242964088916779, + -0.01046164520084857941, + 0.01333236414939165115, + -0.00215603644028306007, + 0.00097036868100985885, + 0.00658943364396691322, + -0.00665830681100487709, + -0.00094106403412297368, + -0.00009294412302551791, + -0.00180669024121016264, + -0.00089944578940048814, + 0.00529522821307182312, + -0.00298879994079470634, + 0.00250805215910077095, + 0.00013262497668620199, + -0.00255163782276213169, + -0.00455124303698539734, + 0.00725620379671454430, + -0.00748194428160786629, + 0.00187056011054664850, + -0.00037005194462835789, + -0.00095619430067017674, + 0.00345944147557020187, + -0.00553154340013861656, + -0.00493688089773058891, + -0.00149789755232632160, + 0.00356547371484339237, + -0.00337178679183125496, + -0.00714381318539381027, + 0.00013590768503490835, + -0.00368800177238881588, + 0.00569333927705883980, + -0.00290159601718187332, + 0.00171516032423824072, + 0.00091580336447805166 + ], + [ + 0.08879477530717849731, + -0.06372036784887313843, + 0.09245226532220840454, + -0.06880509853363037109, + 0.04362626001238822937, + -0.07827806472778320312, + 0.02308510057628154755, + -0.08241673558950424194, + 0.00244032684713602066, + -0.00403156876564025879, + 0.05584440007805824280, + -0.04396861046552658081, + -0.03379321098327636719, + -0.04254157468676567078, + 0.00302556436508893967, + 0.00842829234898090363, + -0.00719747738912701607, + -0.00629687868058681488, + 0.03442244976758956909, + -0.00248376443050801754, + -0.03634978085756301880, + 0.00231102970428764820, + 0.00085511937504634261, + 0.00808073673397302628, + 0.00370935071259737015, + 0.00190785876475274563, + -0.00553525658324360847, + -0.00440558232367038727, + 0.00521940970793366432, + 0.01129872165620326996, + -0.01045941468328237534, + 0.01333429664373397827, + -0.00215498055331408978, + 0.00096850836416706443, + 0.00658713607117533684, + -0.00666160788387060165, + 0.00094372616149485111, + 0.00009936840797308832, + 0.00180884217843413353, + 0.00089848705101758242, + -0.00529265962541103363, + 0.00299072614870965481, + 0.00251698214560747147, + 0.00013314743409864604, + -0.00254834070801734924, + -0.00455029355362057686, + 0.00724843796342611313, + -0.00748145347461104393, + 0.00187771581113338470, + 0.00036786057171411812, + 0.00095625605899840593, + -0.00345006887800991535, + 0.00553402351215481758, + 0.00493278447538614273, + 0.00150011398363858461, + -0.00356760504655539989, + -0.00336607941426336765, + -0.00714562879875302315, + 0.00013826113718096167, + -0.00368612981401383877, + 0.00568730384111404419, + -0.00289526907727122307, + 0.00172532175201922655, + 0.00091794988838955760 + ], + [ + 0.05659971013665199280, + 0.00000282856717603863, + 0.08960649371147155762, + 0.00000773492411099141, + 0.00000328664532389666, + 0.00000503744422530872, + 0.09609330445528030396, + 0.00001244372560904594, + 0.00000171108740687487, + 0.00000011911063069192, + 0.00000584412646276178, + 0.00000570844485991984, + 0.08464940637350082397, + 0.00001170283212559298, + 0.00000362244691132219, + -0.00000451309051641147, + 0.00000053774516572958, + 0.00000037827280152669, + 0.00000616364241068368, + 0.00000425426696892828, + 0.06218866258859634399, + 0.00000571091095480369, + 0.00000510941117681796, + -0.00000906836066860706, + -0.00109947985038161278, + 0.00000180564404672623, + 0.00000165294659382198, + 0.00000081875498381123, + 0.00000350068398802250, + 0.00000097950817234960, + 0.03612607344985008240, + -0.00000214391025110672, + 0.00000529139379068511, + -0.00001138761763286311, + -0.00284137134440243244, + -0.00000192111770047632, + -0.00000144711373195605, + 0.00000479032496514264, + 0.00000350121945302817, + 0.00000136002267936419, + -0.00000090739229108294, + -0.00000297568840323947, + 0.01299224793910980225, + -0.00000755656674300553, + 0.00000369752433471149, + -0.00000925266067497432, + -0.00506110256537795067, + -0.00000473149793833727, + 0.00000091010923597423, + 0.00000055639668516960, + -0.00000396994937545969, + 0.00000859224473970244, + 0.00000580227788304910, + 0.00000177404353962629, + -0.00000445172327090404, + -0.00000602366299062851, + -0.00299328891560435295, + -0.00000800655016064411, + 0.00000060345439578668, + -0.00000298835857392987, + -0.00710881780833005905, + -0.00000776906381361187, + 0.00000244926377490629, + 0.00000243183467318886 + ] + ], + "Routing": [ + 1, + 2, + 3, + 7, + 8, + 5, + 6, + 9, + 10, + 11, + 12, + 13 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Quadraphonic.json iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Quadraphonic.json --- iem-plugin-suite-1.11.0/SimpleDecoder/Source/Presets/Quadraphonic.json 1970-01-01 00:00:00.000000000 +0000 +++ iem-plugin-suite-1.11.1/SimpleDecoder/Source/Presets/Quadraphonic.json 2020-04-02 15:28:39.000000000 +0000 @@ -0,0 +1,281 @@ +{ + "Decoder": { + "Name": "Quadraphonic", + "Description": "Channel order: FL FR RL RR", + "ExpectedInputNormalization": "n3d", + "Weights": "none", + "WeightsAlreadyApplied": false, + "Matrix": [ + [ + 0.3782190978527069, + 0.2006816565990448, + -3.065219516429352e-6, + 0.2006764858961105, + 0.1189835369586945, + 2.856433184206253e-6, + 0.05456873401999474, + -7.692250392210553e-7, + 8.186520972230937e-8, + 1.305635350945522e-6, + -6.042028530828247e-7, + 4.571683803078486e-6, + -5.379617959988536e-6, + -4.481257747102063e-6, + 1.038325265767526e-7, + 1.088635258383874e-6, + 4.231683892186311e-9, + 1.44090097364824e-6, + 0.01717651635408401, + 3.982030648330692e-6, + -0.003299062140285969, + -1.333375848844298e-6, + 3.353285364937619e-7, + -1.039341057662568e-7, + 0.01970149576663971, + -6.921745239196753e-7, + -1.252576851129561e-7, + 6.829958692833316e-6, + 3.185080004186602e-6, + -4.113027898711152e-6, + -1.601617213964346e-6, + 4.307922154112021e-6, + -5.543785874806417e-8, + 5.770537427451927e-6, + -1.874349322861235e-6, + -1.294887965741509e-7, + -0.009296035394072533, + 6.324862624751404e-7, + -1.383468344329231e-7, + 6.721677436871687e-6, + 0.006273643579334021, + -4.579153483064147e-6, + 0.0004151816829107702, + 3.705269818965462e-6, + 4.717222168437729e-7, + 3.138428382953862e-6, + 0.001772351330146194, + -3.07894651996321e-7, + 4.690923205430408e-8, + 6.851818739050941e-7, + 1.903342422338028e-6, + -6.530983682750957e-6, + 1.147942185752981e-7, + -1.45034869092342e-6, + 1.107368348129967e-6, + 1.013753262668615e-6, + -4.103395440324675e-6, + -1.541057827125769e-6, + 6.042007072437627e-8, + -2.559692120485124e-6, + 3.797714043685119e-6, + 7.259657650138251e-6, + -3.63802286074133e-7, + 2.264210650082532e-7 + ], + [ + 0.3782088458538055, + -0.2006832212209702, + 2.336624675081111e-6, + 0.2006765753030777, + -0.1189926192164421, + -2.010324351431336e-6, + 0.05456367507576942, + 5.604843167361651e-8, + -1.227131747327803e-7, + -4.48830951427226e-6, + -2.541403773648199e-6, + 4.118560639199131e-7, + 5.720435638068011e-6, + 3.072024583161692e-6, + -1.294813358754254e-7, + 2.916716312029166e-6, + -5.62452768804178e-8, + -3.36812924217611e-8, + -0.01717177592217922, + -5.010856511944439e-6, + -0.003313837107270956, + -4.10933807870606e-6, + -2.68395183411485e-7, + -1.466807248107216e-6, + 0.01971237733960152, + 4.345075922174146e-6, + -2.313182818625137e-7, + -6.621337433898589e-8, + 2.607016540423501e-6, + -1.028993665386224e-6, + 7.67793380873627e-7, + -2.060006863757735e-6, + 3.771995693568897e-8, + -2.635072178236442e-6, + 3.166597934978199e-6, + 3.331997731947922e-6, + 0.009306267835199833, + -1.690744056759286e-6, + 5.895789634280391e-9, + -7.089171049301513e-6, + -0.006274993531405926, + 4.579408141580643e-6, + 0.0004047956317663193, + 2.081123056996148e-6, + -5.43258352081466e-7, + 4.308838924771408e-6, + 0.001768808229826391, + -2.682480499061057e-6, + 1.303090186866029e-7, + 4.483317297854228e-6, + 3.691024176077917e-6, + 4.800587021236424e-7, + 2.200212101399757e-8, + -1.492491833232634e-6, + -2.943049139503273e-6, + 8.188637252715125e-7, + 4.763872311741579e-6, + 3.700499462411244e-7, + 7.019624348458819e-8, + 1.216145165017224e-6, + -4.666268978326116e-6, + -3.048084181500599e-6, + 3.802798005381192e-7, + -3.497754960335442e-6 + ], + [ + 0.3782084286212921, + 0.2006741017103195, + 2.34060962611693e-6, + -0.2006807774305344, + -0.1189927980303764, + -2.0056886569364e-6, + 0.05456371977925301, + 4.644031648126656e-8, + -1.087685390643855e-7, + -4.487787919060793e-6, + -2.540412879170617e-6, + 4.173857348632737e-7, + 5.718829925172031e-6, + 3.074162123084534e-6, + -1.216918832369629e-7, + 2.914467131631682e-6, + -5.919665468923085e-8, + -1.799966220517035e-8, + -0.01717181876301765, + -5.006985247746343e-6, + -0.003313839435577393, + -4.104460913367802e-6, + -2.919820190072642e-7, + -1.475629346714413e-6, + 0.01971239782869816, + 4.349428763816832e-6, + -2.235391036720102e-7, + -7.048871708548177e-8, + 2.621429985083523e-6, + -1.039501057675807e-6, + 7.782574584780377e-7, + -2.031923258982715e-6, + 4.353151084046658e-8, + -2.637996431076317e-6, + 3.163757128277211e-6, + 3.330453864691663e-6, + 0.009306243620812893, + -1.69581846876099e-6, + 1.402947003015242e-8, + -7.083389846229693e-6, + -0.006275018211454153, + 4.578593234327855e-6, + 0.0004047936236020178, + 2.07852826861199e-6, + -5.300379939399136e-7, + 4.304274170863209e-6, + 0.001768807880580425, + -2.675121550055337e-6, + 1.275265759659305e-7, + 4.486925263336161e-6, + 3.698667569551617e-6, + 4.848524213230121e-7, + 1.608347055537251e-8, + -1.486311816734087e-6, + -2.943127583421301e-6, + 8.367832151634502e-7, + 4.756906946568051e-6, + 3.452482815191615e-7, + 6.681167263877796e-8, + 1.21183666124125e-6, + -4.660131253331201e-6, + -3.040835736101144e-6, + 3.662161134343478e-7, + -3.500023012747988e-6 + ], + [ + 0.3782190680503845, + -0.2006760388612747, + -3.055948809560505e-6, + -0.2006811201572418, + 0.1189836412668228, + 2.856752871593926e-6, + 0.05456861853599548, + -7.616612833771796e-7, + 9.846787918377231e-8, + 1.306310650761588e-6, + -6.025949232935091e-7, + 4.579676897265017e-6, + -5.361218427424319e-6, + -4.481376890907995e-6, + 9.497676956016221e-8, + 1.101989141716331e-6, + 8.842590659696725e-9, + 1.444838630959566e-6, + 0.01717655174434185, + 3.981623194704298e-6, + -0.003299057250842452, + -1.327108293480705e-6, + 3.351210295932106e-7, + -1.053224991665047e-7, + 0.01970144361257553, + -6.826263074799499e-7, + -1.271301357519405e-7, + 6.847881650173804e-6, + 3.206695282642613e-6, + -4.090694346814416e-6, + -1.591542741152807e-6, + 4.323422217566986e-6, + -5.364958610698523e-8, + 5.762344244431006e-6, + -1.883656409518153e-6, + -1.220847991589835e-7, + -0.009296022355556488, + 6.356110588967567e-7, + -1.345076725556282e-7, + 6.715295967296697e-6, + 0.006273627746850252, + -4.56955694971839e-6, + 0.0004151781904511154, + 3.713055548359989e-6, + 4.689770207733091e-7, + 3.141445631626993e-6, + 0.001772353309206665, + -2.996575574343296e-7, + 3.903720369180519e-8, + 6.959218126212363e-7, + 1.888961946860945e-6, + -6.538328761962475e-6, + 1.175306678646848e-7, + -1.448547550353396e-6, + 1.104869170376332e-6, + 9.975902912628953e-7, + -4.108834218641277e-6, + -1.562280203870614e-6, + 5.496808341831638e-8, + -2.548826387283043e-6, + 3.795710654230788e-6, + 7.255721811816329e-6, + -3.679119231492223e-7, + 2.342244016517725e-7 + ] + ], + "Routing": [ + 1, + 2, + 3, + 4 + ] + } +} diff -Nru iem-plugin-suite-1.11.0/StereoEncoder/Source/PluginProcessor.cpp iem-plugin-suite-1.11.1/StereoEncoder/Source/PluginProcessor.cpp --- iem-plugin-suite-1.11.0/StereoEncoder/Source/PluginProcessor.cpp 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/StereoEncoder/Source/PluginProcessor.cpp 2020-04-02 15:28:39.000000000 +0000 @@ -51,6 +51,7 @@ parameters.addParameterListener("roll", this); parameters.addParameterListener("width", this); parameters.addParameterListener("orderSetting", this); + parameters.addParameterListener("useSN3D", this); orderSetting = parameters.getRawParameterValue("orderSetting"); useSN3D = parameters.getRawParameterValue("useSN3D"); @@ -173,13 +174,14 @@ processorUpdatingParams = false; } -void StereoEncoderAudioProcessor::processBlock(AudioSampleBuffer &buffer, MidiBuffer &midiMessages) { +void StereoEncoderAudioProcessor::processBlock (AudioBuffer& buffer, MidiBuffer &midiMessages) +{ checkInputAndOutput(this, 2, *orderSetting); const int L = buffer.getNumSamples(); const int totalNumInputChannels = getTotalNumInputChannels() < 2 ? 1 : 2; - const int ambisonicOrder = *orderSetting < 0.5f ? output.getOrder() : roundToInt (*orderSetting) - 1; + const int ambisonicOrder = *orderSetting < 0.5f ? output.getOrder() : roundToInt (orderSetting->load()) - 1; const int nChOut = jmin (buffer.getNumChannels(), square(ambisonicOrder + 1)); for (int i = 0; i < totalNumInputChannels; ++i) @@ -331,6 +333,10 @@ userChangedIOSettings = true; positionHasChanged = true; } + else if (parameterID == "useSN3D") + { + positionHasChanged = true; + } } diff -Nru iem-plugin-suite-1.11.0/StereoEncoder/Source/PluginProcessor.h iem-plugin-suite-1.11.1/StereoEncoder/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/StereoEncoder/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/StereoEncoder/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -50,7 +50,7 @@ void prepareToPlay (double sampleRate, int samplesPerBlock) override; void releaseResources() override; - void processBlock (AudioSampleBuffer&, MidiBuffer&) override; + void processBlock (AudioBuffer&, MidiBuffer&) override; //============================================================================== AudioProcessorEditor* createEditor() override; @@ -86,17 +86,17 @@ Atomic updatedPositionData; - float *orderSetting; - float *useSN3D; - float *qw; - float *qx; - float *qy; - float *qz; - float *azimuth; - float *elevation; - float *roll; - float *width; - float *highQuality; + std::atomic* orderSetting; + std::atomic* useSN3D; + std::atomic* qw; + std::atomic* qx; + std::atomic* qy; + std::atomic* qz; + std::atomic* azimuth; + std::atomic* elevation; + std::atomic* roll; + std::atomic* width; + std::atomic* highQuality; // -------------------- diff -Nru iem-plugin-suite-1.11.0/StereoEncoder/StereoEncoder.jucer iem-plugin-suite-1.11.1/StereoEncoder/StereoEncoder.jucer --- iem-plugin-suite-1.11.0/StereoEncoder/StereoEncoder.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/StereoEncoder/StereoEncoder.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,6 +1,6 @@ -load()), nCh); // create mask for all flips if (doFlipX || doFlipY || doFlipZ) @@ -191,7 +191,7 @@ // lower order ambisonics weighting if (orderIn < orderOut) { - const int weightType = roundToInt (*loaWeights); + const int weightType = roundToInt (loaWeights->load()); if (weightType == 1) // maxrE { FloatVectorOperations::multiply (weights, getMaxRELUT (orderIn), nChannelsIn); diff -Nru iem-plugin-suite-1.11.0/ToolBox/Source/PluginProcessor.h iem-plugin-suite-1.11.1/ToolBox/Source/PluginProcessor.h --- iem-plugin-suite-1.11.0/ToolBox/Source/PluginProcessor.h 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/ToolBox/Source/PluginProcessor.h 2020-04-02 15:28:39.000000000 +0000 @@ -72,15 +72,15 @@ private: //============================================================================== // list of used audio parameters - float* inputOrderSetting; - float* outputOrderSetting; - float* useSn3dInput; - float* useSn3dOutput; - float* flipX; - float* flipY; - float* flipZ; - float* loaWeights; - float* gain; + std::atomic* inputOrderSetting; + std::atomic* outputOrderSetting; + std::atomic* useSn3dInput; + std::atomic* useSn3dOutput; + std::atomic* flipX; + std::atomic* flipY; + std::atomic* flipZ; + std::atomic* loaWeights; + std::atomic* gain; float previousWeights[64]; diff -Nru iem-plugin-suite-1.11.0/ToolBox/ToolBox.jucer iem-plugin-suite-1.11.1/ToolBox/ToolBox.jucer --- iem-plugin-suite-1.11.0/ToolBox/ToolBox.jucer 2019-11-15 11:02:27.000000000 +0000 +++ iem-plugin-suite-1.11.1/ToolBox/ToolBox.jucer 2020-04-02 15:28:39.000000000 +0000 @@ -1,7 +1,7 @@