Small refactor and simplification of library_t structure and box64context_t

1 files changed, 10 insertions, 12 deletions

diff --git a/src/wrapped/wrappedpulse.c b/src/wrapped/wrappedpulse.c
index 688671dc..02233aa0 100755
--- a/src/wrapped/wrappedpulse.c
+++ b/src/wrapped/wrappedpulse.c
@@ -826,7 +826,7 @@ static void* my_io_new(void* api, int fd, int events, void* cb, void *userdata)
         return ((pFpiipp_t)fnc)(api, fd, events, cb, userdata);
     }
 
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     if(cb)
         b = AddCheckBridge(bridge, vFppiip, cb, 0, NULL);
     if(api==my_mainloop_orig) api=my_mainloop_ref;    // need emulated version
@@ -857,7 +857,7 @@ static void my_io_set_destroy(void* e, void* cb)
     if(fnc)
         return ((vFpp_t)fnc)(e, cb);
 
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     uintptr_t b = 0;
     if(cb) {
         b = CheckBridged(bridge, cb);
@@ -878,7 +878,7 @@ static void* my_time_new(void* api, void* tv, void* cb, void* data)
     }
 
     // need to bridge the callback!
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     if(cb)
         b = AddCheckBridge(bridge, vFpppp, cb, 0, NULL);
     if(api==my_mainloop_orig) api=my_mainloop_ref;    // need emulated version
@@ -909,7 +909,7 @@ static void my_time_set_destroy(void* e, void* cb)
     if(fnc)
         return ((vFpp_t)fnc)(e, cb);
 
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     uintptr_t b = 0;
     if(cb)
             b = AddCheckBridge(bridge, vFppp, cb, 0, NULL);
@@ -927,7 +927,7 @@ static void* my_defer_new(void* api, void* cb, void* data)
     }
 
     // need to bridge the callback!
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     if(cb) {
         b = CheckBridged(bridge, cb);
         if(!b)
@@ -961,7 +961,7 @@ static void my_defer_set_destroy(void* e, void* cb)
     if(fnc)
         return ((vFpp_t)fnc)(e, cb);
 
-    bridge_t* bridge = my_context->pulse->priv.w.bridge;
+    bridge_t* bridge = my_lib->w.bridge;
     uintptr_t b = 0;
     if(cb)
         b = AddCheckBridge(bridge, vFppp, cb, 0, NULL);
@@ -1027,7 +1027,7 @@ EXPORT void my_pa_mainloop_free(x64emu_t* emu, void* mainloop)
 EXPORT void* my_pa_mainloop_get_api(x64emu_t* emu, void* mainloop)
 {
     my_pa_mainloop_api_t* api = my->pa_mainloop_get_api(mainloop);
-    bridgeMainloopAPI(my_lib->priv.w.bridge, api);
+    bridgeMainloopAPI(my_lib->w.bridge, api);
     return my_mainloop_ref;
 }
 
@@ -1040,7 +1040,7 @@ EXPORT void my_pa_threaded_mainloop_free(x64emu_t* emu, void* mainloop)
 EXPORT void* my_pa_threaded_mainloop_get_api(x64emu_t* emu, void* mainloop)
 {
     my_pa_mainloop_api_t* api = my->pa_threaded_mainloop_get_api(mainloop);
-    bridgeMainloopAPI(my_lib->priv.w.bridge, api);
+    bridgeMainloopAPI(my_lib->w.bridge, api);
     return my_mainloop_ref;
 }
 
@@ -1271,7 +1271,7 @@ EXPORT void my_pa_stream_set_read_callback(x64emu_t* emu, void* stream, void* cb
 
 EXPORT int my_pa_stream_write(x64emu_t* emu, void* stream, void* d, size_t nbytes, void* cb, int64_t offset, int seek)
 {
-    if(!emu->context->pulse)
+    if(!my_lib)
         return 0;
     if(!my)
         return 0;
@@ -1484,12 +1484,10 @@ EXPORT void* my_pa_context_get_source_output_info(x64emu_t* emu, void* c, uint32
         return -1;
 
 #define CUSTOM_INIT \
-    getMy(lib);     \
-    box64->pulse = lib;
+    getMy(lib);
 
 
 #define CUSTOM_FINI \
-    lib->context->pulse = NULL;     \
     freeMy();
 
 #include "wrappedlib_init.h"