diff --git a/CHANGELOG.md b/CHANGELOG.md index dd3c938e..be0abfe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.2.1 + +- Addressed few issues related to `NativeVideo` on Windows (@alexmercerind). +- Fixed switch case directShow control (@Paradoxu). +- Fixed Bump `flutter_native_view` and `window_manager` to latest versions (@ashutosh2014, @alexmercerind). + ## 0.2.0 - Addressed multiple Dart-sided memory leaks during FFI interop (@alexmercerind). diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index 0e8ad7e0..666041c2 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -7,9 +7,13 @@ #include "generated_plugin_registrant.h" #include +#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) dart_vlc_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "DartVlcPlugin"); dart_vlc_plugin_register_with_registrar(dart_vlc_registrar); + g_autoptr(FlPluginRegistrar) window_manager_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); + window_manager_plugin_register_with_registrar(window_manager_registrar); } diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 0ec9fa0e..ff295da4 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -4,6 +4,10 @@ list(APPEND FLUTTER_PLUGIN_LIST dart_vlc + window_manager +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST ) set(PLUGIN_BUNDLED_LIBRARIES) @@ -14,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 6b98bf81..843493b6 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,8 +7,10 @@ import Foundation import dart_vlc import path_provider_macos +import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DartVlcPlugin.register(with: registry.registrar(forPlugin: "DartVlcPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc index e9dfafe6..0bc6853a 100644 --- a/example/windows/flutter/generated_plugin_registrant.cc +++ b/example/windows/flutter/generated_plugin_registrant.cc @@ -8,10 +8,13 @@ #include #include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { DartVlcPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("DartVlcPlugin")); FlutterNativeViewPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterNativeViewPlugin")); + WindowManagerPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index e137d433..771de195 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -5,6 +5,10 @@ list(APPEND FLUTTER_PLUGIN_LIST dart_vlc flutter_native_view + window_manager +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST ) set(PLUGIN_BUNDLED_LIBRARIES) @@ -15,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/example/windows/runner/main.cpp b/example/windows/runner/main.cpp index bd1779f0..b6bfe544 100644 --- a/example/windows/runner/main.cpp +++ b/example/windows/runner/main.cpp @@ -22,7 +22,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, return EXIT_FAILURE; } window.SetQuitOnClose(true); - flutternativeview::CreateNativeViewContainer(); + flutternativeview::NativeViewContainer::GetInstance()->Create(); MSG msg; while (GetMessage(&msg, nullptr, 0, 0)) { TranslateMessage(&msg); diff --git a/pubspec.yaml b/pubspec.yaml index 1d6537fd..6ef589ac 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_vlc description: Flutter media playback, broadcast, recording & chromecast library. Based on libvlc. -version: 0.2.0 +version: 0.2.1 homepage: https://github.com/alexmercerind/dart_vlc repository: https://github.com/alexmercerind/dart_vlc documentation: https://github.com/alexmercerind/dart_vlc/blob/master/README.md @@ -16,7 +16,7 @@ dependencies: path: ">=1.8.0 <2.0.0" path_provider: ">=2.0.2 <3.0.0" audio_video_progress_bar: ">=0.9.0 <1.0.0" - flutter_native_view: ^0.0.1+1 + flutter_native_view: ^0.0.2 window_manager: ^0.2.3 # REMOVE THIS BEFORE PUBLISHING ON pub.dev.