From 281eb17dc9dea88036f1e11798349a2dfe08664f Mon Sep 17 00:00:00 2001 From: Daniel Ponte Date: Wed, 14 Aug 2024 16:10:17 -0400 Subject: [PATCH] Squashed commit of the following: commit c9be051b5d96b6ed004b432909ee168dffa531c8 Author: Daniel Ponte Date: Wed Aug 14 16:09:53 2024 -0400 Patch build commit 56ec3e3c53226b8b0c969b602d933bb88d073ebf Author: Daniel Ponte Date: Wed Aug 14 15:49:50 2024 -0400 Fix exception in just_audio_media_kit commit c80625d07eaee753fd29173537bbc72f6b3be9db Author: Daniel Ponte Date: Wed Aug 14 15:37:25 2024 -0400 Fix justaudio commit b7af6f28bbdcc5f517c5d4a5c003f41502a0af24 Author: Daniel Ponte Date: Wed Aug 14 14:44:18 2024 -0400 use justaudio only commit 87d535494379f92ba0ccb5479f87fa6b890513ed Author: Daniel Ponte Date: Wed Aug 14 14:36:58 2024 -0400 Multiple audio drivers commit 1e6b0d04392ada4106a5c5c8fad0c3404608dc4c Author: Daniel Ponte Date: Wed Aug 14 14:08:14 2024 -0400 Fix on macos commit 47cca3e3c07f8d40d502e7468f796bf9b4182341 Author: Daniel Ponte Date: Wed Aug 14 13:10:12 2024 -0400 osx --- .github/workflows/build-web.yml | 1 + macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 38 +++++++++++++++++-- pubspec.yaml | 4 +- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index 4eacb24..97a293c 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -38,6 +38,7 @@ jobs: pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path - run: flutter --version - run: flutter pub get + - run: make patch # - run: flutter test - run: flutter build web --web-renderer auto - name: Upload artifacts diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7b76bcf..b3256ee 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,11 +8,13 @@ import Foundation import audio_session import flutter_secure_storage_macos import just_audio +import media_kit_libs_macos_audio import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) + MediaKitLibsMacosAudioPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosAudioPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 298c4c5..3a58e1d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -304,16 +304,48 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.10+1" - media_kit_libs_linux: + media_kit_libs_android_audio: + dependency: transitive + description: + name: media_kit_libs_android_audio + sha256: "3d2df5c09d3f3ff7c55b53bf955e46712f76483e77562a5a017439a3ea85ce88" + url: "https://pub.dev" + source: hosted + version: "1.3.6" + media_kit_libs_audio: dependency: "direct main" + description: + name: media_kit_libs_audio + sha256: f3f91df69848005363b3ae0ef7971a90edbd80a9365195684ef26c9a6ac8833f + url: "https://pub.dev" + source: hosted + version: "1.0.4" + media_kit_libs_ios_audio: + dependency: transitive + description: + name: media_kit_libs_ios_audio + sha256: "78ccf04e27d6b4ba00a355578ccb39b772f00d48269a6ac3db076edf2d51934f" + url: "https://pub.dev" + source: hosted + version: "1.1.4" + 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_macos_audio: + dependency: transitive + description: + name: media_kit_libs_macos_audio + sha256: "3be21844df98f286de32808592835073cdef2c1a10078bac135da790badca950" + url: "https://pub.dev" + source: hosted + version: "1.1.4" media_kit_libs_windows_audio: - dependency: "direct main" + dependency: transitive description: name: media_kit_libs_windows_audio sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53 @@ -321,7 +353,7 @@ packages: source: hosted version: "1.0.9" media_kit_native_event_loop: - dependency: "direct main" + dependency: transitive description: name: media_kit_native_event_loop sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e diff --git a/pubspec.yaml b/pubspec.yaml index 7cb70bc..fa74843 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,10 +44,8 @@ dependencies: http: ^1.2.2 just_audio: ^0.9.37 just_audio_media_kit: ^2.0.5 - media_kit_libs_linux: any - media_kit_libs_windows_audio: any - media_kit_native_event_loop: ^1.0.8 patch_package: ^0.0.8 + media_kit_libs_audio: ^1.0.4 dev_dependencies: flutter_test: