diff --git a/Examples_Android/SuperpoweredCrossExample/app/build.gradle b/Examples_Android/SuperpoweredCrossExample/app/build.gradle index 5b094aa5..f08df2f5 100755 --- a/Examples_Android/SuperpoweredCrossExample/app/build.gradle +++ b/Examples_Android/SuperpoweredCrossExample/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.crossexample" - minSdkVersion 22 - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,10 +31,10 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.0' } diff --git a/Examples_Android/SuperpoweredCrossExample/app/src/main/cpp/CrossExample.cpp b/Examples_Android/SuperpoweredCrossExample/app/src/main/cpp/CrossExample.cpp index d599a57b..7f253d66 100755 --- a/Examples_Android/SuperpoweredCrossExample/app/src/main/cpp/CrossExample.cpp +++ b/Examples_Android/SuperpoweredCrossExample/app/src/main/cpp/CrossExample.cpp @@ -209,29 +209,29 @@ Java_com_superpowered_crossexample_MainActivity_CrossExample( // onPlayPause - Toggle playback state of player. extern "C" JNIEXPORT void Java_com_superpowered_crossexample_MainActivity_onPlayPause(JNIEnv * __unused env, jobject __unused obj, jboolean play) { - example->onPlayPause(play); + if (example) example->onPlayPause(play); } // onCrossfader - Handle crossfader events. extern "C" JNIEXPORT void Java_com_superpowered_crossexample_MainActivity_onCrossfader(JNIEnv * __unused env, jobject __unused obj, jint value) { - example->onCrossfader(value); + if (example) example->onCrossfader(value); } // onFxSelect - Handle FX selection. extern "C" JNIEXPORT void Java_com_superpowered_crossexample_MainActivity_onFxSelect(JNIEnv * __unused env, jobject __unused obj, jint value) { - example->onFxSelect(value); + if (example) example->onFxSelect(value); } // onFxOff - Turn of all effects. extern "C" JNIEXPORT void Java_com_superpowered_crossexample_MainActivity_onFxOff(JNIEnv * __unused env, jobject __unused obj) { - example->onFxOff(); + if (example) example->onFxOff(); } // onFxValue - Adjust FX value. extern "C" JNIEXPORT void Java_com_superpowered_crossexample_MainActivity_onFxValue(JNIEnv * __unused env, jobject __unused obj, jint value) { - example->onFxValue(value); + if (example) example->onFxValue(value); } diff --git a/Examples_Android/SuperpoweredCrossExample/app/src/main/java/com/superpowered/crossexample/MainActivity.java b/Examples_Android/SuperpoweredCrossExample/app/src/main/java/com/superpowered/crossexample/MainActivity.java index 0de40d7d..e27d6af7 100755 --- a/Examples_Android/SuperpoweredCrossExample/app/src/main/java/com/superpowered/crossexample/MainActivity.java +++ b/Examples_Android/SuperpoweredCrossExample/app/src/main/java/com/superpowered/crossexample/MainActivity.java @@ -144,7 +144,7 @@ public void CrossExample_PlayPause(View button) { } @Override - public boolean onCreateOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(@NonNull Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_main, menu); return true; diff --git a/Examples_Android/SuperpoweredCrossExample/build.gradle b/Examples_Android/SuperpoweredCrossExample/build.gradle index d7501134..38dcddc1 100755 --- a/Examples_Android/SuperpoweredCrossExample/build.gradle +++ b/Examples_Android/SuperpoweredCrossExample/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' } } diff --git a/Examples_Android/SuperpoweredCrossExample/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredCrossExample/gradle/wrapper/gradle-wrapper.properties index 5559cbff..d550dec2 100755 --- a/Examples_Android/SuperpoweredCrossExample/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredCrossExample/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredEffect/app/build.gradle b/Examples_Android/SuperpoweredEffect/app/build.gradle index 235f713a..a5e811c0 100755 --- a/Examples_Android/SuperpoweredEffect/app/build.gradle +++ b/Examples_Android/SuperpoweredEffect/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.effect" - minSdkVersion 22 - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,11 +31,11 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } diff --git a/Examples_Android/SuperpoweredEffect/app/src/main/java/com/superpowered/effect/MainActivity.java b/Examples_Android/SuperpoweredEffect/app/src/main/java/com/superpowered/effect/MainActivity.java index 22cbf627..48864e1e 100755 --- a/Examples_Android/SuperpoweredEffect/app/src/main/java/com/superpowered/effect/MainActivity.java +++ b/Examples_Android/SuperpoweredEffect/app/src/main/java/com/superpowered/effect/MainActivity.java @@ -41,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); // Called when the user answers to the permission dialogs. if ((requestCode != 0) || (grantResults.length < 1) || (grantResults.length != permissions.length)) return; boolean hasAllPermissions = true; diff --git a/Examples_Android/SuperpoweredEffect/build.gradle b/Examples_Android/SuperpoweredEffect/build.gradle index a9f94bce..e2d03d4c 100755 --- a/Examples_Android/SuperpoweredEffect/build.gradle +++ b/Examples_Android/SuperpoweredEffect/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/Examples_Android/SuperpoweredEffect/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredEffect/gradle/wrapper/gradle-wrapper.properties index 560acf6b..d14a5a3a 100755 --- a/Examples_Android/SuperpoweredEffect/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredEffect/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredFrequencyDomain/app/build.gradle b/Examples_Android/SuperpoweredFrequencyDomain/app/build.gradle index 55e3fa77..9834db4b 100755 --- a/Examples_Android/SuperpoweredFrequencyDomain/app/build.gradle +++ b/Examples_Android/SuperpoweredFrequencyDomain/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.frequencydomain" - minSdkVersion 22 - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,10 +31,10 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.0' } diff --git a/Examples_Android/SuperpoweredFrequencyDomain/app/src/main/java/com/superpowered/frequencydomain/MainActivity.java b/Examples_Android/SuperpoweredFrequencyDomain/app/src/main/java/com/superpowered/frequencydomain/MainActivity.java index cc129bed..d6f33261 100755 --- a/Examples_Android/SuperpoweredFrequencyDomain/app/src/main/java/com/superpowered/frequencydomain/MainActivity.java +++ b/Examples_Android/SuperpoweredFrequencyDomain/app/src/main/java/com/superpowered/frequencydomain/MainActivity.java @@ -70,7 +70,7 @@ private void initialize() { } @Override - public boolean onCreateOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(@NonNull Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_main, menu); return true; diff --git a/Examples_Android/SuperpoweredFrequencyDomain/build.gradle b/Examples_Android/SuperpoweredFrequencyDomain/build.gradle index d7501134..38dcddc1 100755 --- a/Examples_Android/SuperpoweredFrequencyDomain/build.gradle +++ b/Examples_Android/SuperpoweredFrequencyDomain/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' } } diff --git a/Examples_Android/SuperpoweredFrequencyDomain/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredFrequencyDomain/gradle/wrapper/gradle-wrapper.properties index 878c9dc8..7e1035f8 100755 --- a/Examples_Android/SuperpoweredFrequencyDomain/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredFrequencyDomain/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredPlayer/app/build.gradle b/Examples_Android/SuperpoweredPlayer/app/build.gradle index c168f868..c48d3188 100755 --- a/Examples_Android/SuperpoweredPlayer/app/build.gradle +++ b/Examples_Android/SuperpoweredPlayer/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.playerexample" - minSdkVersion 22 - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,11 +31,11 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } diff --git a/Examples_Android/SuperpoweredPlayer/build.gradle b/Examples_Android/SuperpoweredPlayer/build.gradle index a9f94bce..e2d03d4c 100755 --- a/Examples_Android/SuperpoweredPlayer/build.gradle +++ b/Examples_Android/SuperpoweredPlayer/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/Examples_Android/SuperpoweredPlayer/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredPlayer/gradle/wrapper/gradle-wrapper.properties index ff0f0b72..d50fa0a1 100755 --- a/Examples_Android/SuperpoweredPlayer/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredPlayer/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredRecorder/app/build.gradle b/Examples_Android/SuperpoweredRecorder/app/build.gradle index d0176618..7a4fccc9 100755 --- a/Examples_Android/SuperpoweredRecorder/app/build.gradle +++ b/Examples_Android/SuperpoweredRecorder/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.recorder" - minSdkVersion 22 - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -36,6 +36,6 @@ android { // main settings for your application dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } diff --git a/Examples_Android/SuperpoweredRecorder/app/src/main/cpp/RecorderExample.cpp b/Examples_Android/SuperpoweredRecorder/app/src/main/cpp/RecorderExample.cpp index 78e8d02c..ede49043 100755 --- a/Examples_Android/SuperpoweredRecorder/app/src/main/cpp/RecorderExample.cpp +++ b/Examples_Android/SuperpoweredRecorder/app/src/main/cpp/RecorderExample.cpp @@ -17,14 +17,6 @@ static bool audioProcessing ( int numberOfFrames, // number of frames to process int __unused samplerate // current sample rate in Hz ) { - { - static int test = 0; - test += numberOfFrames; - if (test >= 48000) { - test = 0; - __android_log_print(ANDROID_LOG_VERBOSE, "Superpowered", "record"); - } - } float floatBuffer[numberOfFrames * 2]; Superpowered::ShortIntToFloat(audio, floatBuffer, (unsigned int)numberOfFrames); recorder->recordInterleaved(floatBuffer, (unsigned int)numberOfFrames); diff --git a/Examples_Android/SuperpoweredRecorder/build.gradle b/Examples_Android/SuperpoweredRecorder/build.gradle index a9f94bce..e2d03d4c 100755 --- a/Examples_Android/SuperpoweredRecorder/build.gradle +++ b/Examples_Android/SuperpoweredRecorder/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/Examples_Android/SuperpoweredRecorder/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredRecorder/gradle/wrapper/gradle-wrapper.properties index d1b532ec..272cc84e 100755 --- a/Examples_Android/SuperpoweredRecorder/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredRecorder/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredUSBExample/build.gradle b/Examples_Android/SuperpoweredUSBExample/build.gradle index 3ca13017..310ddb27 100755 --- a/Examples_Android/SuperpoweredUSBExample/build.gradle +++ b/Examples_Android/SuperpoweredUSBExample/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.2.2' } } diff --git a/Examples_Android/SuperpoweredUSBExample/complexusb/build.gradle b/Examples_Android/SuperpoweredUSBExample/complexusb/build.gradle index a810c759..aab2885a 100755 --- a/Examples_Android/SuperpoweredUSBExample/complexusb/build.gradle +++ b/Examples_Android/SuperpoweredUSBExample/complexusb/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.complexusb" - minSdkVersion 22 //more than 96.5% of all active Android devices - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,10 +31,10 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.0' } diff --git a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/CustomAdapter.java b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/CustomAdapter.java index c6dcb6da..7a58c5a0 100755 --- a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/CustomAdapter.java +++ b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/CustomAdapter.java @@ -1,5 +1,6 @@ package com.superpowered.complexusb; +import android.annotation.SuppressLint; import android.content.Context; import androidx.core.content.ContextCompat; import android.view.LayoutInflater; @@ -7,7 +8,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.TextView; @@ -19,7 +19,7 @@ // This provides the data for the ListView. public class CustomAdapter extends BaseAdapter { - private class ItemData { + private static class ItemData { String text; CustomAdapterHandler handler; int kind; @@ -42,7 +42,7 @@ public ItemData(CustomAdapterHandler h, String t, int k, int i, float minv, floa } } - private class RowViewData { + private static class RowViewData { SeekBar volumeControl; CheckBox muteControl; TextView textView; @@ -59,10 +59,10 @@ private class RowViewData { public static final int VOLUMEMUTEITEM = 7; public static final int LATENCYITEM = 8; public static final int ACTIONITEM = 9; - private ArrayList data = new ArrayList<>(); - private LayoutInflater inflater; - private int sectionHeaderBackgroundColor; - private CustomAdapterHandler handler; + private final ArrayList data = new ArrayList<>(); + private final LayoutInflater inflater; + private final int sectionHeaderBackgroundColor; + private final CustomAdapterHandler handler; public CustomAdapter(Context context) { handler = (CustomAdapterHandler)context; @@ -142,6 +142,7 @@ public void selectItemInSection(int kind, int index) { } } + @SuppressLint("InflateParams") public View getView(int position, View rowView, ViewGroup parent) { ItemData item = data.get(position); RowViewData viewData; diff --git a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/SuperpoweredUSBAudio.java b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/SuperpoweredUSBAudio.java index 81774e73..db1f724a 100755 --- a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/SuperpoweredUSBAudio.java +++ b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/java/com/superpowered/complexusb/SuperpoweredUSBAudio.java @@ -14,14 +14,14 @@ // This class handles USB device permissions, attaching and detaching a device. public class SuperpoweredUSBAudio { private static final String ACTION_USB_PERMISSION = "com.superpowered.USBAudio.USB_PERMISSION"; - private PendingIntent permissionIntent; - private Context context; - private SuperpoweredUSBAudioHandler handler; + private final PendingIntent permissionIntent; + private final Context context; + private final SuperpoweredUSBAudioHandler handler; public SuperpoweredUSBAudio(Context c, SuperpoweredUSBAudioHandler h) { context = c; handler = h; - permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), 0); + permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE); BroadcastReceiver usbReceiver = new BroadcastReceiver() { @Override diff --git a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/jni/latencyMeasurer.cpp b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/jni/latencyMeasurer.cpp index 9ec9279d..0db25166 100755 --- a/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/jni/latencyMeasurer.cpp +++ b/Examples_Android/SuperpoweredUSBExample/complexusb/src/main/jni/latencyMeasurer.cpp @@ -26,13 +26,13 @@ // Returns with the absolute sum of the audio. static int sumAudio(short int *audio, int numberOfSamples) { - int sum = 0; + int asum = 0; while (numberOfSamples) { numberOfSamples--; - sum += abs(audio[0]) + abs(audio[1]); + asum += abs(audio[0]) + abs(audio[1]); audio += 2; }; - return sum; + return asum; } latencyMeasurer::latencyMeasurer() : measurementState(idle), nextMeasurementState(idle), samplesElapsed(0), sineWave(0), sum(0), threshold(0), state(0), samplerate(0), latencyMs(0), buffersize(0) { @@ -106,11 +106,11 @@ void latencyMeasurer::processInput(short int *audio, int _samplerate, int number if (samplesElapsed > numberOfSamples) { // Expect at least 1 buffer of round-trip latency. roundTripLatencyMs[state - 1] = float(samplesElapsed * 1000) / float(samplerate); - float sum = 0, max = 0, min = 100000.0f; + float fsum = 0, max = 0, min = 100000.0f; for (n = 0; n < state; n++) { if (roundTripLatencyMs[n] > max) max = roundTripLatencyMs[n]; if (roundTripLatencyMs[n] < min) min = roundTripLatencyMs[n]; - sum += roundTripLatencyMs[n]; + fsum += roundTripLatencyMs[n]; }; if (max / min > 2.0f) { // Dispersion error. @@ -118,7 +118,7 @@ void latencyMeasurer::processInput(short int *audio, int _samplerate, int number state = 10; measurementState = nextMeasurementState = idle; } else if (state == 10) { // Final result. - latencyMs = int(sum * 0.1f); + latencyMs = int(fsum * 0.1f); measurementState = nextMeasurementState = idle; } else { // Next step. latencyMs = (int)roundTripLatencyMs[state - 1]; diff --git a/Examples_Android/SuperpoweredUSBExample/gradle/wrapper/gradle-wrapper.properties b/Examples_Android/SuperpoweredUSBExample/gradle/wrapper/gradle-wrapper.properties index d53d722f..58b34e0a 100755 --- a/Examples_Android/SuperpoweredUSBExample/gradle/wrapper/gradle-wrapper.properties +++ b/Examples_Android/SuperpoweredUSBExample/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/Examples_Android/SuperpoweredUSBExample/simpleusb/build.gradle b/Examples_Android/SuperpoweredUSBExample/simpleusb/build.gradle index 40620327..4784de84 100755 --- a/Examples_Android/SuperpoweredUSBExample/simpleusb/build.gradle +++ b/Examples_Android/SuperpoweredUSBExample/simpleusb/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' def superpowered_sdk_path = new File(projectDir, '../../../Superpowered') android { // main settings for your application - compileSdkVersion = 31 + compileSdkVersion = 33 defaultConfig { applicationId "com.superpowered.simpleusb" - minSdkVersion 22 // more than 99.5% of all active Android devices - targetSdkVersion 31 + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -18,7 +18,7 @@ android { // main settings for your application externalNativeBuild { cmake { - arguments '-DANDROID_PLATFORM=android-22', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}" cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed cppFlags '-fsigned-char', "-I${superpowered_sdk_path}" } @@ -31,12 +31,12 @@ android { // main settings for your application } } - ndkPath "/Volumes/iMect/android/ndk/23.1.7779620/android-ndk-r23b" + ndkPath "/Volumes/iMect/android/ndk/25.1.8937393" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.0' } diff --git a/Examples_Android/SuperpoweredUSBExample/simpleusb/src/main/java/com/superpowered/simpleusb/SuperpoweredUSBAudio.java b/Examples_Android/SuperpoweredUSBExample/simpleusb/src/main/java/com/superpowered/simpleusb/SuperpoweredUSBAudio.java index b35db454..6e09684f 100755 --- a/Examples_Android/SuperpoweredUSBExample/simpleusb/src/main/java/com/superpowered/simpleusb/SuperpoweredUSBAudio.java +++ b/Examples_Android/SuperpoweredUSBExample/simpleusb/src/main/java/com/superpowered/simpleusb/SuperpoweredUSBAudio.java @@ -14,14 +14,14 @@ // This class handles USB device permissions, attaching and detaching a device. public class SuperpoweredUSBAudio { private static final String ACTION_USB_PERMISSION = "com.superpowered.USBAudio.USB_PERMISSION"; - private PendingIntent permissionIntent; - private Context context; - private SuperpoweredUSBAudioHandler handler; + private final PendingIntent permissionIntent; + private final Context context; + private final SuperpoweredUSBAudioHandler handler; public SuperpoweredUSBAudio(Context c, SuperpoweredUSBAudioHandler h) { context = c; handler = h; - permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), 0); + permissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE); BroadcastReceiver usbReceiver = new BroadcastReceiver() { @Override diff --git a/Examples_Linux/src/hls.cpp b/Examples_Linux/src/hls.cpp index e17366c0..0f74bcd7 100755 --- a/Examples_Linux/src/hls.cpp +++ b/Examples_Linux/src/hls.cpp @@ -271,16 +271,7 @@ int main(int argc, char *argv[]) { context.numChannels = 2; if (!context.setup()) return 0; - Superpowered::Initialize( - "ExampleLicenseKey-WillExpire-OnNextUpdate", - false, // enableAudioAnalysis (using SuperpoweredAnalyzer, SuperpoweredLiveAnalyzer, SuperpoweredWaveform or SuperpoweredBandpassFilterbank) - false, // enableFFTAndFrequencyDomain (using SuperpoweredFrequencyDomain, SuperpoweredFFTComplex, SuperpoweredFFTReal or SuperpoweredPolarFFT) - false, // enableAudioTimeStretching (using SuperpoweredTimeStretching) - false, // enableAudioEffects (using any SuperpoweredFX class) - true, // enableAudioPlayerAndDecoder (using SuperpoweredAdvancedAudioPlayer or SuperpoweredDecoder) - false, // enableCryptographics (using Superpowered::RSAPublicKey, Superpowered::RSAPrivateKey, Superpowered::hasher or Superpowered::AES) - false // enableNetworking (using Superpowered::httpRequest) - ); + Superpowered::Initialize("ExampleLicenseKey-WillExpire-OnNextUpdate"); Superpowered::AdvancedAudioPlayer::setTempFolder("/tmp/"); Superpowered::AdvancedAudioPlayer *player = new Superpowered::AdvancedAudioPlayer(context.samplerate, 0); diff --git a/Examples_Linux/src/offline1.cpp b/Examples_Linux/src/offline1.cpp index f499eff6..0abb1cc3 100755 --- a/Examples_Linux/src/offline1.cpp +++ b/Examples_Linux/src/offline1.cpp @@ -9,16 +9,8 @@ // EXAMPLE: reading an audio file, applying a simple effect (filter) and saving the result to WAV int main(int argc, char *argv[]) { - Superpowered::Initialize( - "ExampleLicenseKey-WillExpire-OnNextUpdate", - false, // enableAudioAnalysis (using SuperpoweredAnalyzer, SuperpoweredLiveAnalyzer, SuperpoweredWaveform or SuperpoweredBandpassFilterbank) - false, // enableFFTAndFrequencyDomain (using SuperpoweredFrequencyDomain, SuperpoweredFFTComplex, SuperpoweredFFTReal or SuperpoweredPolarFFT) - false, // enableAudioTimeStretching (using SuperpoweredTimeStretching) - true, // enableAudioEffects (using any SuperpoweredFX class) - true, // enableAudioPlayerAndDecoder (using SuperpoweredAdvancedAudioPlayer or SuperpoweredDecoder) - false, // enableCryptographics (using Superpowered::RSAPublicKey, Superpowered::RSAPrivateKey, Superpowered::hasher or Superpowered::AES) - false // enableNetworking (using Superpowered::httpRequest) - ); + Superpowered::Initialize("ExampleLicenseKey-WillExpire-OnNextUpdate"); + // Open the input file. Superpowered::Decoder *decoder = new Superpowered::Decoder(); int openReturn = decoder->open("test.m4a"); diff --git a/Examples_Linux/src/offline2.cpp b/Examples_Linux/src/offline2.cpp index de863bd9..3c809530 100755 --- a/Examples_Linux/src/offline2.cpp +++ b/Examples_Linux/src/offline2.cpp @@ -10,16 +10,8 @@ // EXAMPLE: reading an audio file, applying time stretching and saving the result to WAV int main(int argc, char *argv[]) { - Superpowered::Initialize( - "ExampleLicenseKey-WillExpire-OnNextUpdate", - false, // enableAudioAnalysis (using SuperpoweredAnalyzer, SuperpoweredLiveAnalyzer, SuperpoweredWaveform or SuperpoweredBandpassFilterbank) - false, // enableFFTAndFrequencyDomain (using SuperpoweredFrequencyDomain, SuperpoweredFFTComplex, SuperpoweredFFTReal or SuperpoweredPolarFFT) - true, // enableAudioTimeStretching (using SuperpoweredTimeStretching) - false, // enableAudioEffects (using any SuperpoweredFX class) - true, // enableAudioPlayerAndDecoder (using SuperpoweredAdvancedAudioPlayer or SuperpoweredDecoder) - false, // enableCryptographics (using Superpowered::RSAPublicKey, Superpowered::RSAPrivateKey, Superpowered::hasher or Superpowered::AES) - false // enableNetworking (using Superpowered::httpRequest) - ); + Superpowered::Initialize("ExampleLicenseKey-WillExpire-OnNextUpdate"); + // Open the input file. Superpowered::Decoder *decoder = new Superpowered::Decoder(); int openReturn = decoder->open("test.m4a"); diff --git a/Examples_Linux/src/offline3.cpp b/Examples_Linux/src/offline3.cpp index 01b38076..ffcc6464 100755 --- a/Examples_Linux/src/offline3.cpp +++ b/Examples_Linux/src/offline3.cpp @@ -7,16 +7,7 @@ // EXAMPLE: reading an audio file, processing the audio and returning with some features detected int main(int argc, char *argv[]) { - Superpowered::Initialize( - "ExampleLicenseKey-WillExpire-OnNextUpdate", - true, // enableAudioAnalysis (using SuperpoweredAnalyzer, SuperpoweredLiveAnalyzer, SuperpoweredWaveform or SuperpoweredBandpassFilterbank) - false, // enableFFTAndFrequencyDomain (using SuperpoweredFrequencyDomain, SuperpoweredFFTComplex, SuperpoweredFFTReal or SuperpoweredPolarFFT) - false, // enableAudioTimeStretching (using SuperpoweredTimeStretching) - false, // enableAudioEffects (using any SuperpoweredFX class) - true, // enableAudioPlayerAndDecoder (using SuperpoweredAdvancedAudioPlayer or SuperpoweredDecoder) - false, // enableCryptographics (using Superpowered::RSAPublicKey, Superpowered::RSAPrivateKey, Superpowered::hasher or Superpowered::AES) - false // enableNetworking (using Superpowered::httpRequest) - ); + Superpowered::Initialize("ExampleLicenseKey-WillExpire-OnNextUpdate"); // Open the input file. Superpowered::Decoder *decoder = new Superpowered::Decoder(); diff --git a/Examples_Windows/Effect/Debug/Effect.Build.CppClean.log b/Examples_Windows/Effect/Debug/Effect.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/Debug/Effect.log b/Examples_Windows/Effect/Debug/Effect.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Effect/Debug/Effect.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Effect/Debug/Effect.vcxproj.FileListAbsolute.txt b/Examples_Windows/Effect/Debug/Effect.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/Release/Effect.Build.CppClean.log b/Examples_Windows/Effect/Release/Effect.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/Release/Effect.log b/Examples_Windows/Effect/Release/Effect.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Effect/Release/Effect.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Effect/Release/Effect.vcxproj.FileListAbsolute.txt b/Examples_Windows/Effect/Release/Effect.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/x64/Debug/Effect.Build.CppClean.log b/Examples_Windows/Effect/x64/Debug/Effect.Build.CppClean.log deleted file mode 100644 index 069b9e87..00000000 --- a/Examples_Windows/Effect/x64/Debug/Effect.Build.CppClean.log +++ /dev/null @@ -1,17 +0,0 @@ -c:\superpoweredsdk\examples_windows\effect\x64\debug\vc143.pdb -c:\superpoweredsdk\examples_windows\effect\x64\debug\vc143.idb -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.obj -c:\superpoweredsdk\examples_windows\effect\x64\debug\superpoweredwasapiaudioio.obj -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.ilk -c:\superpoweredsdk\examples_windows\x64\debug\effect.exe -c:\superpoweredsdk\examples_windows\x64\debug\effect.pdb -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.res -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\cl.command.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\cl.read.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\cl.write.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\link.command.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\link.read.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\link.write.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\rc.command.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\rc.read.1.tlog -c:\superpoweredsdk\examples_windows\effect\x64\debug\effect.tlog\rc.write.1.tlog diff --git a/Examples_Windows/Effect/x64/Debug/Effect.exe.recipe b/Examples_Windows/Effect/x64/Debug/Effect.exe.recipe deleted file mode 100644 index 8c74c30d..00000000 --- a/Examples_Windows/Effect/x64/Debug/Effect.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\SuperpoweredSDK\Examples_Windows\x64\Debug\Effect.exe - - - - - - \ No newline at end of file diff --git a/Examples_Windows/Effect/x64/Debug/Effect.log b/Examples_Windows/Effect/x64/Debug/Effect.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Effect/x64/Debug/Effect.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Effect/x64/Debug/Effect.vcxproj.FileListAbsolute.txt b/Examples_Windows/Effect/x64/Debug/Effect.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/x64/Release/Effect.Build.CppClean.log b/Examples_Windows/Effect/x64/Release/Effect.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Effect/x64/Release/Effect.log b/Examples_Windows/Effect/x64/Release/Effect.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Effect/x64/Release/Effect.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Effect/x64/Release/Effect.vcxproj.FileListAbsolute.txt b/Examples_Windows/Effect/x64/Release/Effect.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/Debug/HLS.Build.CppClean.log b/Examples_Windows/HLS/Debug/HLS.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/Debug/HLS.log b/Examples_Windows/HLS/Debug/HLS.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/HLS/Debug/HLS.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/HLS/Debug/HLS.vcxproj.FileListAbsolute.txt b/Examples_Windows/HLS/Debug/HLS.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/Release/HLS.Build.CppClean.log b/Examples_Windows/HLS/Release/HLS.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/Release/HLS.log b/Examples_Windows/HLS/Release/HLS.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/HLS/Release/HLS.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/HLS/Release/HLS.vcxproj.FileListAbsolute.txt b/Examples_Windows/HLS/Release/HLS.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/x64/Debug/HLS.Build.CppClean.log b/Examples_Windows/HLS/x64/Debug/HLS.Build.CppClean.log deleted file mode 100644 index c3c7fe4e..00000000 --- a/Examples_Windows/HLS/x64/Debug/HLS.Build.CppClean.log +++ /dev/null @@ -1,17 +0,0 @@ -c:\superpoweredsdk\examples_windows\hls\x64\debug\vc143.pdb -c:\superpoweredsdk\examples_windows\hls\x64\debug\vc143.idb -c:\superpoweredsdk\examples_windows\hls\x64\debug\superpoweredwasapiaudioio.obj -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.obj -c:\superpoweredsdk\examples_windows\x64\debug\hls.exe -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.ilk -c:\superpoweredsdk\examples_windows\x64\debug\hls.pdb -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.res -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\cl.command.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\cl.read.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\cl.write.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\link.command.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\link.read.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\link.write.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\rc.command.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\rc.read.1.tlog -c:\superpoweredsdk\examples_windows\hls\x64\debug\hls.tlog\rc.write.1.tlog diff --git a/Examples_Windows/HLS/x64/Debug/HLS.exe.recipe b/Examples_Windows/HLS/x64/Debug/HLS.exe.recipe deleted file mode 100644 index 1b6efd30..00000000 --- a/Examples_Windows/HLS/x64/Debug/HLS.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\SuperpoweredSDK\Examples_Windows\x64\Debug\HLS.exe - - - - - - \ No newline at end of file diff --git a/Examples_Windows/HLS/x64/Debug/HLS.log b/Examples_Windows/HLS/x64/Debug/HLS.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/HLS/x64/Debug/HLS.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/HLS/x64/Debug/HLS.vcxproj.FileListAbsolute.txt b/Examples_Windows/HLS/x64/Debug/HLS.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/x64/Release/HLS.Build.CppClean.log b/Examples_Windows/HLS/x64/Release/HLS.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/HLS/x64/Release/HLS.log b/Examples_Windows/HLS/x64/Release/HLS.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/HLS/x64/Release/HLS.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/HLS/x64/Release/HLS.vcxproj.FileListAbsolute.txt b/Examples_Windows/HLS/x64/Release/HLS.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/Debug/Player.Build.CppClean.log b/Examples_Windows/Player/Debug/Player.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/Debug/Player.log b/Examples_Windows/Player/Debug/Player.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Player/Debug/Player.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Player/Debug/Player.vcxproj.FileListAbsolute.txt b/Examples_Windows/Player/Debug/Player.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/Release/Player.Build.CppClean.log b/Examples_Windows/Player/Release/Player.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/Release/Player.log b/Examples_Windows/Player/Release/Player.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Player/Release/Player.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Player/Release/Player.vcxproj.FileListAbsolute.txt b/Examples_Windows/Player/Release/Player.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/x64/Debug/Player.Build.CppClean.log b/Examples_Windows/Player/x64/Debug/Player.Build.CppClean.log deleted file mode 100644 index 062978f8..00000000 --- a/Examples_Windows/Player/x64/Debug/Player.Build.CppClean.log +++ /dev/null @@ -1,17 +0,0 @@ -c:\superpoweredsdk\examples_windows\player\x64\debug\vc143.pdb -c:\superpoweredsdk\examples_windows\player\x64\debug\vc143.idb -c:\superpoweredsdk\examples_windows\player\x64\debug\player.obj -c:\superpoweredsdk\examples_windows\player\x64\debug\superpoweredwasapiaudioio.obj -c:\superpoweredsdk\examples_windows\x64\debug\player.exe -c:\superpoweredsdk\examples_windows\player\x64\debug\player.ilk -c:\superpoweredsdk\examples_windows\x64\debug\player.pdb -c:\superpoweredsdk\examples_windows\player\x64\debug\player.res -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\cl.command.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\cl.read.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\cl.write.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\link.command.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\link.read.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\link.write.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\rc.command.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\rc.read.1.tlog -c:\superpoweredsdk\examples_windows\player\x64\debug\player.tlog\rc.write.1.tlog diff --git a/Examples_Windows/Player/x64/Debug/Player.exe.recipe b/Examples_Windows/Player/x64/Debug/Player.exe.recipe deleted file mode 100644 index eeea28f3..00000000 --- a/Examples_Windows/Player/x64/Debug/Player.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\SuperpoweredSDK\Examples_Windows\x64\Debug\Player.exe - - - - - - \ No newline at end of file diff --git a/Examples_Windows/Player/x64/Debug/Player.log b/Examples_Windows/Player/x64/Debug/Player.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Player/x64/Debug/Player.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Player/x64/Debug/Player.vcxproj.FileListAbsolute.txt b/Examples_Windows/Player/x64/Debug/Player.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/x64/Release/Player.Build.CppClean.log b/Examples_Windows/Player/x64/Release/Player.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Player/x64/Release/Player.log b/Examples_Windows/Player/x64/Release/Player.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Player/x64/Release/Player.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Player/x64/Release/Player.vcxproj.FileListAbsolute.txt b/Examples_Windows/Player/x64/Release/Player.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/Debug/Recorder.Build.CppClean.log b/Examples_Windows/Recorder/Debug/Recorder.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/Debug/Recorder.log b/Examples_Windows/Recorder/Debug/Recorder.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Recorder/Debug/Recorder.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Recorder/Debug/Recorder.vcxproj.FileListAbsolute.txt b/Examples_Windows/Recorder/Debug/Recorder.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/Release/Recorder.Build.CppClean.log b/Examples_Windows/Recorder/Release/Recorder.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/Release/Recorder.log b/Examples_Windows/Recorder/Release/Recorder.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Recorder/Release/Recorder.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Recorder/Release/Recorder.vcxproj.FileListAbsolute.txt b/Examples_Windows/Recorder/Release/Recorder.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/x64/Debug/Recorder.Build.CppClean.log b/Examples_Windows/Recorder/x64/Debug/Recorder.Build.CppClean.log deleted file mode 100644 index 81770926..00000000 --- a/Examples_Windows/Recorder/x64/Debug/Recorder.Build.CppClean.log +++ /dev/null @@ -1,17 +0,0 @@ -c:\superpoweredsdk\examples_windows\recorder\x64\debug\vc143.pdb -c:\superpoweredsdk\examples_windows\recorder\x64\debug\vc143.idb -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.obj -c:\superpoweredsdk\examples_windows\recorder\x64\debug\superpoweredwasapiaudioio.obj -c:\superpoweredsdk\examples_windows\x64\debug\recorder.exe -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.ilk -c:\superpoweredsdk\examples_windows\x64\debug\recorder.pdb -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.res -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\cl.command.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\cl.read.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\cl.write.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\link.command.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\link.read.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\link.write.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\rc.command.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\rc.read.1.tlog -c:\superpoweredsdk\examples_windows\recorder\x64\debug\recorder.tlog\rc.write.1.tlog diff --git a/Examples_Windows/Recorder/x64/Debug/Recorder.exe.recipe b/Examples_Windows/Recorder/x64/Debug/Recorder.exe.recipe deleted file mode 100644 index ded32151..00000000 --- a/Examples_Windows/Recorder/x64/Debug/Recorder.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\SuperpoweredSDK\Examples_Windows\x64\Debug\Recorder.exe - - - - - - \ No newline at end of file diff --git a/Examples_Windows/Recorder/x64/Debug/Recorder.log b/Examples_Windows/Recorder/x64/Debug/Recorder.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Recorder/x64/Debug/Recorder.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Recorder/x64/Debug/Recorder.vcxproj.FileListAbsolute.txt b/Examples_Windows/Recorder/x64/Debug/Recorder.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/x64/Release/Recorder.Build.CppClean.log b/Examples_Windows/Recorder/x64/Release/Recorder.Build.CppClean.log deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_Windows/Recorder/x64/Release/Recorder.log b/Examples_Windows/Recorder/x64/Release/Recorder.log deleted file mode 100644 index 5f282702..00000000 --- a/Examples_Windows/Recorder/x64/Release/Recorder.log +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Examples_Windows/Recorder/x64/Release/Recorder.vcxproj.FileListAbsolute.txt b/Examples_Windows/Recorder/x64/Release/Recorder.vcxproj.FileListAbsolute.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.pbxproj b/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.pbxproj index 3c6640bb..4250c0c4 100755 --- a/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.pbxproj +++ b/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.pbxproj @@ -166,7 +166,6 @@ ORGANIZATIONNAME = imect; TargetAttributes = { 1B80C6FC18E0C79600DF5B81 = { - DevelopmentTeam = AP4SQ5L535; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -328,7 +327,7 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = AP4SQ5L535; + DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -352,7 +351,7 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = AP4SQ5L535; + DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; diff --git a/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.xcworkspace/xcuserdata/gaborszanto.xcuserdatad/UserInterfaceState.xcuserstate b/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.xcworkspace/xcuserdata/gaborszanto.xcuserdatad/UserInterfaceState.xcuserstate index e1f8afd2..7b27778d 100755 Binary files a/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.xcworkspace/xcuserdata/gaborszanto.xcuserdatad/UserInterfaceState.xcuserstate and b/Examples_iOS/SuperpoweredCrossExample/SuperpoweredCrossExample.xcodeproj/project.xcworkspace/xcuserdata/gaborszanto.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/README.md b/README.md index 0ee39f81..c200362d 100755 --- a/README.md +++ b/README.md @@ -235,4 +235,4 @@ Superpowered FFT benefits from ideas in Construction of a High-Performance FFT b The Superpowered MP3 and AAC decoder benefits from optimizations by Ken Cooke. -Superpowered version 2.5.1 +Superpowered version 2.6.0 diff --git a/Superpowered/SuperpoweredAdvancedAudioPlayer.h b/Superpowered/SuperpoweredAdvancedAudioPlayer.h index 80eff855..3852461b 100755 --- a/Superpowered/SuperpoweredAdvancedAudioPlayer.h +++ b/Superpowered/SuperpoweredAdvancedAudioPlayer.h @@ -27,7 +27,6 @@ struct PlayerInternals; /// - low memory usage, /// - thread safety (all methods are thread-safe), /// - direct iPod music library access. -/// Can be used in a real-time audio processing thread. Can not be used for offline processing. /// Supported file types: /// - Stereo or mono pcm WAV and AIFF (16-bit int, 24-bit int, 32-bit int or 32-bit IEEE float). /// - MP3: MPEG-1 Layer III (sample rates: 32000 Hz, 44100 Hz, 48000 Hz). MPEG-2 Layer III is not supported (mp3 with sample rates below 32000 Hz). @@ -104,7 +103,7 @@ class AdvancedAudioPlayer { /// @brief Creates a player instance. /// @param samplerate The initial sample rate of the player output in hz. /// @param cachedPointCount How many positions can be cached in the memory. Jumping to a cached point happens with zero latency. Loops are automatically cached. -/// @param internalBufferSizeSeconds The number of seconds to buffer internally for playback and cached points. Minimum 2, maximum 60. Default: 2. +/// @param internalBufferSizeSeconds The number of seconds to buffer internally for playback and cached points. The value 0 enables "offline mode", where the player can not be used for real-time playback, but can process audio in an iteration. If not zero, the AdvancedAudioPlayer can only be used for real-time playback. Default: 2. /// @param negativeSeconds The number of seconds of silence in the negative direction, before the beginning of the track. /// @param minimumTimestretchingPlaybackRate Will not time-stretch but resample below this playback rate. Default: 0.501f (the recommended value for low CPU load on older mobile devices, such as the first iPad). Will be applied after changing playbackRate or scratching. Default: 0.501f /// @param maximumTimestretchingPlaybackRate Will not time-stretch but resample above this playback rate. Default: 2.0f (the recommended value for low CPU load on older mobile devices, such as the first iPad). Will be applied after changing playbackRate or scratching. diff --git a/Superpowered/SuperpoweredAutomaticVocalPitchCorrection.h b/Superpowered/SuperpoweredAutomaticVocalPitchCorrection.h new file mode 100644 index 00000000..0de02d36 --- /dev/null +++ b/Superpowered/SuperpoweredAutomaticVocalPitchCorrection.h @@ -0,0 +1,85 @@ +#ifndef Header_SuperpoweredAutomaticVocalPitchCorrection +#define Header_SuperpoweredAutomaticVocalPitchCorrection + +#ifndef JSWASM +#define JSWASM +#endif + +namespace Superpowered { + +struct tunerInternals; + +/// @brief Automatic Vocal Pitch Correction (Automatic Tune). +/// One instance allocates around kb memory. +class AutomaticVocalPitchCorrection { +public: + typedef enum TunerScale { + CHROMATIC, + CMAJOR, AMINOR = CMAJOR, + CSHARPMAJOR, ASHARPMINOR = CSHARPMAJOR, + DMAJOR, BMINOR = DMAJOR, + DSHARPMAJOR, CMINOR = DSHARPMAJOR, + EMAJOR, CSHARPMINOR = EMAJOR, + FMAJOR, DMINOR = FMAJOR, + FSHARPMAJOR, DSHARPMINOR = FSHARPMAJOR, + GMAJOR, EMINOR = GMAJOR, + GSHARPMAJOR, FMINOR = GSHARPMAJOR, + AMAJOR, FSHARPMINOR = AMAJOR, + ASHARPMAJOR, GMINOR = ASHARPMAJOR, + BMAJOR, GSHARPMINOR = BMAJOR, + CUSTOM + } TunerScale; + + typedef enum TunerRange { + WIDE, ///< wide range, 40 to 3000 Hz + BASS, ///< bass singer, 40 to 350 Hz + TENOR, ///< tenor, 100 to 600 Hz + ALTO, ///< alto, 150 to 1400 Hz + SOPRANO ///< soprano, 200 to 3000 Hz + } TunerRange; + + typedef enum TunerSpeed { + SUBTLE, ///< subtle pitch correction + MEDIUM, ///< medium pitch correction + EXTREME ///< classic pitch correction effect + } TunerSpeed; + + TunerScale scale; ///< Music scale. Default: CHROMATIC (all twelve keys of the octave are allowed) + TunerRange range; ///< Vocal range for pitch detection. Default: WIDE (40 to 3000 Hz) + TunerSpeed speed; ///< Speed for tune correction. Default: EXTREME + float frequencyOfA; ///< Frequency for middle A, between 410-470 Hz. Default: 440 + unsigned int samplerate; ///< Input/output sample rate in Hz. Default: 48000 + +/// @brief Constructor. + JSWASM AutomaticVocalPitchCorrection(); + JSWASM ~AutomaticVocalPitchCorrection(); + +/// @brief Processes the audio. +/// It's never blocking for real-time usage. You can change any properties concurrently with process(). +/// @param input Pointer to floating point numbers. 32-bit mono or interleaved stereo input. +/// @param output Pointer to floating point numbers. 32-bit mono or interleaved stereo input. +/// @param stereo Stereo or mono input and output. +/// @param numberOfFrames Number of frames to process. + JSWASM void process(float *input, float *output, bool stereo, unsigned int numberOfFrames); + +/// @brief Set all internals to initial state. + JSWASM void reset(); + +/// @brief Set note (on all octaves) for scale == CUSTOM. +/// @param note The note (between 0..11). +/// @param enabled Note enabled or not. + JSWASM void setCustomScaleNote(unsigned char note, bool enabled); + +/// @return Get note (on all octaves) for scale == CUSTOM. +/// @param note The note (between 0..11). + JSWASM bool getCustomScaleNote(unsigned char note); + +private: + tunerInternals *internals; + AutomaticVocalPitchCorrection(const AutomaticVocalPitchCorrection&); + AutomaticVocalPitchCorrection& operator=(const AutomaticVocalPitchCorrection&); +}; + +}; + +#endif diff --git a/Superpowered/SuperpoweredTimeStretching.h b/Superpowered/SuperpoweredTimeStretching.h index e49b35be..10efa55e 100755 --- a/Superpowered/SuperpoweredTimeStretching.h +++ b/Superpowered/SuperpoweredTimeStretching.h @@ -26,7 +26,7 @@ class TimeStretching { /// @brief Constructor. /// @param samplerate The initial sample rate in Hz. -/// @param minimumRate The minimum value of rate. For example: if the rate will never go below 0.5, minimumRate = 0.5 will save significant computing power and memory. Minimum value of this: 0.01. +/// @param minimumRate The minimum value of rate. For example: if the rate will never go below 0.5, minimumRate = 0.5 will save significant computing power and memory. Min: 0.01, max 0.75. JSWASM TimeStretching(unsigned int samplerate, float minimumRate = 0.01f); JSWASM ~TimeStretching(); diff --git a/Superpowered/libSuperpoweredAndroidX86.a b/Superpowered/libSuperpoweredAndroidX86.a index 2c442fb6..82938144 100644 Binary files a/Superpowered/libSuperpoweredAndroidX86.a and b/Superpowered/libSuperpoweredAndroidX86.a differ diff --git a/Superpowered/libSuperpoweredAndroidX86_64.a b/Superpowered/libSuperpoweredAndroidX86_64.a index b30c8847..39616ae4 100644 Binary files a/Superpowered/libSuperpoweredAndroidX86_64.a and b/Superpowered/libSuperpoweredAndroidX86_64.a differ diff --git a/Superpowered/libSuperpoweredAndroidarm64-v8a.a b/Superpowered/libSuperpoweredAndroidarm64-v8a.a index a10c3267..00638041 100644 Binary files a/Superpowered/libSuperpoweredAndroidarm64-v8a.a and b/Superpowered/libSuperpoweredAndroidarm64-v8a.a differ diff --git a/Superpowered/libSuperpoweredAndroidarmeabi-v7a.a b/Superpowered/libSuperpoweredAndroidarmeabi-v7a.a index 3ffab968..46e75935 100644 Binary files a/Superpowered/libSuperpoweredAndroidarmeabi-v7a.a and b/Superpowered/libSuperpoweredAndroidarmeabi-v7a.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/Info.plist b/Superpowered/libSuperpoweredAudio.xcframework/Info.plist index b7953c51..9e129599 100644 --- a/Superpowered/libSuperpoweredAudio.xcframework/Info.plist +++ b/Superpowered/libSuperpoweredAudio.xcframework/Info.plist @@ -6,85 +6,85 @@ LibraryIdentifier - ios-arm64_x86_64-maccatalyst + macos-arm64_x86_64 LibraryPath - libSuperpoweredAudioIOS-maccatalyst.a + libSuperpoweredAudioOSX.a SupportedArchitectures arm64 x86_64 SupportedPlatform - ios - SupportedPlatformVariant - maccatalyst + macos LibraryIdentifier - tvos-arm64 + ios-arm64_x86_64-maccatalyst LibraryPath - libSuperpoweredAudiotvOS-appletvos.a + libSuperpoweredAudioIOS-maccatalyst.a SupportedArchitectures arm64 + x86_64 SupportedPlatform - tvos + ios + SupportedPlatformVariant + maccatalyst LibraryIdentifier - tvos-arm64_x86_64-simulator + ios-arm64_armv7 LibraryPath - libSuperpoweredAudiotvOS-appletvsimulator.a + libSuperpoweredAudioIOS-iphoneos.a SupportedArchitectures arm64 - x86_64 + armv7 SupportedPlatform - tvos - SupportedPlatformVariant - simulator + ios LibraryIdentifier - macos-arm64_x86_64 + ios-arm64_i386_x86_64-simulator LibraryPath - libSuperpoweredAudioOSX.a + libSuperpoweredAudioIOS-iphonesimulator.a SupportedArchitectures arm64 + i386 x86_64 SupportedPlatform - macos + ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_armv7 + tvos-arm64 LibraryPath - libSuperpoweredAudioIOS-iphoneos.a + libSuperpoweredAudiotvOS-appletvos.a SupportedArchitectures arm64 - armv7 SupportedPlatform - ios + tvos LibraryIdentifier - ios-arm64_i386_x86_64-simulator + tvos-arm64_x86_64-simulator LibraryPath - libSuperpoweredAudioIOS-iphonesimulator.a + libSuperpoweredAudiotvOS-appletvsimulator.a SupportedArchitectures arm64 - i386 x86_64 SupportedPlatform - ios + tvos SupportedPlatformVariant simulator diff --git a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_armv7/libSuperpoweredAudioIOS-iphoneos.a b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_armv7/libSuperpoweredAudioIOS-iphoneos.a index ff4e83b7..8ef0ecb5 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_armv7/libSuperpoweredAudioIOS-iphoneos.a and b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_armv7/libSuperpoweredAudioIOS-iphoneos.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_i386_x86_64-simulator/libSuperpoweredAudioIOS-iphonesimulator.a b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_i386_x86_64-simulator/libSuperpoweredAudioIOS-iphonesimulator.a index d25a40d9..e8babc56 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_i386_x86_64-simulator/libSuperpoweredAudioIOS-iphonesimulator.a and b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_i386_x86_64-simulator/libSuperpoweredAudioIOS-iphonesimulator.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_x86_64-maccatalyst/libSuperpoweredAudioIOS-maccatalyst.a b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_x86_64-maccatalyst/libSuperpoweredAudioIOS-maccatalyst.a index c7e8b2cb..b48b5365 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_x86_64-maccatalyst/libSuperpoweredAudioIOS-maccatalyst.a and b/Superpowered/libSuperpoweredAudio.xcframework/ios-arm64_x86_64-maccatalyst/libSuperpoweredAudioIOS-maccatalyst.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/macos-arm64_x86_64/libSuperpoweredAudioOSX.a b/Superpowered/libSuperpoweredAudio.xcframework/macos-arm64_x86_64/libSuperpoweredAudioOSX.a index 91514a56..78bb78d6 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/macos-arm64_x86_64/libSuperpoweredAudioOSX.a and b/Superpowered/libSuperpoweredAudio.xcframework/macos-arm64_x86_64/libSuperpoweredAudioOSX.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64/libSuperpoweredAudiotvOS-appletvos.a b/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64/libSuperpoweredAudiotvOS-appletvos.a index 40d173a2..b0522c11 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64/libSuperpoweredAudiotvOS-appletvos.a and b/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64/libSuperpoweredAudiotvOS-appletvos.a differ diff --git a/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64_x86_64-simulator/libSuperpoweredAudiotvOS-appletvsimulator.a b/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64_x86_64-simulator/libSuperpoweredAudiotvOS-appletvsimulator.a index 2bdb80d6..8c8be24b 100644 Binary files a/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64_x86_64-simulator/libSuperpoweredAudiotvOS-appletvsimulator.a and b/Superpowered/libSuperpoweredAudio.xcframework/tvos-arm64_x86_64-simulator/libSuperpoweredAudiotvOS-appletvsimulator.a differ diff --git a/Superpowered/libSuperpoweredLinuxARM32Hard.a b/Superpowered/libSuperpoweredLinuxARM32Hard.a index 4dca8c5c..55385608 100755 Binary files a/Superpowered/libSuperpoweredLinuxARM32Hard.a and b/Superpowered/libSuperpoweredLinuxARM32Hard.a differ diff --git a/Superpowered/libSuperpoweredLinuxARM32Soft.a b/Superpowered/libSuperpoweredLinuxARM32Soft.a index 29fd14b9..8fa5d89a 100755 Binary files a/Superpowered/libSuperpoweredLinuxARM32Soft.a and b/Superpowered/libSuperpoweredLinuxARM32Soft.a differ diff --git a/Superpowered/libSuperpoweredLinuxARM64.a b/Superpowered/libSuperpoweredLinuxARM64.a index 370ca1fb..1af2174a 100755 Binary files a/Superpowered/libSuperpoweredLinuxARM64.a and b/Superpowered/libSuperpoweredLinuxARM64.a differ diff --git a/Superpowered/libSuperpoweredLinuxX86.a b/Superpowered/libSuperpoweredLinuxX86.a index 9e1d9be5..3f827b66 100755 Binary files a/Superpowered/libSuperpoweredLinuxX86.a and b/Superpowered/libSuperpoweredLinuxX86.a differ diff --git a/Superpowered/libSuperpoweredLinuxX86_64.a b/Superpowered/libSuperpoweredLinuxX86_64.a index 2c53a2fc..ade9b1c2 100755 Binary files a/Superpowered/libSuperpoweredLinuxX86_64.a and b/Superpowered/libSuperpoweredLinuxX86_64.a differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x64.lib index dc2da4d5..e01565b2 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x86.lib index 3ccded03..2769d1ac 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin141_Debug_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x64.lib index 3a49be73..a5301472 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x86.lib index 39c9a7c5..11e88412 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin141_Debug_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x64.lib index 1f94fcbd..494ba549 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x86.lib index f8d156fb..bbe8f43a 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin141_Release_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x64.lib index f8131217..3747a540 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x86.lib index cb7184bc..d8430486 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin141_Release_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x64.lib index a0936849..09fe820c 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x86.lib index ecf83e9e..6ca3daed 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin142_Debug_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x64.lib index 51e63bb9..961f4ac2 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x86.lib index 27cfccd9..fa69ee9a 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin142_Debug_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x64.lib index 8535cc07..c5555aa3 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x86.lib index b3033d46..b48a0bb3 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin142_Release_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x64.lib index 02997826..57672d75 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x86.lib index f2c9f710..dd30027a 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin142_Release_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x64.lib index 07fc4c2d..72ee14a7 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x86.lib index f8112d8f..a01996d0 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin143_Debug_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x64.lib index 8845c656..03268513 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x86.lib index a77a9225..5f811a85 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin143_Debug_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x64.lib b/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x64.lib index db982d48..50584ae4 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x64.lib and b/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x86.lib b/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x86.lib index e767b304..8c4ef95c 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x86.lib and b/Superpowered/libWindows/SuperpoweredWin143_Release_MD_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x64.lib b/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x64.lib index 46c70944..d102510b 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x64.lib and b/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x86.lib b/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x86.lib index d6221329..513e00fa 100644 Binary files a/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x86.lib and b/Superpowered/libWindows/SuperpoweredWin143_Release_MT_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_ARM.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_ARM.lib index d1f1913b..9a7ed5e7 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_ARM.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_ARM.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x64.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x64.lib index 9cdb63fc..1d5fc5d6 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x64.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x86.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x86.lib index 16e52918..ac1e198a 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x86.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Debug_x86.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Release_ARM.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Release_ARM.lib index 85c66ca6..a8196096 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Release_ARM.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Release_ARM.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Release_x64.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Release_x64.lib index 37987e4a..21e21dbd 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Release_x64.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Release_x64.lib differ diff --git a/Superpowered/libWindows/SuperpoweredWinUWP_Release_x86.lib b/Superpowered/libWindows/SuperpoweredWinUWP_Release_x86.lib index 788c5089..76dc045e 100644 Binary files a/Superpowered/libWindows/SuperpoweredWinUWP_Release_x86.lib and b/Superpowered/libWindows/SuperpoweredWinUWP_Release_x86.lib differ