ladies and gentlemen, NAM

djshaji · Apr 17, 2024 · a0ab50d · a0ab50d
1 parent 6eb264a
commit a0ab50d
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.shajikhan.ladspa.amprack"
         minSdk 24
         targetSdk 33
-        versionCode 83
-        versionName '4.04'
+        versionCode 84
+        versionName '4.05'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/app/src/main/cpp/Engine.cpp b/app/src/main/cpp/Engine.cpp
@@ -532,6 +532,14 @@ int Engine::addPlugintoRackByName (std::string pluginName) {
     return  0 ;
 }
 
+void Engine::setPluginFilename (std::string filename, int plugin) {
+    IN
+    mFullDuplexPass.bypass = true;
+    activePlugins.at(plugin)->setFileName(filename);
+    mFullDuplexPass.bypass = false;
+    OUT
+}
+
 bool Engine::setPluginBuffer (float * buffer, int buffer_size, int plugin) {
     IN
 //    LOGD("plugins in queue %d requested %d", activePlugins.size(), plugin);

diff --git a/app/src/main/cpp/Engine.h b/app/src/main/cpp/Engine.h
@@ -115,6 +115,8 @@ std::string LIBRARY_PATH ;
 
 public:
     double getLatency(bool input);
+
+    void setPluginFilename(std::string filename, int plugin);
 } ;
 
 #endif // __ENGINE__H
diff --git a/app/src/main/cpp/Plugin.cpp b/app/src/main/cpp/Plugin.cpp
@@ -288,4 +288,8 @@ void Plugin::setBuffer (float * buffer, int read_bytes) {
     lv2Descriptor->connect_port(handle, 9, & read_bytes);
     lv2Descriptor->connect_port(handle, 2, buffer);
     OUT
+}
+
+void Plugin::setFileName (std::string filename) {
+    lv2Descriptor->connect_port(handle, 4, (void *) filename.c_str());
 }
diff --git a/app/src/main/cpp/Plugin.h b/app/src/main/cpp/Plugin.h
@@ -43,6 +43,8 @@ class Plugin {
     void load();
 
     int addPluginControl(const LV2_Descriptor *_descriptor, nlohmann::json _j);
+
+    void setFileName(std::string filename);
 };
 
 template<class UnaryFunction>

diff --git a/app/src/main/cpp/SharedLibrary.h b/app/src/main/cpp/SharedLibrary.h
@@ -83,6 +83,7 @@ class SharedLibrary {
     unsigned long sampleRate ;
     LADSPA_Descriptor_Function descriptorFunction ;
     LV2_Descriptor_Function lv2DescriptorFunction ;
+    (void)(LV2_Handle, )
 
     void setSampleRate(unsigned long _sampleRate);
     char *load();

diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -845,4 +845,18 @@ Java_com_shajikhan_ladspa_amprack_AudioEngine_getLatency(JNIEnv *env, jclass cla
         return -1.0;
 
     return engine->getLatency(input);
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_shajikhan_ladspa_amprack_AudioEngine_setPluginFilename(JNIEnv *env, jclass clazz,
+                                                                jstring filename, jint plugin) {
+    if (!engine)
+        return;
+
+    const char *nativeString = env->GetStringUTFChars(filename, 0);
+
+    // use your string
+
+    engine->setPluginFilename(std::string (nativeString), plugin);
+    env->ReleaseStringUTFChars(filename, nativeString);
 }
diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/AudioEngine.java b/app/src/main/java/com/shajikhan/ladspa/amprack/AudioEngine.java
@@ -74,6 +74,7 @@ public class AudioEngine {
 
     static native void testLV2 ();
     static native void setPluginBuffer (float  [] data, int plugin);
+    static native void setPluginFilename (String filename, int plugin);
     static native String tuneLatency ();
 
     static void setDefaultStreamValues(Context context) {

diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java b/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java
@@ -1674,6 +1674,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
 
         if (resultCode == RESULT_OK && requestCode > 4999 && requestCode < 5020) {
+            /* todo:
+            1. Check if file is audio OR better plugin name
+            2. If it is, do below
+            3. If it is not, send filename to NAM plugin
+            4. maybe a switch here, if NAM do this, if Looper do that
+
+             */
             int plugin = requestCode - 5000 ;
             AudioDecoder audioDecoder = new AudioDecoder(this);
             MediaCodecList supported = new MediaCodecList(MediaCodecList.ALL_CODECS);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">Amp Rack</string>
     <string name="app_version">Version 4 Razor</string>
-    <string name="build_id">593</string>
+    <string name="build_id">596</string>
     <string name="onboard_description">
         [new] Video Recorder\n\n
         Welcome to Version 4: \n\n