Merge pull request #11 from coissac/claude/add-pmoplaylist-source-011CUq8bHCyjrEqGxCCXuvfh

Fix corrupted Cargo.lock (duplicate ndk-context entries)
This commit is contained in:
coissac
2025-11-05 20:40:29 +01:00
committed by GitHub
2 changed files with 17 additions and 58 deletions

68
Cargo.lock generated
View File

@@ -1559,12 +1559,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hound"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
[[package]]
name = "htmlescape"
version = "0.3.1"
@@ -1933,9 +1927,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "iri-string"
version = "0.7.8"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
dependencies = [
"memchr",
"serde",
@@ -2412,35 +2406,6 @@ dependencies = [
"jni-sys",
]
[[package]]
name = "netstat2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
dependencies = [
"bitflags 2.10.0",
"jni-sys",
"log",
"ndk-sys",
"num_enum",
"thiserror 1.0.69",
]
[[package]]
name = "ndk-context"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
version = "0.5.0+25.2.9519653"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
dependencies = [
"jni-sys",
]
[[package]]
name = "netlink-packet-core"
version = "0.7.0"
@@ -2887,7 +2852,6 @@ dependencies = [
"pmoflac",
"pmometadata",
"reqwest",
"rodio",
"soxr",
"tempfile",
"tokio",
@@ -3319,6 +3283,16 @@ dependencies = [
"zerocopy",
]
[[package]]
name = "prettyplease"
version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
"syn 2.0.108",
]
[[package]]
name = "proc-macro-crate"
version = "3.4.0"
@@ -3707,20 +3681,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "rodio"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb"
dependencies = [
"claxon",
"cpal",
"hound",
"lewton",
"symphonia",
"thiserror 1.0.69",
]
[[package]]
name = "rusqlite"
version = "0.37.0"
@@ -3799,9 +3759,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.34"
version = "0.23.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
dependencies = [
"once_cell",
"rustls-pki-types",

View File

@@ -27,7 +27,6 @@ use pmoaudio_ext::{FlacCacheSink, PlaylistSource};
use pmoaudiocache::Cache as AudioCache;
use pmocovers::Cache as CoverCache;
use pmoparadise::{RadioParadiseClient, RadioParadiseStreamSource};
use pmoplaylist::Manager as PlaylistManager;
use std::env;
use std::sync::Arc;
use tokio_util::sync::CancellationToken;
@@ -183,9 +182,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut playlist_source = PlaylistSource::new(reader, audio_cache.clone());
tracing::debug!("PlaylistSource created");
// Créer le sink audio avec volume à 80%
let audio_sink = AudioSink::with_volume(0.8);
tracing::debug!("AudioSink created with volume 0.8");
// Créer le sink audio
let audio_sink = AudioSink::new();
tracing::debug!("AudioSink created");
// Connecter playlist → audio
playlist_source.register(Box::new(audio_sink));