use C++ API directly instead of C wrappers

PADL · Mar 5, 2025 · f978583 · f978583
1 parent e950006
commit f978583
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Sources/CxxFlutterSwift/CxxFlutterSwift.cpp b/Sources/CxxFlutterSwift/CxxFlutterSwift.cpp
@@ -77,13 +77,14 @@ void FlutterDesktopMessengerSetCallbackBlock(
   std::lock_guard<std::mutex> guard(flutterSwiftCallbacksMutex);
   if (callbackBlock != nullptr) {
     flutterSwiftCallbacks[channel] = _Block_copy(callbackBlock);
-    FlutterDesktopMessengerSetCallback(
-        messenger, channel, FlutterDesktopMessageCallbackThunk, callbackBlock);
+    messenger->GetEngine()->message_dispatcher()->SetMessageCallback(
+        channel, FlutterDesktopMessageCallbackThunk, callbackBlock);
   } else {
     auto savedCallbackBlock = flutterSwiftCallbacks[channel];
     flutterSwiftCallbacks.erase(channel);
     _Block_release(savedCallbackBlock);
-    FlutterDesktopMessengerSetCallback(messenger, channel, nullptr, nullptr);
+    messenger->GetEngine()->message_dispatcher()->SetMessageCallback(
+        channel, nullptr, nullptr);
   }
 }
 
@@ -106,8 +107,8 @@ void FlutterDesktopPluginRegistrarSetDestructionHandlerBlock(
     FlutterDesktopOnPluginRegistrarDestroyedBlock callbackBlock) {
   std::lock_guard<std::mutex> guard(flutterSwiftRegistrarCallbacksMutex);
   flutterSwiftRegistrarCallbacks[registrar] = _Block_copy(callbackBlock);
-  FlutterDesktopPluginRegistrarSetDestructionHandler(
-      registrar, FlutterDesktopOnPluginRegistrarDestroyedBlockThunk);
+  registrar->engine->SetPluginRegistrarDestructionCallback(
+      FlutterDesktopOnPluginRegistrarDestroyedBlockThunk);
 }
 
 void FlutterDesktopEngineSetView(FlutterDesktopEngineRef engineRef,