mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35:41 +00:00
41e75663f1
Moves all audio playback code (Symphonia decode, rodio output, HTTP
streaming, gapless, previews, and the seven stream/ source-type
submodules from the prior split) out of the top crate into a new
psysonic-audio crate.
crates/psysonic-audio/ new lib crate, depends on
psysonic-core + psysonic-analysis
src/{engine,helpers,decode,…}.rs flattened layout (no more
extra audio/ namespace level)
src/stream/ seven submodules from M0
src/lib.rs re-exports macros from
psysonic-core and the public
API surface
The audio↔analysis edges identified in the dep survey are now real
crate deps (audio depends on analysis directly: AnalysisCache reads,
recommended_gain_for_target, submit_analysis_cpu_seed). Only the
analysis→audio back-edge goes through the PlaybackQueryHandle port
registered in M2.
Cross-crate ref migrations applied via batch sed:
crate::audio::* → crate::* (intra-crate)
crate::analysis_cache::* → psysonic_analysis::analysis_cache::*
crate::submit_analysis_cpu_seed → psysonic_analysis::analysis_runtime::*
crate::subsonic_wire_user_agent → psysonic_core::user_agent::*
Top crate keeps `crate::audio::*` paths working via
`pub use psysonic_audio as audio;` — lib_commands/cli callers untouched.
`stop_audio_engine` (mac process-exit cleanup) moved into the audio
crate as `pub fn stop_audio_engine` since it reaches AudioEngine
internals; tray.rs now re-exports the moved fn.
Two small visibility promotions in engine.rs:
pub(crate) fn analysis_track_id_is_current_playback → pub
pub(crate) fn ranged_loudness_backfill_should_defer → pub
Behaviour preserving. Cargo check + clippy --workspace clean.
99 lines
3.8 KiB
Rust
99 lines
3.8 KiB
Rust
//! Tauri commands for output-device listing + selection. Pulled out of
|
|
//! `commands.rs` so playback / radio / EQ aren't entangled with the device
|
|
//! enumeration + reopen path.
|
|
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::Ordering;
|
|
use std::time::Duration;
|
|
|
|
use tauri::{Emitter, State};
|
|
|
|
use super::dev_io::{
|
|
enumerate_output_device_names, output_devices_logically_same,
|
|
output_enumeration_includes_pinned, with_suppressed_alsa_stderr,
|
|
};
|
|
use super::engine::AudioEngine;
|
|
|
|
/// When the saved `selected_device` no longer literally matches any listed
|
|
/// physical sink (e.g. suffix drift), rewrite `selected_device` to the listed form.
|
|
#[tauri::command]
|
|
pub fn audio_canonicalize_selected_device(state: State<'_, AudioEngine>) -> Option<String> {
|
|
let pinned = state.selected_device.lock().unwrap().clone()?;
|
|
if pinned.is_empty() {
|
|
return None;
|
|
}
|
|
let list = enumerate_output_device_names();
|
|
if list.iter().any(|d| d == &pinned) {
|
|
return None;
|
|
}
|
|
let canon = list
|
|
.iter()
|
|
.find(|d| output_devices_logically_same(d, &pinned))?
|
|
.clone();
|
|
*state.selected_device.lock().unwrap() = Some(canon.clone());
|
|
Some(canon)
|
|
}
|
|
|
|
/// Same device list as [`audio_list_devices`] without the Tauri `State` wrapper (CLI / single-instance).
|
|
pub fn audio_list_devices_for_engine(engine: &AudioEngine) -> Vec<String> {
|
|
let mut list = enumerate_output_device_names();
|
|
if let Some(ref name) = *engine.selected_device.lock().unwrap() {
|
|
if !name.is_empty() && !output_enumeration_includes_pinned(&list, name) {
|
|
list.push(name.clone());
|
|
}
|
|
}
|
|
list
|
|
}
|
|
|
|
/// Returns the names of all available audio output devices on the current host.
|
|
/// On Linux, ALSA probes unavailable backends (JACK, OSS, dmix) and prints errors to
|
|
/// stderr. We suppress fd 2 for the duration of enumeration to keep the terminal clean.
|
|
///
|
|
/// The user-pinned device name is appended when cpal omits it (e.g. HDMI busy while
|
|
/// streaming) so the Settings dropdown still matches `audioOutputDevice`.
|
|
#[tauri::command]
|
|
pub fn audio_list_devices(state: State<'_, AudioEngine>) -> Vec<String> {
|
|
audio_list_devices_for_engine(&state)
|
|
}
|
|
|
|
/// Device id string for the host default output (matches an entry from `audio_list_devices` when present).
|
|
#[tauri::command]
|
|
pub fn audio_default_output_device_name() -> Option<String> {
|
|
use rodio::cpal::traits::{DeviceTrait, HostTrait};
|
|
with_suppressed_alsa_stderr(|| {
|
|
let host = rodio::cpal::default_host();
|
|
host.default_output_device()
|
|
.and_then(|d| d.description().ok().map(|desc| desc.name().to_string()))
|
|
})
|
|
}
|
|
|
|
/// Switch the audio output device. `device_name = null` → follow system default.
|
|
/// Reopens the stream immediately; frontend must restart playback via audio:device-changed.
|
|
#[tauri::command]
|
|
pub async fn audio_set_device(
|
|
device_name: Option<String>,
|
|
state: State<'_, AudioEngine>,
|
|
app: tauri::AppHandle,
|
|
) -> Result<(), String> {
|
|
*state.selected_device.lock().unwrap() = device_name.clone();
|
|
|
|
let rate = state.stream_sample_rate.load(Ordering::Relaxed);
|
|
let (reply_tx, reply_rx) = std::sync::mpsc::sync_channel::<Arc<rodio::MixerDeviceSink>>(0);
|
|
state.stream_reopen_tx
|
|
.send((rate, false, device_name, reply_tx))
|
|
.map_err(|e| e.to_string())?;
|
|
|
|
let new_handle = tauri::async_runtime::spawn_blocking(move || {
|
|
reply_rx.recv_timeout(Duration::from_secs(5)).ok()
|
|
}).await.unwrap_or(None).ok_or("device open timed out")?;
|
|
|
|
*state.stream_handle.lock().unwrap() = new_handle;
|
|
|
|
// Drop active sinks — they were bound to the old stream.
|
|
if let Some(s) = state.current.lock().unwrap().sink.take() { s.stop(); }
|
|
if let Some(s) = state.fading_out_sink.lock().unwrap().take() { s.stop(); }
|
|
|
|
app.emit("audio:device-changed", ()).map_err(|e| e.to_string())?;
|
|
Ok(())
|
|
}
|