diff --git a/.github/workflows/continuous-delivery.yaml b/.github/workflows/continuous-delivery.yaml index be018fb..73ec4c6 100644 --- a/.github/workflows/continuous-delivery.yaml +++ b/.github/workflows/continuous-delivery.yaml @@ -264,6 +264,9 @@ jobs: # Required for Flutter sudo apt-get update -y sudo apt-get install -y ninja-build libgtk-3-dev + # Required for Package "media_kit" which is used via "just_audio_media_kit" for Linux and Windows: + # See: https://pub.dev/packages/media_kit and https://pub.dev/packages/just_audio_media_kit + sudo apt-get install -y libmpv-dev mpv - name: Setup Flutter uses: subosito/flutter-action@v2 diff --git a/app/linux/flutter/generated_plugin_registrant.cc b/app/linux/flutter/generated_plugin_registrant.cc index 0cacc75..a78a161 100644 --- a/app/linux/flutter/generated_plugin_registrant.cc +++ b/app/linux/flutter/generated_plugin_registrant.cc @@ -6,11 +6,15 @@ #include "generated_plugin_registrant.h" +#include #include #include #include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) media_kit_libs_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitLibsLinuxPlugin"); + media_kit_libs_linux_plugin_register_with_registrar(media_kit_libs_linux_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); diff --git a/app/linux/flutter/generated_plugins.cmake b/app/linux/flutter/generated_plugins.cmake index 62f151f..b955c9b 100644 --- a/app/linux/flutter/generated_plugins.cmake +++ b/app/linux/flutter/generated_plugins.cmake @@ -3,12 +3,14 @@ # list(APPEND FLUTTER_PLUGIN_LIST + media_kit_libs_linux screen_retriever url_launcher_linux window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + media_kit_native_event_loop ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/app/pubspec.lock b/app/pubspec.lock index 23b5ceb..79e33d1 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -185,14 +185,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" - eventify: - dependency: transitive - description: - name: eventify - sha256: b829429f08586cc2001c628e7499e3e3c2493a1d895fd73b00ecb23351aa5a66 - url: "https://pub.dev" - source: hosted - version: "1.0.1" fake_async: dependency: transitive description: @@ -408,14 +400,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.1-beta.10" - just_audio_mpv: + just_audio_media_kit: dependency: "direct main" description: - name: just_audio_mpv - sha256: d6e4e9fd20bfb9d2fd5e3dcd7906c90ed07f83d1d2f44f31204160821ab62fed + name: just_audio_media_kit + sha256: d6288e898bc5ed499a938c3cf1ea99eeca4264f9b6ef7bdf92ace3e8b804e259 url: "https://pub.dev" source: hosted - version: "0.1.7" + version: "1.0.0" just_audio_platform_interface: dependency: transitive description: @@ -432,14 +424,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.8" - just_audio_windows: - dependency: "direct main" - description: - name: just_audio_windows - sha256: "7b8801f3987e98a2002cd23b5600b2daf162248ff1413266fb44c84448c1c0d3" - url: "https://pub.dev" - source: hosted - version: "0.2.0" jwt_decode: dependency: transitive description: @@ -456,6 +440,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" markdown: dependency: transitive description: @@ -480,6 +472,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.0" + media_kit: + dependency: transitive + description: + name: media_kit + sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a" + url: "https://pub.dev" + source: hosted + version: "1.1.10+1" + media_kit_libs_linux: + dependency: transitive + description: + name: media_kit_libs_linux + sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310 + url: "https://pub.dev" + source: hosted + version: "1.1.3" + media_kit_libs_windows_audio: + dependency: transitive + description: + name: media_kit_libs_windows_audio + sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53 + url: "https://pub.dev" + source: hosted + version: "1.0.9" + media_kit_native_event_loop: + dependency: transitive + description: + name: media_kit_native_event_loop + sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e + url: "https://pub.dev" + source: hosted + version: "1.0.8" meta: dependency: transitive description: @@ -496,14 +520,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - mpv_dart: - dependency: transitive - description: - name: mpv_dart - sha256: a33bd9a68439b496b7a5f36fecd3aa3cf6cbf0176ae15b9b60b12ae96e58f5a4 - url: "https://pub.dev" - source: hosted - version: "0.0.1" msix: dependency: "direct dev" description: @@ -696,6 +712,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + safe_local_storage: + dependency: transitive + description: + name: safe_local_storage + sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440 + url: "https://pub.dev" + source: hosted + version: "1.0.2" screen_retriever: dependency: transitive description: @@ -933,6 +957,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.2" + universal_platform: + dependency: transitive + description: + name: universal_platform + sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc + url: "https://pub.dev" + source: hosted + version: "1.0.0+1" + uri_parser: + dependency: transitive + description: + name: uri_parser + sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835" + url: "https://pub.dev" + source: hosted + version: "2.0.2" url_launcher: dependency: "direct main" description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index ca25b06..749e181 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -47,8 +47,7 @@ dependencies: intl: ^0.18.1 just_audio: ^0.9.32 just_audio_background: ^0.0.1-beta.10 - just_audio_windows: ^0.2.0 - just_audio_mpv: ^0.1.6 + just_audio_media_kit: ^1.0.0 package_info_plus: ^4.1.0 provider: ^6.0.4 purchases_flutter: ^6.0.0 diff --git a/app/windows/flutter/generated_plugin_registrant.cc b/app/windows/flutter/generated_plugin_registrant.cc index 9cd6619..6a28fd1 100644 --- a/app/windows/flutter/generated_plugin_registrant.cc +++ b/app/windows/flutter/generated_plugin_registrant.cc @@ -7,7 +7,7 @@ #include "generated_plugin_registrant.h" #include -#include +#include #include #include #include @@ -15,8 +15,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { AppLinksPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AppLinksPluginCApi")); - JustAudioWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("JustAudioWindowsPlugin")); + MediaKitLibsWindowsAudioPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("MediaKitLibsWindowsAudioPluginCApi")); ScreenRetrieverPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/app/windows/flutter/generated_plugins.cmake b/app/windows/flutter/generated_plugins.cmake index dba3d24..71c21b9 100644 --- a/app/windows/flutter/generated_plugins.cmake +++ b/app/windows/flutter/generated_plugins.cmake @@ -4,13 +4,14 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links - just_audio_windows + media_kit_libs_windows_audio screen_retriever url_launcher_windows window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + media_kit_native_event_loop ) set(PLUGIN_BUNDLED_LIBRARIES)