Fix yabridge_version() in chainloaders

The function doesn't (and cannot) have the same name as the function pointer, so `MAYBE_LOAD_FUNCTION()` does the wrong thing here. May as well just do it manually.
robbert-vdh · Dec 10, 2023 · cb6a1dd · cb6a1dd
1 parent f1a7ad4
commit cb6a1dd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/src/chainloader/clap-chainloader.cpp b/src/chainloader/clap-chainloader.cpp
@@ -94,27 +94,27 @@ bool initialize_library() {
         return false;
     }
 
-#define MAYBE_LOAD_FUNCTION(name)                                           \
+#define LOAD_FUNCTION(name)                                                 \
     do {                                                                    \
         (name) =                                                            \
             reinterpret_cast<decltype(name)>(dlsym(library_handle, #name)); \
-    } while (false)
-#define LOAD_FUNCTION(name)                                      \
-    do {                                                         \
-        MAYBE_LOAD_FUNCTION(name);                               \
-        if (!(name)) {                                           \
-            log_failing_dlsym(yabridge_clap_plugin_name, #name); \
-            return false;                                        \
-        }                                                        \
+        if (!(name)) {                                                      \
+            log_failing_dlsym(yabridge_clap_plugin_name, #name);            \
+            return false;                                                   \
+        }                                                                   \
     } while (false)
 
     LOAD_FUNCTION(yabridge_module_init);
     LOAD_FUNCTION(yabridge_module_free);
     LOAD_FUNCTION(yabridge_module_get_factory);
-    MAYBE_LOAD_FUNCTION(remote_yabridge_version);
+
+    // This one can be a null pointer if the function does not yet exist in this
+    // yabridge version
+    remote_yabridge_version =
+        reinterpret_cast<decltype(remote_yabridge_version)>(
+            dlsym(library_handle, "yabridge_version"));
 
 #undef LOAD_FUNCTION
-#undef MAYBE_LOAD_FUNCTION
 
     return true;
 }

diff --git a/src/chainloader/vst2-chainloader.cpp b/src/chainloader/vst2-chainloader.cpp
@@ -77,25 +77,25 @@ bool initialize_library() {
         return false;
     }
 
-#define MAYBE_LOAD_FUNCTION(name)                                           \
+#define LOAD_FUNCTION(name)                                                 \
     do {                                                                    \
         (name) =                                                            \
             reinterpret_cast<decltype(name)>(dlsym(library_handle, #name)); \
-    } while (false)
-#define LOAD_FUNCTION(name)                                      \
-    do {                                                         \
-        MAYBE_LOAD_FUNCTION(name);                               \
-        if (!(name)) {                                           \
-            log_failing_dlsym(yabridge_vst2_plugin_name, #name); \
-            return false;                                        \
-        }                                                        \
+        if (!(name)) {                                                      \
+            log_failing_dlsym(yabridge_vst2_plugin_name, #name);            \
+            return false;                                                   \
+        }                                                                   \
     } while (false)
 
     LOAD_FUNCTION(yabridge_plugin_init);
-    MAYBE_LOAD_FUNCTION(remote_yabridge_version);
+
+    // This one can be a null pointer if the function does not yet exist in this
+    // yabridge version
+    remote_yabridge_version =
+        reinterpret_cast<decltype(remote_yabridge_version)>(
+            dlsym(library_handle, "yabridge_version"));
 
 #undef LOAD_FUNCTION
-#undef MAYBE_LOAD_FUNCTION
 
     return true;
 }

diff --git a/src/chainloader/vst3-chainloader.cpp b/src/chainloader/vst3-chainloader.cpp
@@ -94,27 +94,27 @@ bool initialize_library() {
         return false;
     }
 
-#define MAYBE_LOAD_FUNCTION(name)                                           \
+#define LOAD_FUNCTION(name)                                                 \
     do {                                                                    \
         (name) =                                                            \
             reinterpret_cast<decltype(name)>(dlsym(library_handle, #name)); \
-    } while (false)
-#define LOAD_FUNCTION(name)                                      \
-    do {                                                         \
-        MAYBE_LOAD_FUNCTION(name);                               \
-        if (!(name)) {                                           \
-            log_failing_dlsym(yabridge_vst3_plugin_name, #name); \
-            return false;                                        \
-        }                                                        \
+        if (!(name)) {                                                      \
+            log_failing_dlsym(yabridge_vst3_plugin_name, #name);            \
+            return false;                                                   \
+        }                                                                   \
     } while (false)
 
     LOAD_FUNCTION(yabridge_module_init);
     LOAD_FUNCTION(yabridge_module_free);
     LOAD_FUNCTION(yabridge_module_get_plugin_factory);
-    MAYBE_LOAD_FUNCTION(remote_yabridge_version);
+
+    // This one can be a null pointer if the function does not yet exist in this
+    // yabridge version
+    remote_yabridge_version =
+        reinterpret_cast<decltype(remote_yabridge_version)>(
+            dlsym(library_handle, "yabridge_version"));
 
 #undef LOAD_FUNCTION
-#undef MAYBE_LOAD_FUNCTION
 
     return true;
 }