Eric Coissac
306e691c61
This commit refactors the WebRenderer to use a server-side streaming architecture with OGG-FLAC sink instead of the previous WebSocket-based approach. The changes include: - Replaced WebSocket communication with HTTP streaming using DirectOggFlacSink - Implemented a new pipeline architecture with dedicated handlers for UPnP commands - Added new modules for registration, registry, and streaming - Updated the renderer to work with a pipeline control system - Removed old WebSocket session management - Added support for HTTP streaming with gapless playback - Updated dependencies and features for the new architecture The WebRenderer now acts as a MediaRenderer UPnP device that serves audio streams via HTTP endpoints, with commands relayed to the audio pipeline through a new control system.
71 lines
2.1 KiB
Rust
71 lines
2.1 KiB
Rust
//! Intégration avec pmoserver — enregistrement des routes WebRenderer
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
use std::sync::Arc;
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
use async_trait::async_trait;
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
use axum::{Router, routing::{delete, get, post}};
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
use pmocontrol::ControlPoint;
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
use crate::error::WebRendererError;
|
|
#[cfg(feature = "pmoserver")]
|
|
use crate::register::{register_handler, unregister_handler};
|
|
#[cfg(feature = "pmoserver")]
|
|
use crate::registry::RendererRegistry;
|
|
#[cfg(feature = "pmoserver")]
|
|
use crate::stream::stream_handler;
|
|
|
|
/// Trait pour étendre pmoserver::Server avec les routes WebRenderer
|
|
#[cfg(feature = "pmoserver")]
|
|
#[async_trait]
|
|
pub trait WebRendererExt {
|
|
async fn register_web_renderer(
|
|
&mut self,
|
|
control_point: Arc<ControlPoint>,
|
|
) -> Result<(), WebRendererError>;
|
|
}
|
|
|
|
#[cfg(feature = "pmoserver")]
|
|
#[async_trait]
|
|
impl WebRendererExt for pmoserver::Server {
|
|
async fn register_web_renderer(
|
|
&mut self,
|
|
control_point: Arc<ControlPoint>,
|
|
) -> Result<(), WebRendererError> {
|
|
let registry = Arc::new(RendererRegistry::new(control_point));
|
|
|
|
// POST /api/webrenderer/register
|
|
self.add_post_handler_with_state(
|
|
"/api/webrenderer/register",
|
|
register_handler,
|
|
registry.clone(),
|
|
)
|
|
.await;
|
|
|
|
// GET /api/webrenderer/{id}/stream + DELETE /api/webrenderer/{id}
|
|
let dynamic_router = Router::new()
|
|
.route("/{id}/stream", get(stream_handler))
|
|
.route("/{id}", delete(unregister_handler))
|
|
.with_state(registry.clone());
|
|
self.add_router("/api/webrenderer", dynamic_router).await;
|
|
|
|
tracing::info!("WebRenderer server-side streaming endpoints registered");
|
|
tracing::info!(" POST /api/webrenderer/register");
|
|
tracing::info!(" GET /api/webrenderer/{{id}}/stream");
|
|
tracing::info!(" DELETE /api/webrenderer/{{id}}");
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(not(feature = "pmoserver"))]
|
|
pub trait WebRendererExt {}
|
|
|
|
#[cfg(not(feature = "pmoserver"))]
|
|
impl WebRendererExt for () {}
|