Skip to content

Commit eec3e2c

Browse files
author
Shaji Khan
committed
minor changes
1 parent ced3241 commit eec3e2c

10 files changed

Lines changed: 91 additions & 18 deletions

File tree

app/src/main/assets/blacklist.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,8 @@
4949
"27400": 1,
5050
"19200": 1,
5151
"33100": 1,
52-
"33200": 1
52+
"33200": 1,
53+
"15018": 1,
54+
"33700": 1,
55+
"15003": 1
5356
}
Lines changed: 48 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,69 @@
11
{
22
"-1": {
3-
"pluginName": "convoLV2"
3+
"Plugin": true,
4+
"http://lv2plug.in/ns/ext/buf-size#maxBlockLength": 8192,
5+
"http://lv2plug.in/ns/ext/buf-size#minBlockLength": 64,
6+
"http://lv2plug.in/ns/ext/options#supportedOption": "http://lv2plug.in/ns/ext/buf-size#maxBlockLength",
7+
"http://lv2plug.in/ns/ext/patch#writable": "http://gareus.org/oss/lv2/convoLV2#impulse",
8+
"extensionData": "http://lv2plug.in/ns/ext/state#interface",
9+
"microVersion": 0,
10+
"prefix": "http://gareus.org/oss/lv2/convoLV2#",
11+
"minorVersion": 4,
12+
"optionalFeature": "http://lv2plug.in/ns/ext/state#freePath",
13+
"port": "_:n4068599cb29e49c68b8fd50728b36e9fb18",
14+
"project": "http://gareus.org/oss/lv2/convoLV2",
15+
"requiredFeature": "http://lv2plug.in/ns/ext/worker#schedule",
16+
"http://usefulinc.com/ns/doap#license": "http://usefulinc.com/doap/licenses/gpl",
17+
"http://usefulinc.com/ns/doap#name": "LV2 Convolution Mono=>Stereo",
18+
"http://www.w3.org/2000/01/rdf-schema#comment": "Zero latency True Stereo Signal Convolution Processor; 2 signals, 4 chan IR (L -> L, R -> R, L -> R, R -> L)",
19+
"pluginName": "x42 LV2 Convolution"
420
},
521
"0": {
22+
"InputPort": true,
23+
"AtomPort": true,
24+
"bufferType": "Sequence",
25+
"supports": "Message",
26+
"minimumSize": 8192,
27+
"designation": "control",
28+
"index": 0,
29+
"name": "impulse",
30+
"symbol": "CONTROL"
31+
},
32+
"1": {
33+
"OutputPort": true,
34+
"AtomPort": true,
35+
"bufferType": "Sequence",
36+
"supports": "Message",
37+
"minimumSize": 8192,
38+
"designation": "control",
39+
"index": 1,
40+
"name": "NOTIFY",
41+
"symbol": "NOTIFY"
42+
},
43+
"2": {
644
"InputPort": true,
745
"ControlPort": true,
46+
"http://lv2plug.in/ns/extensions/units#unit": "http://lv2plug.in/ns/extensions/units#db",
847
"default": "0.0",
9-
"index": 8,
48+
"index": 2,
1049
"maximum": "24.0",
1150
"minimum": "-24.0",
12-
"name": "Output Gain",
51+
"name": "Gain",
1352
"symbol": "gain"
1453
},
15-
"1": {
54+
"3": {
1655
"AudioPort": true,
1756
"OutputPort": true,
57+
"designation": "http://lv2plug.in/ns/ext/port-groups#left",
1858
"index": 3,
19-
"name": "Out",
20-
"symbol": "out"
59+
"name": "OutL",
60+
"symbol": "out_1"
2161
},
22-
"2": {
62+
"4": {
2363
"AudioPort": true,
2464
"InputPort": true,
25-
"index": 5,
65+
"index": 4,
2666
"name": "In",
2767
"symbol": "in"
28-
},
29-
"3": {
30-
"InputPort": true,
31-
"AtomPort": true,
32-
"index": 0,
33-
"name": "Impulse file",
34-
"symbol": "control_port"
3568
}
3669
}

app/src/main/assets/plugins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"Neural Amp Modelling": [
1717
8101, 8104, 8117, 8119
1818
],
19-
"Impulse Response": [1885, 8108, 8117, 8118],
19+
"Impulse Response": [1885, 8108, 8117, 8118, 8103],
2020
"Cabinet": [
2121
2592, 2601, 2606, 2589, 15012, 8095, 8018, 24700, 7037, 5006, 5004,
2222
6004,5033,4065,2603,2607,7033,7035,8027,8060,8092,7038,8029,

app/src/main/cpp/Plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ void Plugin::check_notify () {
575575
return;
576576
}
577577

578-
if (ampAtom->has_file_path(filePort)) {
578+
if (ampAtom != nullptr && filePort != nullptr && ampAtom->has_file_path(filePort)) {
579579
LOGD ("[atom port] reset file port");
580580
ampAtom->resetAtom(filePort, filePortSize);
581581
LOGD ("[atom port] reset notify port");

app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import android.app.NotificationChannel;
3737
import android.app.NotificationManager;
3838
import android.app.PendingIntent;
39+
import android.app.ProgressDialog;
3940
import android.bluetooth.BluetoothAdapter;
4041
import android.bluetooth.BluetoothDevice;
4142
import android.bluetooth.BluetoothGatt;
@@ -496,6 +497,7 @@ public void onDeviceOpened(MidiDevice device) {
496497
hashCommands = new HashCommands(this);
497498
hashCommands.setMainActivity(this);
498499
hashCommands.add (this, "AudioRecordTest");
500+
hashCommands.add (this, "pluginsCrashTest");
499501
hashCommands.add (this, "resetMIDI");
500502
hashCommands.add (this, "printMidi");
501503
hashCommands.add (this, "cameraPreview");
@@ -4898,4 +4900,37 @@ public void run() {
48984900

48994901
registerReceiver(receiver, filter);
49004902
}
4903+
4904+
public static void pluginsCrashTest () {
4905+
Handler handler = new Handler();
4906+
ProgressDialog dialog = ProgressDialog.show((Context) mainActivity, "Plugin Crash Test", "Testing ...", false, false, null);
4907+
dialog.setIndeterminate(false);
4908+
4909+
dialog.setMax(mainActivity.pluginDialogAdapter.pluginNames.size());
4910+
Runnable runnable = new Runnable() {
4911+
int p = 195;
4912+
Runnable r = this;
4913+
4914+
public void run() {
4915+
Log.i(TAG, "plugin crash test: " + String.format("plugin %s [%d of %d]", mainActivity.pluginDialogAdapter.pluginNames.get(p), p, mainActivity.pluginDialogAdapter.pluginNames.size()));
4916+
AudioEngine.clearActiveQueue();
4917+
mainActivity.dataAdapter.reset();
4918+
4919+
dialog.setProgress(p);
4920+
dialog.setMessage(p + "/" + totalPlugins + ": " + mainActivity.pluginDialogAdapter.pluginNames.get(p));
4921+
Log.i("plugin crash test", p + "/" + totalPlugins + ": " + mainActivity.pluginDialogAdapter.pluginNames.get(p));
4922+
mainActivity.addPluginByName(mainActivity.pluginDialogAdapter.pluginNames.get(p));
4923+
p++;
4924+
4925+
if (p >= totalPlugins) {
4926+
alert("Test complete", "Successfully, probably, since we didn't crash ...");
4927+
return;
4928+
}
4929+
4930+
handler.postDelayed(r, 500);
4931+
}
4932+
} ;
4933+
4934+
handler.postDelayed(runnable, 2000);
4935+
}
49014936
}

app/src/main/java/com/shajikhan/ladspa/amprack/PluginDialogAdapter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class PluginDialogAdapter extends RecyclerView.Adapter <PluginDialogAdapt
3030
ArrayList<Integer> pluginsAll = new ArrayList<>();
3131
ArrayList<String> pluginNamesAll = new ArrayList<>();
3232
MainActivity mainActivity ;
33+
ArrayList <ViewHolder> holders = new ArrayList<>();
3334

3435
@NonNull
3536
@Override
@@ -44,6 +45,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
4445
public void onBindViewHolder(@NonNull PluginDialogAdapter.ViewHolder holder, int position) {
4546
// Log.d(TAG, "bid view");
4647
LinearLayout layout = holder.linearLayout ;
48+
holders.add(holder);
4749
String pluginName = pluginNames.get(position) ;
4850
if (mainActivity.isPluginLV2(pluginName))
4951
holder.pluginName.setText(/*"[LV2] " + */ pluginName);
421 KB
Binary file not shown.
299 KB
Binary file not shown.
567 KB
Binary file not shown.
510 KB
Binary file not shown.

0 commit comments

Comments
 (0)