about summary refs log tree commit diff stats
path: root/src/wrapped/wrappedgstbase.c
diff options
context:
space:
mode:
authorrajdakin <rajdakin@gmail.com>2024-02-10 15:06:08 +0100
committerGitHub <noreply@github.com>2024-02-10 15:06:08 +0100
commitb527ebbf5be0949df3b9dcf0806109acc8119476 (patch)
treed9687f665b8e3a1facc15be822463bf7d274dacd /src/wrapped/wrappedgstbase.c
parentad55cfde7f61395618991543694b35183f9c6ad7 (diff)
downloadbox64-b527ebbf5be0949df3b9dcf0806109acc8119476.tar.gz
box64-b527ebbf5be0949df3b9dcf0806109acc8119476.zip
Wrapped libraries refactor (#1257)
* [MISC] Removed a warning caused by tab/space mismatch

* [WRAPPED] Factored out `getMy` and `freeMy` calls

* [WRAPPED] Small cleanup of the init header

* [WRAPPED] Factored out `SETALT`

* [WRAPPED] Factored out needed libs
Diffstat (limited to 'src/wrapped/wrappedgstbase.c')
-rw-r--r--src/wrapped/wrappedgstbase.c31
1 files changed, 10 insertions, 21 deletions
diff --git a/src/wrapped/wrappedgstbase.c b/src/wrapped/wrappedgstbase.c
index 495357dc..b3d85b35 100644
--- a/src/wrapped/wrappedgstbase.c
+++ b/src/wrapped/wrappedgstbase.c
@@ -229,29 +229,18 @@ EXPORT void my_gst_collect_pads_set_buffer_function(x64emu_t* emu, void* pads, v
     if(box64_nogtk) \
         return -1;
 
+#define CUSTOM_INIT \
+    SetGstBaseTransformID(my->gst_base_transform_get_type());\
+    SetGstBaseSinkID(my->gst_base_sink_get_type());\
+    SetGstAggregatorID(my->gst_aggregator_get_type());\
+    SetGstPushSrcID(my->gst_push_src_get_type());\
+    SetGstBaseSrcID(my->gst_base_src_get_type());\
+    SetGstAggregatorPadID(my->gst_aggregator_pad_get_type());
+
 #ifdef ANDROID
-    #define CUSTOM_INIT \
-        getMy(lib);     \
-        SetGstBaseTransformID(my->gst_base_transform_get_type());\
-        SetGstBaseSinkID(my->gst_base_sink_get_type());\
-        SetGstAggregatorID(my->gst_aggregator_get_type());\
-        SetGstPushSrcID(my->gst_push_src_get_type());\
-        SetGstBaseSrcID(my->gst_base_src_get_type());\
-        SetGstAggregatorPadID(my->gst_aggregator_pad_get_type());\
-        setNeededLibs(lib, 1, "libgstreamer-1.0.so");
+#define NEEDED_LIBS "libgstreamer-1.0.so"
 #else
-    #define CUSTOM_INIT \
-        getMy(lib);     \
-        SetGstBaseTransformID(my->gst_base_transform_get_type());\
-        SetGstBaseSinkID(my->gst_base_sink_get_type());\
-        SetGstAggregatorID(my->gst_aggregator_get_type());\
-        SetGstPushSrcID(my->gst_push_src_get_type());\
-        SetGstBaseSrcID(my->gst_base_src_get_type());\
-        SetGstAggregatorPadID(my->gst_aggregator_pad_get_type());\
-        setNeededLibs(lib, 1, "libgstreamer-1.0.so.0");
+#define NEEDED_LIBS "libgstreamer-1.0.so.0"
 #endif
 
-#define CUSTOM_FINI \
-    freeMy();
-
 #include "wrappedlib_init.h"