From f1224c6389cce4f04e365a509ad6dde5e1063b88 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Apr 2013 20:54:06 -0400 Subject: [PATCH] added oga, webma to audio streaming url --- MediaBrowser.Api/Playback/Progressive/AudioService.cs | 6 +++++- MediaBrowser.WebDashboard/Api/DashboardService.cs | 1 + MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index b64e1750c8..12aac0ccbd 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -14,14 +14,18 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Audio/{Id}/stream.aac", "GET")] [Route("/Audio/{Id}/stream.flac", "GET")] [Route("/Audio/{Id}/stream.ogg", "GET")] + [Route("/Audio/{Id}/stream.oga", "GET")] + [Route("/Audio/{Id}/stream.webma", "GET")] [Route("/Audio/{Id}/stream", "GET")] [Route("/Audio/{Id}/stream.mp3", "HEAD")] [Route("/Audio/{Id}/stream.wma", "HEAD")] [Route("/Audio/{Id}/stream.aac", "HEAD")] [Route("/Audio/{Id}/stream.flac", "HEAD")] [Route("/Audio/{Id}/stream.ogg", "HEAD")] + [Route("/Audio/{Id}/stream.oga", "HEAD")] + [Route("/Audio/{Id}/stream.webma", "HEAD")] [Route("/Audio/{Id}/stream", "HEAD")] - [ServiceStack.ServiceHost.Api(Description = "Gets an audio stream")] + [Api(Description = "Gets an audio stream")] public class GetAudioStream : StreamRequest { diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 33b85ef2a0..514c5ec94d 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -473,6 +473,7 @@ namespace MediaBrowser.WebDashboard.Api "mediaplayer.js", "metadataconfigurationpage.js", "metadataimagespage.js", + "movies.js", "moviesrecommended.js", "pluginspage.js", "pluginupdatespage.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 67db868ca8..fb76c6c221 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -189,6 +189,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest