eric/pmomusic
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Enable ICY metadata by default for all clients

Browse Source 
Changed stream_handler to always serve ICY-wrapped FLAC instead of
checking for the Icy-MetaData header. This ensures all clients
(including VLC) receive metadata updates.

Changes:
- Removed conditional ICY/pure FLAC logic
- Always use subscribe_icy() for all connections
- Added standard ICY headers (icy-genre, icy-pub)
- Updated documentation to reflect default ICY mode

This allows clients to see "Now Playing" information without needing
to send specific HTTP headers.
This commit is contained in:
Claude
2025-11-11 23:32:33 +00:00
parent 5c29f55942
commit 1f5884627c
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
pmoparadise/examples/stream_block.rs
View File

@@ -24,8 +24,8 @@
//! Then open in VLC: //! Then open in VLC:
//! vlc http://localhost:8080/test/stream //! vlc http://localhost:8080/test/stream
//! //!
//! VLC automatically requests ICY metadata (Now Playing info). //! The stream includes ICY metadata for "Now Playing" information.
//! To test metadata updates: //! To check current metadata:
//! curl http://localhost:8080/test/metadata //! curl http://localhost:8080/test/metadata
use axum::{ use axum::{
@@ -52,46 +52,25 @@ struct AppState {
/// Main HTTP handler for streaming /// Main HTTP handler for streaming
async fn stream_handler( async fn stream_handler(
State(state): State<Arc<AppState>>, State(state): State<Arc<AppState>>,
headers: HeaderMap, _headers: HeaderMap,
) -> Result<Response, StatusCode> { ) -> Result<Response, StatusCode> {
tracing::info!("New client connected"); tracing::info!("New client connected");
// Check if client wants ICY metadata (VLC with --icy-metadata flag) // Always use ICY mode for metadata support
let want_icy = headers tracing::info!("Serving FLAC stream with ICY metadata");
.get("Icy-MetaData") let icy_stream = state.stream_handle.subscribe_icy();
.and_then(|v| v.to_str().ok())
.map(|v| v == "1")
.unwrap_or(false);
if want_icy { // Build response with ICY headers
tracing::info!("Client requested ICY metadata mode"); Ok(Response::builder()
.status(StatusCode::OK)
// Subscribe to ICY stream .header("Content-Type", "audio/flac")
let icy_stream = state.stream_handle.subscribe_icy(); .header("icy-metaint", "16000")
.header("icy-name", "Radio Paradise Stream Test")
// Build response with ICY headers .header("icy-genre", "Eclectic")
Ok(Response::builder() .header("icy-pub", "1")
.status(StatusCode::OK) .header("Cache-Control", "no-cache, no-store")
.header("Content-Type", "audio/flac") .body(Body::from_stream(ReaderStream::new(icy_stream)))
.header("icy-metaint", "16000") .unwrap())
.header("icy-name", "Radio Paradise Stream Test")
.header("Cache-Control", "no-cache, no-store")
.body(Body::from_stream(ReaderStream::new(icy_stream)))
.unwrap())
} else {
tracing::info!("Client requested pure FLAC mode");
// Subscribe to pure FLAC stream
let flac_stream = state.stream_handle.subscribe_flac();
// Build response
Ok(Response::builder()
.status(StatusCode::OK)
.header("Content-Type", "audio/flac")
.header("Cache-Control", "no-cache, no-store")
.body(Body::from_stream(ReaderStream::new(flac_stream)))
.unwrap())
}
} }
/// Metadata endpoint (JSON) /// Metadata endpoint (JSON)
@@ -128,7 +107,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
eprintln!("After starting, open in VLC:"); eprintln!("After starting, open in VLC:");
eprintln!(" vlc http://localhost:8080/test/stream"); eprintln!(" vlc http://localhost:8080/test/stream");
eprintln!(); eprintln!();
eprintln!("VLC automatically requests ICY metadata (Now Playing)"); eprintln!("The stream includes ICY metadata for Now Playing info");
std::process::exit(1); std::process::exit(1);
} }
@@ -229,7 +208,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
tracing::info!("Open in VLC:"); tracing::info!("Open in VLC:");
tracing::info!(" vlc http://localhost:8080/test/stream"); tracing::info!(" vlc http://localhost:8080/test/stream");
tracing::info!(""); tracing::info!("");
tracing::info!("VLC automatically requests ICY metadata (Now Playing)"); tracing::info!("Stream includes ICY metadata for Now Playing info");
tracing::info!(""); tracing::info!("");
tracing::info!("Metadata endpoint:"); tracing::info!("Metadata endpoint:");
tracing::info!(" curl http://localhost:8080/test/metadata"); tracing::info!(" curl http://localhost:8080/test/metadata");