From 090aba2b3bcc25e8f038c65a96e988480982ca97 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Sun, 20 Mar 2022 14:48:33 +0100 Subject: [PATCH] chore: Add audio libraries on desktop --- .gitlab-ci.yml | 2 +- linux/flutter/generated_plugin_registrant.cc | 4 ++++ linux/flutter/generated_plugins.cmake | 1 + pubspec.lock | 14 ++++++++++++++ pubspec.yaml | 1 + windows/flutter/generated_plugin_registrant.cc | 3 +++ windows/flutter/generated_plugins.cmake | 1 + 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48f047d5..3a814e0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,7 @@ build_linux_x86: stage: coverage before_script: [ - sudo apt update && sudo apt install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y, + sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 libwebkit2gtk-4.0-dev -y, ] script: [./scripts/build-linux.sh] artifacts: diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 9d220695..66cc97c2 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -10,6 +10,7 @@ #include #include #include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -25,6 +26,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); + g_autoptr(FlPluginRegistrar) libwinmedia_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "LibwinmediaPlugin"); + libwinmedia_plugin_register_with_registrar(libwinmedia_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 818fa7f6..6fa3e89d 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -7,6 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_lifecycle file_selector_linux flutter_secure_storage_linux + libwinmedia url_launcher_linux ) diff --git a/pubspec.lock b/pubspec.lock index b3c918c2..3909b71b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -884,6 +884,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.9.20" + just_audio_libwinmedia: + dependency: "direct main" + description: + name: just_audio_libwinmedia + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4" just_audio_platform_interface: dependency: transitive description: @@ -914,6 +921,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.8.1" + libwinmedia: + dependency: transitive + description: + name: libwinmedia + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.7" lints: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8ac651a2..707fb99c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,6 +54,7 @@ dependencies: image_picker: ^0.8.4+8 intl: any just_audio: ^0.9.20 + just_audio_libwinmedia: any keyboard_shortcuts: ^0.1.4 localstorage: ^4.0.0+1 lottie: ^1.2.2 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index cde91e3e..39918a5e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); FlutterWebRTCPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterWebRTCPlugin")); + LibwinmediaPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("LibwinmediaPlugin")); PermissionHandlerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index eb0112c0..ea7b4e51 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_windows flutter_secure_storage_windows flutter_webrtc + libwinmedia permission_handler_windows url_launcher_windows )