Skip to content

Commit

Permalink
update encode includes
Browse files Browse the repository at this point in the history
  • Loading branch information
himwho committed Mar 15, 2024
1 parent a278a2a commit dffcdd9
Show file tree
Hide file tree
Showing 45 changed files with 252 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++)
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++)
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++)
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++)
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class Mach1Encode {

Mach1EncodeInputModeType getInputMode();
Mach1EncodeOutputModeType getOutputMode();
int getInputChannelsCount();
Mach1EncodePannerModeType getPannerMode();
bool getAutoOrbit();
int getInputChannelsCount();
int getOutputChannelsCount();

template <typename T>
Expand All @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType {
Mach1EncodeOutputModeM1Spatial_14,
};

enum Mach1EncodePannerMode {
enum Mach1EncodePannerModeType {
Mach1EncodePannerModeIsotropicLinear = (int)0,
Mach1EncodePannerModeIsotropicEqualPower,
Mach1EncodePannerModePeriphonicLinear
Expand All @@ -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);

Expand All @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class Mach1Encode {

Mach1EncodeInputModeType getInputMode();
Mach1EncodeOutputModeType getOutputMode();
int getInputChannelsCount();
Mach1EncodePannerModeType getPannerMode();
bool getAutoOrbit();
int getInputChannelsCount();
int getOutputChannelsCount();

template <typename T>
Expand All @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType {
Mach1EncodeOutputModeM1Spatial_14,
};

enum Mach1EncodePannerMode {
enum Mach1EncodePannerModeType {
Mach1EncodePannerModeIsotropicLinear = (int)0,
Mach1EncodePannerModeIsotropicEqualPower,
Mach1EncodePannerModePeriphonicLinear
Expand All @@ -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);

Expand All @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class Mach1Encode {

Mach1EncodeInputModeType getInputMode();
Mach1EncodeOutputModeType getOutputMode();
int getInputChannelsCount();
Mach1EncodePannerModeType getPannerMode();
bool getAutoOrbit();
int getInputChannelsCount();
int getOutputChannelsCount();

template <typename T>
Expand All @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum Mach1EncodeOutputModeType {
Mach1EncodeOutputModeM1Spatial_14,
};

enum Mach1EncodePannerMode {
enum Mach1EncodePannerModeType {
Mach1EncodePannerModeIsotropicLinear = (int)0,
Mach1EncodePannerModeIsotropicEqualPower,
Mach1EncodePannerModePeriphonicLinear
Expand All @@ -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);

Expand All @@ -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);

Expand Down
Loading

0 comments on commit dffcdd9

Please sign in to comment.