Cleanup

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

modtools/utils.py

@@ -185,13 +185,6 @@ class PluginAuthor(Structure):
         ("email", c_char_p),
     ]
 
-class PluginPortGroup(Structure):
-    _fields_ = [
-        ("valid", c_bool),
-        ("symbol", c_char_p),
-        ("name", c_char_p),
-    ]
-
 class PluginGUIPort(Structure):
     _fields_ = [
         ("valid", c_bool),
@@ -228,6 +221,13 @@ class PluginGUI_Mini(Structure):
         ("thumbnail", c_char_p),
     ]
 
+class PluginPortGroup(Structure):
+    _fields_ = [
+        ("valid", c_bool),
+        ("symbol", c_char_p),
+        ("name", c_char_p),
+    ]
+
 class PluginPortRanges(Structure):
     _fields_ = [
         ("minimum", c_float),
@@ -260,11 +260,11 @@ class PluginPort(Structure):
         ("units", PluginPortUnits),
         ("comment", c_char_p),
         ("designation", c_char_p),
+        ("group", c_char_p),
         ("properties", POINTER(c_char_p)),
         ("rangeSteps", c_int),
         ("scalePoints", POINTER(PluginPortScalePoint)),
         ("shortName", c_char_p),
-        ("groupSymbol", c_char_p),
     ]
 
 class PluginPortsI(Structure):
@@ -351,9 +351,9 @@ class PluginInfo(Structure):
         ("bundles", POINTER(c_char_p)),
         ("gui", PluginGUI),
         ("ports", PluginPorts),
+        ("portGroups", POINTER(PluginPortGroup)),
         ("parameters", POINTER(PluginParameter)),
         ("presets", POINTER(PluginPreset)),
-        ("portGroups", POINTER(PluginPortGroup)),
     ]
 
 # a subset of PluginInfo
@@ -526,7 +526,6 @@ class JackData(Structure):
 CvExpInputModeChanged = CFUNCTYPE(None, c_bool)
 
 c_struct_types = (PluginAuthor,
-                  PluginPortGroup,
                   PluginGUI,
                   PluginGUI_Mini,
                   PluginPortRanges,
@@ -542,8 +541,8 @@ class JackData(Structure):
                    POINTER(PluginPortScalePoint),
                    POINTER(PluginPort),
                    POINTER(PluginParameter),
-                   POINTER(PluginPreset),
                    POINTER(PluginPortGroup),
+                   POINTER(PluginPreset),
                    POINTER(PedalboardPlugin),
                    POINTER(PedalboardConnection),
                    POINTER(PedalboardPluginPort),

utils/utils.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2012-2023 MOD Audio UG
+// SPDX-FileCopyrightText: 2012-2025 MOD Audio UG
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 #ifndef MOD_UTILS_H_INCLUDED
@@ -43,12 +43,6 @@ typedef struct {
     const char* email;
 } PluginAuthor;
 
-typedef struct {
-    bool valid;
-    const char* symbol;
-    const char* name;
-} PluginPortGroup;
-
 typedef struct {
     bool valid;
     unsigned int index;
@@ -82,6 +76,13 @@ typedef struct {
     const char* thumbnail;
 } PluginGUI_Mini;
 
+typedef struct {
+    bool valid;
+    const char* uri;
+    const char* symbol;
+    const char* name;
+} PluginPortGroup;
+
 typedef struct {
     float min;
     float max;
@@ -110,11 +111,11 @@ typedef struct {
     PluginPortUnits units;
     const char* comment;
     const char* designation;
+    const char* group;
     const char* const* properties;
     int rangeSteps;
     const PluginPortScalePoint* scalePoints;
     const char* shortName;
-    const char* groupSymbol;
 } PluginPort;
 
 typedef struct {
@@ -192,9 +193,9 @@ typedef struct {
     const char* const* bundles;
     PluginGUI gui;
     PluginPorts ports;
+    const PluginPortGroup* portGroups;
     const PluginParameter* parameters;
     const PluginPreset* presets;
-    const PluginPortGroup* portGroups;
 } PluginInfo;
 
 typedef struct {