aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-01 20:54:06 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-01 20:54:06 -0400
commitf1224c6389cce4f04e365a509ad6dde5e1063b88 (patch)
treed25a667cba68aa989a9f32d7d61f42ba7560f429
parent11d282388ac6522ff5846242ee72130f282cc285 (diff)
added oga, webma to audio streaming url
-rw-r--r--MediaBrowser.Api/Playback/Progressive/AudioService.cs6
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs1
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
3 files changed, 9 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
index b64e1750c..12aac0ccb 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 33b85ef2a..514c5ec94 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 67db868ca..fb76c6c22 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -189,6 +189,9 @@
<Content Include="dashboard-ui\scripts\itembynamedetailpage.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\scripts\movies.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\scripts\moviesrecommended.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>