From dffcdd9206d44788aab0e656215cfa40b0b0f62f Mon Sep 17 00:00:00 2001 From: Dylan Marcus Date: Fri, 15 Mar 2024 13:18:39 -0400 Subject: [PATCH] update encode includes --- ...nerMode.java => Mach1EncodePannerModeType.java} | 14 +++++++------- ...nerMode.java => Mach1EncodePannerModeType.java} | 14 +++++++------- ...nerMode.java => Mach1EncodePannerModeType.java} | 14 +++++++------- ...nerMode.java => Mach1EncodePannerModeType.java} | 14 +++++++------- .../beaglebone/include/Mach1Encode.cpp | 10 +++++++++- .../arm-chipsets/beaglebone/include/Mach1Encode.h | 6 ++++-- .../beaglebone/include/Mach1EncodeCAPI.h | 6 ++++-- .../gcc-arm-cortexm0-cxx14/include/Mach1Encode.cpp | 10 +++++++++- .../gcc-arm-cortexm0-cxx14/include/Mach1Encode.h | 6 ++++-- .../include/Mach1EncodeCAPI.h | 6 ++++-- .../gcc-armhf-neon-vfpv4/include/Mach1Encode.cpp | 10 +++++++++- .../gcc-armhf-neon-vfpv4/include/Mach1Encode.h | 6 ++++-- .../gcc-armhf-neon-vfpv4/include/Mach1EncodeCAPI.h | 6 ++++-- .../arm-chipsets/linux-arm/include/Mach1Encode.cpp | 10 +++++++++- .../arm-chipsets/linux-arm/include/Mach1Encode.h | 6 ++++-- .../linux-arm/include/Mach1EncodeCAPI.h | 6 ++++-- .../raspberrypi2-cxx11/include/Mach1Encode.cpp | 10 +++++++++- .../raspberrypi2-cxx11/include/Mach1Encode.h | 6 ++++-- .../raspberrypi2-cxx11/include/Mach1EncodeCAPI.h | 6 ++++-- .../raspberrypi3-cxx11/include/Mach1Encode.cpp | 10 +++++++++- .../raspberrypi3-cxx11/include/Mach1Encode.h | 6 ++++-- .../raspberrypi3-cxx11/include/Mach1EncodeCAPI.h | 6 ++++-- mach1spatial-libs/ios/include/Mach1Encode.swift | 2 +- mach1spatial-libs/ios/include/Mach1EncodeCAPI.h | 4 ++-- mach1spatial-libs/linux/include/Mach1Encode.cpp | 10 +++++++++- mach1spatial-libs/linux/include/Mach1Encode.h | 6 ++++-- mach1spatial-libs/linux/include/Mach1EncodeCAPI.h | 6 ++++-- .../osx-10-13/include/Mach1Encode.cpp | 10 +++++++++- mach1spatial-libs/osx-10-13/include/Mach1Encode.h | 6 ++++-- .../osx-10-13/include/Mach1EncodeCAPI.h | 6 ++++-- .../vs-15-2017-x86/include/Mach1Encode.cpp | 10 +++++++++- .../vs-15-2017-x86/include/Mach1Encode.h | 6 ++++-- .../vs-15-2017-x86/include/Mach1EncodeCAPI.h | 6 ++++-- .../vs-15-2017-x86_64/include/Mach1Encode.cpp | 10 +++++++++- .../vs-15-2017-x86_64/include/Mach1Encode.h | 6 ++++-- .../vs-15-2017-x86_64/include/Mach1EncodeCAPI.h | 6 ++++-- .../windows-x86/include/Mach1Encode.cpp | 10 +++++++++- .../windows-x86/include/Mach1Encode.h | 6 ++++-- .../windows-x86/include/Mach1EncodeCAPI.h | 6 ++++-- .../windows-x86_64/include/Mach1Encode.cpp | 10 +++++++++- .../windows-x86_64/include/Mach1Encode.h | 6 ++++-- .../windows-x86_64/include/Mach1EncodeCAPI.h | 6 ++++-- mach1spatial-libs/xcode/include/Mach1Encode.cpp | 10 +++++++++- mach1spatial-libs/xcode/include/Mach1Encode.h | 6 ++++-- mach1spatial-libs/xcode/include/Mach1EncodeCAPI.h | 6 ++++-- 45 files changed, 252 insertions(+), 96 deletions(-) rename mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/{Mach1EncodePannerMode.java => Mach1EncodePannerModeType.java} (62%) rename mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/{Mach1EncodePannerMode.java => Mach1EncodePannerModeType.java} (62%) rename mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/{Mach1EncodePannerMode.java => Mach1EncodePannerModeType.java} (62%) rename mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/{Mach1EncodePannerMode.java => Mach1EncodePannerModeType.java} (62%) diff --git a/mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java b/mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java similarity index 62% rename from mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java rename to mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java index 9f4ea257..c8a05dcc 100644 --- a/mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java +++ b/mach1spatial-libs/android-arm64-v8a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java @@ -8,10 +8,10 @@ package com.mach1.spatiallibs; -public final class Mach1EncodePannerMode { - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); - public final static Mach1EncodePannerMode Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); +public final class Mach1EncodePannerModeType { + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); + public final static Mach1EncodePannerModeType Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); public final int swigValue() { return swigValue; @@ -21,7 +21,7 @@ public String toString() { return swigName; } - public static Mach1EncodePannerMode swigToEnum(int swigValue) { + public static Mach1EncodePannerModeType swigToEnum(int swigValue) { if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue) return swigValues[swigValue]; for (int i = 0; i < swigValues.length; i++) @@ -41,13 +41,13 @@ private Mach1EncodePannerModeType(String swigName, int swigValue) { swigNext = swigValue+1; } - private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerMode swigEnum) { + private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerModeType swigEnum) { this.swigName = swigName; this.swigValue = swigEnum.swigValue; swigNext = this.swigValue+1; } - private static Mach1EncodePannerMode[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; + private static Mach1EncodePannerModeType[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; private static int swigNext = 0; private final int swigValue; private final String swigName; diff --git a/mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java b/mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java similarity index 62% rename from mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java rename to mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java index 9f4ea257..c8a05dcc 100644 --- a/mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java +++ b/mach1spatial-libs/android-armeabi-v7a/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java @@ -8,10 +8,10 @@ package com.mach1.spatiallibs; -public final class Mach1EncodePannerMode { - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); - public final static Mach1EncodePannerMode Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); +public final class Mach1EncodePannerModeType { + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); + public final static Mach1EncodePannerModeType Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); public final int swigValue() { return swigValue; @@ -21,7 +21,7 @@ public String toString() { return swigName; } - public static Mach1EncodePannerMode swigToEnum(int swigValue) { + public static Mach1EncodePannerModeType swigToEnum(int swigValue) { if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue) return swigValues[swigValue]; for (int i = 0; i < swigValues.length; i++) @@ -41,13 +41,13 @@ private Mach1EncodePannerModeType(String swigName, int swigValue) { swigNext = swigValue+1; } - private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerMode swigEnum) { + private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerModeType swigEnum) { this.swigName = swigName; this.swigValue = swigEnum.swigValue; swigNext = this.swigValue+1; } - private static Mach1EncodePannerMode[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; + private static Mach1EncodePannerModeType[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; private static int swigNext = 0; private final int swigValue; private final String swigName; diff --git a/mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java b/mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java similarity index 62% rename from mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java rename to mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java index 9f4ea257..c8a05dcc 100644 --- a/mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java +++ b/mach1spatial-libs/android-x86/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java @@ -8,10 +8,10 @@ package com.mach1.spatiallibs; -public final class Mach1EncodePannerMode { - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); - public final static Mach1EncodePannerMode Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); +public final class Mach1EncodePannerModeType { + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); + public final static Mach1EncodePannerModeType Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); public final int swigValue() { return swigValue; @@ -21,7 +21,7 @@ public String toString() { return swigName; } - public static Mach1EncodePannerMode swigToEnum(int swigValue) { + public static Mach1EncodePannerModeType swigToEnum(int swigValue) { if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue) return swigValues[swigValue]; for (int i = 0; i < swigValues.length; i++) @@ -41,13 +41,13 @@ private Mach1EncodePannerModeType(String swigName, int swigValue) { swigNext = swigValue+1; } - private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerMode swigEnum) { + private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerModeType swigEnum) { this.swigName = swigName; this.swigValue = swigEnum.swigValue; swigNext = this.swigValue+1; } - private static Mach1EncodePannerMode[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; + private static Mach1EncodePannerModeType[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; private static int swigNext = 0; private final int swigValue; private final String swigName; diff --git a/mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java b/mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java similarity index 62% rename from mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java rename to mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java index 9f4ea257..c8a05dcc 100644 --- a/mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerMode.java +++ b/mach1spatial-libs/android-x86_64/include/java/com/mach1/spatiallibs/Mach1EncodePannerModeType.java @@ -8,10 +8,10 @@ package com.mach1.spatiallibs; -public final class Mach1EncodePannerMode { - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); - public final static Mach1EncodePannerMode Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); - public final static Mach1EncodePannerMode Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); +public final class Mach1EncodePannerModeType { + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicLinear", Mach1EncodeModuleJNI.Mach1EncodePannerModeIsotropicLinear_get()); + public final static Mach1EncodePannerModeType Mach1EncodePannerModeIsotropicEqualPower = new Mach1EncodePannerModeType("Mach1EncodePannerModeIsotropicEqualPower"); + public final static Mach1EncodePannerModeType Mach1EncodePannerModePeriphonicLinear = new Mach1EncodePannerModeType("Mach1EncodePannerModePeriphonicLinear"); public final int swigValue() { return swigValue; @@ -21,7 +21,7 @@ public String toString() { return swigName; } - public static Mach1EncodePannerMode swigToEnum(int swigValue) { + public static Mach1EncodePannerModeType swigToEnum(int swigValue) { if (swigValue < swigValues.length && swigValue >= 0 && swigValues[swigValue].swigValue == swigValue) return swigValues[swigValue]; for (int i = 0; i < swigValues.length; i++) @@ -41,13 +41,13 @@ private Mach1EncodePannerModeType(String swigName, int swigValue) { swigNext = swigValue+1; } - private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerMode swigEnum) { + private Mach1EncodePannerModeType(String swigName, Mach1EncodePannerModeType swigEnum) { this.swigName = swigName; this.swigValue = swigEnum.swigValue; swigNext = this.swigValue+1; } - private static Mach1EncodePannerMode[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; + private static Mach1EncodePannerModeType[] swigValues = { Mach1EncodePannerModeIsotropicLinear, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear }; private static int swigNext = 0; private final int swigValue; private final String swigName; diff --git a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/beaglebone/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/gcc-arm-cortexm0-cxx14/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/gcc-armhf-neon-vfpv4/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/linux-arm/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/raspberrypi2-cxx11/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.cpp b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.cpp +++ b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.h b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.h +++ b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1EncodeCAPI.h b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/arm-chipsets/raspberrypi3-cxx11/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/ios/include/Mach1Encode.swift b/mach1spatial-libs/ios/include/Mach1Encode.swift index f712d518..f3259855 100644 --- a/mach1spatial-libs/ios/include/Mach1Encode.swift +++ b/mach1spatial-libs/ios/include/Mach1Encode.swift @@ -236,7 +236,7 @@ public class Mach1Encode { /// - value range: -PI/2 -> PI/2 } - public func setPannerMode(pannerMode: Mach1EncodePannerMode) { + public func setPannerMode(pannerMode: Mach1EncodePannerModeType) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode) /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/ios/include/Mach1EncodeCAPI.h b/mach1spatial-libs/ios/include/Mach1EncodeCAPI.h index 63fd454c..adcde178 100644 --- a/mach1spatial-libs/ios/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/ios/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -91,7 +91,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/linux/include/Mach1Encode.cpp b/mach1spatial-libs/linux/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/linux/include/Mach1Encode.cpp +++ b/mach1spatial-libs/linux/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/linux/include/Mach1Encode.h b/mach1spatial-libs/linux/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/linux/include/Mach1Encode.h +++ b/mach1spatial-libs/linux/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/linux/include/Mach1EncodeCAPI.h b/mach1spatial-libs/linux/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/linux/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/linux/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/osx-10-13/include/Mach1Encode.cpp b/mach1spatial-libs/osx-10-13/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/osx-10-13/include/Mach1Encode.cpp +++ b/mach1spatial-libs/osx-10-13/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/osx-10-13/include/Mach1Encode.h b/mach1spatial-libs/osx-10-13/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/osx-10-13/include/Mach1Encode.h +++ b/mach1spatial-libs/osx-10-13/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/osx-10-13/include/Mach1EncodeCAPI.h b/mach1spatial-libs/osx-10-13/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/osx-10-13/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/osx-10-13/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.cpp b/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.cpp +++ b/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.h b/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.h +++ b/mach1spatial-libs/vs-15-2017-x86/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/vs-15-2017-x86/include/Mach1EncodeCAPI.h b/mach1spatial-libs/vs-15-2017-x86/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/vs-15-2017-x86/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/vs-15-2017-x86/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.cpp b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.cpp +++ b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.h b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.h +++ b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1EncodeCAPI.h b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/vs-15-2017-x86_64/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/windows-x86/include/Mach1Encode.cpp b/mach1spatial-libs/windows-x86/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/windows-x86/include/Mach1Encode.cpp +++ b/mach1spatial-libs/windows-x86/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/windows-x86/include/Mach1Encode.h b/mach1spatial-libs/windows-x86/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/windows-x86/include/Mach1Encode.h +++ b/mach1spatial-libs/windows-x86/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/windows-x86/include/Mach1EncodeCAPI.h b/mach1spatial-libs/windows-x86/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/windows-x86/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/windows-x86/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/windows-x86_64/include/Mach1Encode.cpp b/mach1spatial-libs/windows-x86_64/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/windows-x86_64/include/Mach1Encode.cpp +++ b/mach1spatial-libs/windows-x86_64/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/windows-x86_64/include/Mach1Encode.h b/mach1spatial-libs/windows-x86_64/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/windows-x86_64/include/Mach1Encode.h +++ b/mach1spatial-libs/windows-x86_64/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/windows-x86_64/include/Mach1EncodeCAPI.h b/mach1spatial-libs/windows-x86_64/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/windows-x86_64/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/windows-x86_64/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/xcode/include/Mach1Encode.cpp b/mach1spatial-libs/xcode/include/Mach1Encode.cpp index 6ce620c4..b3d21443 100644 --- a/mach1spatial-libs/xcode/include/Mach1Encode.cpp +++ b/mach1spatial-libs/xcode/include/Mach1Encode.cpp @@ -132,6 +132,14 @@ Mach1EncodeOutputModeType Mach1Encode::getOutputMode() { return Mach1EncodeCAPI_getOutputMode(M1obj); } +Mach1EncodePannerModeType Mach1Encode::getPannerMode() { + return Mach1EncodeCAPI_getPannerMode(M1obj); +} + +bool Mach1Encode::getAutoOrbit() { + return Mach1EncodeCAPI_getAutoOrbit(M1obj); +} + int Mach1Encode::getInputChannelsCount() { return Mach1EncodeCAPI_getInputChannelsCount(M1obj); /// Returns the number of input channels/points that Mach1Encode instance has @@ -238,7 +246,7 @@ void Mach1Encode::setElevationRadians(float elevationFromMinusHalfPItoHalfPI) { /// - value range: -PI/2 -> PI/2 } -void Mach1Encode::setPannerMode(Mach1EncodePannerMode pannerMode) { +void Mach1Encode::setPannerMode(Mach1EncodePannerModeType pannerMode) { Mach1EncodeCAPI_setPannerMode(M1obj, pannerMode); /// Sets the style and mode of panner input calculation /// diff --git a/mach1spatial-libs/xcode/include/Mach1Encode.h b/mach1spatial-libs/xcode/include/Mach1Encode.h index 4bea8ee6..1c842c86 100644 --- a/mach1spatial-libs/xcode/include/Mach1Encode.h +++ b/mach1spatial-libs/xcode/include/Mach1Encode.h @@ -32,7 +32,9 @@ class Mach1Encode { Mach1EncodeInputModeType getInputMode(); Mach1EncodeOutputModeType getOutputMode(); - int getInputChannelsCount(); + Mach1EncodePannerModeType getPannerMode(); + bool getAutoOrbit(); + int getInputChannelsCount(); int getOutputChannelsCount(); template @@ -52,7 +54,7 @@ class Mach1Encode { void setElevationDegrees(float elevationFromMinus90to90); void setElevationRadians(float elevationFromMinusHalfPItoHalfPI); - void setPannerMode(enum Mach1EncodePannerMode pannerMode); + void setPannerMode(enum Mach1EncodePannerModeType pannerMode); void setFrontSurroundPerspective(bool frontSurroundPerspective); void setOutputGain(float outputGainMultipler, bool isDecibel); diff --git a/mach1spatial-libs/xcode/include/Mach1EncodeCAPI.h b/mach1spatial-libs/xcode/include/Mach1EncodeCAPI.h index 8b044c3d..54f2a68a 100644 --- a/mach1spatial-libs/xcode/include/Mach1EncodeCAPI.h +++ b/mach1spatial-libs/xcode/include/Mach1EncodeCAPI.h @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType { Mach1EncodeOutputModeM1Spatial_14, }; -enum Mach1EncodePannerMode { +enum Mach1EncodePannerModeType { Mach1EncodePannerModeIsotropicLinear = (int)0, Mach1EncodePannerModeIsotropicEqualPower, Mach1EncodePannerModePeriphonicLinear @@ -76,6 +76,8 @@ M1_API void *Mach1EncodeCAPI_getResultingCoeffsDecoded(void *M1obj, enum Mach1De M1_API enum Mach1EncodeInputModeType Mach1EncodeCAPI_getInputMode(void *M1obj); M1_API enum Mach1EncodeOutputModeType Mach1EncodeCAPI_getOutputMode(void *M1obj); +M1_API enum Mach1EncodePannerModeType Mach1EncodeCAPI_getPannerMode(void *M1obj); +M1_API bool Mach1EncodeCAPI_getAutoOrbit(void *M1obj); M1_API int Mach1EncodeCAPI_getInputChannelsCount(void *M1obj); M1_API int Mach1EncodeCAPI_getOutputChannelsCount(void *M1obj); @@ -92,7 +94,7 @@ M1_API void Mach1EncodeCAPI_setElevation(void *M1obj, float elevationFromMinus1t M1_API void Mach1EncodeCAPI_setElevationDegrees(void *M1obj, float elevationFromMinus90to90); M1_API void Mach1EncodeCAPI_setElevationRadians(void *M1obj, float elevationFromMinusHalfPItoHalfPI); -M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerMode pannerMode); +M1_API void Mach1EncodeCAPI_setPannerMode(void *M1obj, enum Mach1EncodePannerModeType pannerMode); M1_API void Mach1EncodeCAPI_setFrontSurroundPerspective(void *M1obj, bool frontSurroundPerspective); M1_API void Mach1EncodeCAPI_setOutputGain(void *M1obj, float outputGainMultipler, bool isDecibel);