Skip to content

Commit f978583

Browse files
committed
use C++ API directly instead of C wrappers
1 parent e950006 commit f978583

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Sources/CxxFlutterSwift/CxxFlutterSwift.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ void FlutterDesktopMessengerSetCallbackBlock(
7777
std::lock_guard<std::mutex> guard(flutterSwiftCallbacksMutex);
7878
if (callbackBlock != nullptr) {
7979
flutterSwiftCallbacks[channel] = _Block_copy(callbackBlock);
80-
FlutterDesktopMessengerSetCallback(
81-
messenger, channel, FlutterDesktopMessageCallbackThunk, callbackBlock);
80+
messenger->GetEngine()->message_dispatcher()->SetMessageCallback(
81+
channel, FlutterDesktopMessageCallbackThunk, callbackBlock);
8282
} else {
8383
auto savedCallbackBlock = flutterSwiftCallbacks[channel];
8484
flutterSwiftCallbacks.erase(channel);
8585
_Block_release(savedCallbackBlock);
86-
FlutterDesktopMessengerSetCallback(messenger, channel, nullptr, nullptr);
86+
messenger->GetEngine()->message_dispatcher()->SetMessageCallback(
87+
channel, nullptr, nullptr);
8788
}
8889
}
8990

@@ -106,8 +107,8 @@ void FlutterDesktopPluginRegistrarSetDestructionHandlerBlock(
106107
FlutterDesktopOnPluginRegistrarDestroyedBlock callbackBlock) {
107108
std::lock_guard<std::mutex> guard(flutterSwiftRegistrarCallbacksMutex);
108109
flutterSwiftRegistrarCallbacks[registrar] = _Block_copy(callbackBlock);
109-
FlutterDesktopPluginRegistrarSetDestructionHandler(
110-
registrar, FlutterDesktopOnPluginRegistrarDestroyedBlockThunk);
110+
registrar->engine->SetPluginRegistrarDestructionCallback(
111+
FlutterDesktopOnPluginRegistrarDestroyedBlockThunk);
111112
}
112113

113114
void FlutterDesktopEngineSetView(FlutterDesktopEngineRef engineRef,

0 commit comments

Comments
 (0)