From 73b90b6620aeebd7e656201a50df5d61ca4e37f9 Mon Sep 17 00:00:00 2001 From: Yesterday17 Date: Sun, 22 Sep 2024 20:07:44 +0800 Subject: [PATCH] chore: upgrade anni-playback --- ios/Podfile.lock | 40 ++++++++++++++++++++++++++++++++++++++++ rust/Cargo.lock | 12 ++++++------ rust/Cargo.toml | 2 +- rust/src/api/player.rs | 11 ++++++++--- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dc9396f..a2d90e6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -18,6 +18,9 @@ PODS: - Firebase/Crashlytics (11.0.0): - Firebase/CoreOnly - FirebaseCrashlytics (~> 11.0.0) + - Firebase/Performance (11.0.0): + - Firebase/CoreOnly + - FirebasePerformance (~> 11.0.0) - firebase_analytics (11.3.2): - Firebase/Analytics (= 11.0.0) - firebase_core @@ -29,6 +32,12 @@ PODS: - Firebase/Crashlytics (= 11.0.0) - firebase_core - Flutter + - firebase_performance (0.10.0-7): + - Firebase/Performance (= 11.0.0) + - firebase_core + - Flutter + - FirebaseABTesting (11.2.0): + - FirebaseCore (~> 11.0) - FirebaseAnalytics (11.0.0): - FirebaseAnalytics/AdIdSupport (= 11.0.0) - FirebaseCore (~> 11.0) @@ -69,6 +78,24 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) + - FirebasePerformance (11.0.0): + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - FirebaseRemoteConfig (~> 11.0) + - FirebaseSessions (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - nanopb (~> 3.30910.0) + - FirebaseRemoteConfig (11.2.0): + - FirebaseABTesting (~> 11.0) + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - FirebaseRemoteConfigInterop (~> 11.0) + - FirebaseSharedSwift (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" - FirebaseRemoteConfigInterop (11.2.0) - FirebaseSessions (11.2.0): - FirebaseCore (~> 11.0) @@ -79,6 +106,7 @@ PODS: - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) + - FirebaseSharedSwift (11.2.0) - Flutter (1.0.0) - flutter_keyboard_visibility (0.0.1): - Flutter @@ -179,6 +207,7 @@ DEPENDENCIES: - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) + - firebase_performance (from `.symlinks/plugins/firebase_performance/ios`) - Flutter (from `Flutter`) - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) @@ -191,14 +220,18 @@ DEPENDENCIES: SPEC REPOS: trunk: - Firebase + - FirebaseABTesting - FirebaseAnalytics - FirebaseCore - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations + - FirebasePerformance + - FirebaseRemoteConfig - FirebaseRemoteConfigInterop - FirebaseSessions + - FirebaseSharedSwift - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities @@ -222,6 +255,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/firebase_core/ios" firebase_crashlytics: :path: ".symlinks/plugins/firebase_crashlytics/ios" + firebase_performance: + :path: ".symlinks/plugins/firebase_performance/ios" Flutter: :path: Flutter flutter_keyboard_visibility: @@ -248,14 +283,19 @@ SPEC CHECKSUMS: firebase_analytics: 4fd10182fd08bb8358f26ac8aca8dad7b6d0f592 firebase_core: 2ec6b789859c7c24766344ec71fdf78639402d56 firebase_crashlytics: 60630a0f91ee432275fa1660fd8593079761448a + firebase_performance: 12d45fdf120992fa879d990929bf73d4a5ced053 + FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1 FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a + FirebasePerformance: efdc02bacb1b4710588c9f867011605c081cdf79 + FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457 FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6 + FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 8c08211..397f955 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anni-common" version = "0.2.0" -source = "git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad#661fe1be2d6a04e114a421b0ac1ea84857d073ad" +source = "git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa#dee0e194669a6afafe4b1a0d7e3a6b8018922efa" dependencies = [ "anni-artist", "byteorder", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "anni-flac" version = "0.2.2" -source = "git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad#661fe1be2d6a04e114a421b0ac1ea84857d073ad" +source = "git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa#dee0e194669a6afafe4b1a0d7e3a6b8018922efa" dependencies = [ "async-trait", "byteorder", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "anni-playback" version = "0.1.0" -source = "git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad#661fe1be2d6a04e114a421b0ac1ea84857d073ad" +source = "git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa#dee0e194669a6afafe4b1a0d7e3a6b8018922efa" dependencies = [ - "anni-common 0.2.0 (git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad)", + "anni-common 0.2.0 (git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa)", "anni-provider", "anyhow", "arrayvec", @@ -189,9 +189,9 @@ dependencies = [ [[package]] name = "anni-provider" version = "0.3.1" -source = "git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad#661fe1be2d6a04e114a421b0ac1ea84857d073ad" +source = "git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa#dee0e194669a6afafe4b1a0d7e3a6b8018922efa" dependencies = [ - "anni-common 0.2.0 (git+https://github.com/ProjectAnni/anni?rev=661fe1be2d6a04e114a421b0ac1ea84857d073ad)", + "anni-common 0.2.0 (git+https://github.com/ProjectAnni/anni?rev=dee0e194669a6afafe4b1a0d7e3a6b8018922efa)", "anni-flac", "async-trait", "dashmap 5.5.3", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index d3e2a34..0bbf28a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -18,7 +18,7 @@ uuid = "1" crossbeam = { version = "0.8.2", features = ["crossbeam-channel"] } anyhow = "1.0.75" -anni-playback = { git = "https://github.com/ProjectAnni/anni", rev = "661fe1be2d6a04e114a421b0ac1ea84857d073ad" } +anni-playback = { git = "https://github.com/ProjectAnni/anni", rev = "dee0e194669a6afafe4b1a0d7e3a6b8018922efa" } cpal = { version = "0.15.3", features = ["oboe-shared-stdcxx"] } rand = "0.8.5" material-colors = { version = "0.4.2", features = ["image"] } diff --git a/rust/src/api/player.rs b/rust/src/api/player.rs index 4ddbf22..707e976 100644 --- a/rust/src/api/player.rs +++ b/rust/src/api/player.rs @@ -5,7 +5,7 @@ use std::{ thread, }; -use anni_playback::player::{AnniPlayer, TypedPriorityProvider}; +use anni_playback::player::{AnniPlayer, AnniPlayerOptions, TypedPriorityProvider}; use anni_playback::types::PlayerEvent; use flutter_rust_bridge::frb; @@ -60,8 +60,13 @@ pub struct AnnixPlayer { impl AnnixPlayer { #[frb(sync)] pub fn new(cache_path: String) -> AnnixPlayer { - let (player, receiver) = - AnniPlayer::new(TypedPriorityProvider::new(vec![]), cache_path.into()); + let (player, receiver) = AnniPlayer::new( + TypedPriorityProvider::new(vec![]), + AnniPlayerOptions { + sample_rate: 48000, + cache_path: cache_path.into(), + }, + ); let progress = Arc::new(OnceLock::new()); let player_state = Arc::new(OnceLock::new());