mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-21 22:15:40 +00:00
Psychotoxical
34b4445c13
Two independent user-facing fixes rolled together. ── Lyrics: YouLyPlus provider (issue #172) ── Adds word-by-word synced (karaoke) lyrics as an alternative lyrics mode. Backed by the public lyricsplus aggregator (Apple Music / Spotify / Musixmatch / QQ Music) — no API keys on our side, subscription costs are borne by the backend operator. Five mirrors are tried on network failure. Settings → Lyrics now exposes a mode radio (Standard vs YouLyPlus) plus a static-only toggle. YouLyPlus misses silently fall back to the existing server + LRCLIB + Netease pipeline so obscure tracks still resolve. The drag-to-reorder source list is hidden in YouLyPlus mode since the external aggregator manages its own source priority. Rendering: per-word spans on each line, active word highlighted with accent-tinted glow. Subscribed imperatively via usePlayerStore.subscribe so 500 ms progress ticks do not re-render the whole lyrics block. The Fullscreen Player reuses the same pattern; the 5-line rail layout is unchanged. white-space: pre on .fs-lyric-word preserves the trailing spaces the API embeds in each syllabus token (flex context would otherwise collapse them). i18n: new keys in all 8 locales (de, en, fr, nl, nb, ru, es, zh). ── macOS mic-prompt suppression ── Ships a vendored cpal 0.15.3 at patches/cpal-0.15.3/ wired via [patch.crates-io]. The only change is in src/host/coreaudio/macos/mod.rs: audio_unit_from_device now unconditionally uses IOType::DefaultOutput for output streams instead of conditionally choosing HalOutput. AUHAL (HalOutput) is classified as input-capable by macOS TCC and triggers the microphone-permission dialog at first launch / after each update even for playback-only apps. Previous attempts (removing NSMicrophoneUsageDescription, setting com.apple.security.device.audio-input false in Entitlements.plist) did not suppress the prompt because TCC fires at AudioUnit instantiation, not at plist level. The upstream fix in cpal PR #1070 / cpal 0.17 only helps when the pinned device equals the system default; always-DefaultOutput covers all cases. Tradeoff: per-device output selection is a no-op on macOS — the stream always follows the system default. Settings.tsx surfaces this via audioOutputDeviceMacNotice (hides the CustomSelect on macOS) and skips audio_list_devices + device-watcher effects there. Matches the behaviour of Apple Music / Spotify on macOS. Also removes the now-obsolete com.apple.security.device.audio-input entitlement (sandbox is disabled anyway, so it was ignored). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
83 lines
2.9 KiB
Rust
83 lines
2.9 KiB
Rust
#![allow(dead_code)]
|
|
|
|
extern crate anyhow;
|
|
extern crate cpal;
|
|
|
|
use cpal::{
|
|
traits::{DeviceTrait, HostTrait, StreamTrait},
|
|
SizedSample,
|
|
};
|
|
use cpal::{FromSample, Sample};
|
|
|
|
#[cfg_attr(target_os = "android", ndk_glue::main(backtrace = "full"))]
|
|
fn main() {
|
|
let host = cpal::default_host();
|
|
|
|
let device = host
|
|
.default_output_device()
|
|
.expect("failed to find output device");
|
|
|
|
let config = device.default_output_config().unwrap();
|
|
|
|
match config.sample_format() {
|
|
cpal::SampleFormat::I8 => run::<i8>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()).unwrap(),
|
|
// cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::I32 => run::<i32>(&device, &config.into()).unwrap(),
|
|
// cpal::SampleFormat::I48 => run::<I48>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::I64 => run::<i64>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::U8 => run::<u8>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::U16 => run::<u16>(&device, &config.into()).unwrap(),
|
|
// cpal::SampleFormat::U24 => run::<U24>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::U32 => run::<u32>(&device, &config.into()).unwrap(),
|
|
// cpal::SampleFormat::U48 => run::<U48>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::U64 => run::<u64>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::F32 => run::<f32>(&device, &config.into()).unwrap(),
|
|
cpal::SampleFormat::F64 => run::<f64>(&device, &config.into()).unwrap(),
|
|
sample_format => panic!("Unsupported sample format '{sample_format}'"),
|
|
}
|
|
}
|
|
|
|
fn run<T>(device: &cpal::Device, config: &cpal::StreamConfig) -> Result<(), anyhow::Error>
|
|
where
|
|
T: SizedSample + FromSample<f32>,
|
|
{
|
|
let sample_rate = config.sample_rate.0 as f32;
|
|
let channels = config.channels as usize;
|
|
|
|
// Produce a sinusoid of maximum amplitude.
|
|
let mut sample_clock = 0f32;
|
|
let mut next_value = move || {
|
|
sample_clock = (sample_clock + 1.0) % sample_rate;
|
|
(sample_clock * 440.0 * 2.0 * std::f32::consts::PI / sample_rate).sin()
|
|
};
|
|
|
|
let err_fn = |err| eprintln!("an error occurred on stream: {}", err);
|
|
|
|
let stream = device.build_output_stream(
|
|
config,
|
|
move |data: &mut [T], _: &cpal::OutputCallbackInfo| {
|
|
write_data(data, channels, &mut next_value)
|
|
},
|
|
err_fn,
|
|
None,
|
|
)?;
|
|
stream.play()?;
|
|
|
|
std::thread::sleep(std::time::Duration::from_millis(1000));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn write_data<T>(output: &mut [T], channels: usize, next_sample: &mut dyn FnMut() -> f32)
|
|
where
|
|
T: Sample + FromSample<f32>,
|
|
{
|
|
for frame in output.chunks_mut(channels) {
|
|
let value: T = T::from_sample(next_sample());
|
|
for sample in frame.iter_mut() {
|
|
*sample = value;
|
|
}
|
|
}
|
|
}
|