Skip to content

Commit a2f3c08

Browse files
apoint123Steve-xmh
authored andcommitted
all: 更新依赖
1 parent be09926 commit a2f3c08

File tree

15 files changed

+3676
-2874
lines changed

15 files changed

+3676
-2874
lines changed

Cargo.lock

Lines changed: 698 additions & 677 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"license": "GPL-3.0",
55
"devDependencies": {
66
"@biomejs/biome": "catalog:",
7-
"lerna": "^8.2.4",
8-
"nx": "^21.5.3",
7+
"lerna": "^9.0.0",
8+
"nx": "^21.6.5",
99
"typescript": "catalog:"
1010
},
1111
"scripts": {
1212
"build:libs": "nx run-many --target=build --projects=tag:library"
1313
},
14-
"packageManager": "pnpm@10.17.0",
14+
"packageManager": "pnpm@10.18.3",
1515
"pnpm": {
1616
"onlyBuiltDependencies": [
1717
"@applemusic-like-lyrics/lyric",

packages/player-core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ cpal = "^0.16"
1414
futures = "0.3"
1515
md5 = "^0.8"
1616
rb = "^0.4"
17-
ringbuf = "^0.3"
18-
rubato = "^0.15"
17+
ringbuf = "^0.4"
18+
rubato = "^0.16"
1919
arrayvec = "^0.7"
2020
segmap = "0.1"
2121
serde = { version = "^1.0", features = ["derive"] }
@@ -34,7 +34,7 @@ tracing = "0.1"
3434
easer = "0.3.0"
3535
dispatch = "0.2.0"
3636
tauri = "2.6.2"
37-
rodio = { version = "0.20", features = ["symphonia"] }
37+
rodio = { version = "0.21", features = ["symphonia"] }
3838
symphonia-core = "0.5.4"
3939

4040
[dependencies.ffmpeg-next]

packages/player-core/src/player.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{
1313
*,
1414
};
1515
use anyhow::{Context, anyhow};
16-
use rodio::{OutputStreamHandle, Sink, Source};
16+
use rodio::{OutputStream, Sink, Source};
1717
use std::sync::RwLock as StdRwLock;
1818
use symphonia_core::io::MediaSourceStream;
1919
use tokio::sync::RwLock;
@@ -29,7 +29,7 @@ pub struct AudioPlayer {
2929
msg_sender: AudioPlayerMessageSender,
3030
msg_receiver: AudioPlayerMessageReceiver,
3131
sink: Arc<Sink>,
32-
stream_handle: OutputStreamHandle,
32+
stream_handle: OutputStream,
3333
volume: f64,
3434
playlist: Vec<SongData>,
3535
playlist_inited: bool,
@@ -88,10 +88,11 @@ pub type LocalSongLoaderFn = Box<dyn Fn(String) -> LocalSongLoaderReturn + Send
8888
pub struct AudioPlayerConfig {}
8989

9090
impl AudioPlayer {
91-
pub fn new(_config: AudioPlayerConfig, handle: OutputStreamHandle) -> Self {
91+
pub fn new(_config: AudioPlayerConfig, handle: OutputStream) -> Self {
9292
let (evt_sender, evt_receiver) = tokio::sync::mpsc::unbounded_channel();
9393
let (msg_sender, msg_receiver) = tokio::sync::mpsc::unbounded_channel();
94-
let sink = Arc::new(Sink::try_new(&handle).expect("无法创建音频 Sink"));
94+
let sink = Arc::new(Sink::connect_new(&handle.mixer()));
95+
9596
sink.pause();
9697

9798
let current_audio_info = Arc::new(RwLock::new(AudioInfo::default()));
@@ -454,7 +455,7 @@ impl AudioPlayer {
454455
if clear_sink {
455456
self.sink.stop();
456457
self.fft_player.write().unwrap().clear();
457-
self.sink = Arc::new(Sink::try_new(&self.stream_handle)?);
458+
self.sink = Arc::new(Sink::connect_new(&self.stream_handle.mixer()));
458459
self.sink.set_volume(self.volume as f32);
459460
}
460461
let song_data = self.current_song.clone().context("没有当前歌曲可播放")?;

packages/player-core/src/symphonia_decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl Iterator for SymphoniaDecoder {
103103
}
104104

105105
impl Source for SymphoniaDecoder {
106-
fn current_frame_len(&self) -> Option<usize> {
106+
fn current_span_len(&self) -> Option<usize> {
107107
None
108108
}
109109
fn channels(&self) -> u16 {

packages/player/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@radix-ui/react-icons": "^1.3.2",
3030
"@radix-ui/themes": "^3.2.1",
3131
"@tanstack/react-virtual": "^3.13.12",
32-
"@tauri-apps/api": "^2.8.0",
32+
"@tauri-apps/api": "^2.9.0",
3333
"@tauri-apps/plugin-dialog": "^2.4.0",
3434
"@tauri-apps/plugin-fs": "~2.4.2",
3535
"@tauri-apps/plugin-global-shortcut": "^2.3.0",
@@ -41,25 +41,25 @@
4141
"chalk": "^5.6.2",
4242
"classnames": "catalog:",
4343
"convert-source-map": "^2.0.0",
44-
"dexie": "^4.2.0",
44+
"dexie": "^4.2.1",
4545
"dexie-react-hooks": "^4.2.0",
4646
"framer-motion": "catalog:",
47-
"i18next": "^25.5.2",
48-
"i18next-icu": "^2.4.0",
47+
"i18next": "^25.6.0",
48+
"i18next-icu": "^2.4.1",
4949
"jotai": "2.14.0",
5050
"md5": "^2.3.0",
5151
"react": "catalog:",
5252
"react-dom": "catalog:",
5353
"react-error-boundary": "^6.0.0",
54-
"react-i18next": "^15.7.3",
55-
"react-router-dom": "^7.9.1",
54+
"react-i18next": "^16",
55+
"react-router-dom": "^7.9.4",
5656
"react-toastify": "^11.0.5",
5757
"react-use": "^17.6.0",
5858
"react-viewport-list": "^7.1.2",
5959
"react-virtualized-auto-sizer": "^1.0.26",
60-
"sass": "^1.93.0",
60+
"sass": "^1.93.2",
6161
"save-file": "^2.3.1",
62-
"semver": "^7.7.2",
62+
"semver": "^7.7.3",
6363
"source-map-js": "^1.2.1",
6464
"stats.js": "^1.0.0",
6565
"uid": "^2.0.2",
@@ -70,7 +70,7 @@
7070
},
7171
"devDependencies": {
7272
"@biomejs/biome": "catalog:",
73-
"@tauri-apps/cli": "^2.8.4",
73+
"@tauri-apps/cli": "^2.9.0",
7474
"@types/convert-source-map": "^2.0.3",
7575
"@types/react": "catalog:",
7676
"@types/react-dom": "catalog:",
@@ -85,4 +85,4 @@
8585
"vite-plugin-babel": "^1.3.2",
8686
"vite-plugin-i18next-loader": "^3.1.3"
8787
}
88-
}
88+
}

0 commit comments

Comments
 (0)