diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
index 4d21e009f..6fae65ffc 100644
--- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
@@ -4,11 +4,9 @@ using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dlna;
using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.IO;
using ServiceStack;
using System.Collections.Generic;
@@ -18,25 +16,14 @@ namespace MediaBrowser.Api.Playback.Progressive
///
/// Class GetAudioStream
///
- [Route("/Audio/{Id}/stream.mp3", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.wma", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.aac", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.flac", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.ogg", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.oga", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.webm", "GET", Summary = "Gets an audio stream")]
+ [Route("/Audio/{Id}/stream.{Container}", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream", "GET", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.mp3", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.wma", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.aac", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.flac", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.ogg", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.oga", "HEAD", Summary = "Gets an audio stream")]
- [Route("/Audio/{Id}/stream.webm", "HEAD", Summary = "Gets an audio stream")]
+ [Route("/Audio/{Id}/stream.{Container}", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream", "HEAD", Summary = "Gets an audio stream")]
public class GetAudioStream : StreamRequest
{
-
+ [ApiMember(Name = "Container", Description = "Container", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Container { get; set; }
}
///
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index ca4947426..682dadacf 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -4,11 +4,9 @@ using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dlna;
using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.IO;
using ServiceStack;
using System;
@@ -29,6 +27,7 @@ namespace MediaBrowser.Api.Playback.Progressive
[Route("/Videos/{Id}/stream.m4v", "GET")]
[Route("/Videos/{Id}/stream.mkv", "GET")]
[Route("/Videos/{Id}/stream.mpeg", "GET")]
+ [Route("/Videos/{Id}/stream.mpg", "GET")]
[Route("/Videos/{Id}/stream.avi", "GET")]
[Route("/Videos/{Id}/stream.m2ts", "GET")]
[Route("/Videos/{Id}/stream.3gp", "GET")]
@@ -44,6 +43,7 @@ namespace MediaBrowser.Api.Playback.Progressive
[Route("/Videos/{Id}/stream.m4v", "HEAD")]
[Route("/Videos/{Id}/stream.mkv", "HEAD")]
[Route("/Videos/{Id}/stream.mpeg", "HEAD")]
+ [Route("/Videos/{Id}/stream.mpg", "HEAD")]
[Route("/Videos/{Id}/stream.avi", "HEAD")]
[Route("/Videos/{Id}/stream.3gp", "HEAD")]
[Route("/Videos/{Id}/stream.wmv", "HEAD")]
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index e6f50635b..5f88e0e58 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -9,7 +9,6 @@ using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
-using MediaBrowser.Model.Querying;
namespace MediaBrowser.Controller.Library
{
@@ -337,10 +336,10 @@ namespace MediaBrowser.Controller.Library
/// Gets the named folder.
///
/// The name.
- /// The type.
+ /// Type of the view.
/// Name of the sort.
/// The cancellation token.
/// Task{Folder}.
- Task GetNamedView(string name, string type, string sortName, CancellationToken cancellationToken);
+ Task GetNamedView(string name, string viewType, string sortName, CancellationToken cancellationToken);
}
}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index aaebd1c34..e9df5e52c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -542,8 +542,7 @@ namespace MediaBrowser.Server.Implementations.Channels
var totalCount = results.Length;
IEnumerable> items = results
- .SelectMany(i => i.Item2.Items.Select(m => new Tuple(i.Item1, m)))
- .OrderBy(i => i.Item2.Name);
+ .SelectMany(i => i.Item2.Items.Select(m => new Tuple(i.Item1, m)));
if (query.ContentTypes.Length > 0)
{
@@ -994,10 +993,9 @@ namespace MediaBrowser.Server.Implementations.Channels
item.ProductionYear = info.ProductionYear;
item.ProviderIds = info.ProviderIds;
- if (info.DateCreated.HasValue)
- {
- item.DateCreated = info.DateCreated.Value;
- }
+ item.DateCreated = info.DateCreated.HasValue ?
+ info.DateCreated.Value :
+ DateTime.UtcNow;
}
var channelItem = (IChannelItem)item;
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 4dad71465..c6a632fec 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Progress;
using MediaBrowser.Common.ScheduledTasks;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 18c2d8582..201648de8 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -52,6 +52,9 @@
False
..\packages\Mono.Nat.1.2.13.0\lib\net40\Mono.Nat.dll
+
+ ..\ThirdParty\Nowin\Nowin.dll
+
..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 1a2bd8ef1..5cd65b338 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -57,8 +57,9 @@
..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll
-
- ..\packages\WebMarkupMin.Core.0.8.18\lib\net40\WebMarkupMin.Core.dll
+
+ False
+ ..\packages\WebMarkupMin.Core.0.8.21\lib\net40\WebMarkupMin.Core.dll
@@ -2138,6 +2139,9 @@
PreserveNewest
+
+ Designer
+
diff --git a/MediaBrowser.WebDashboard/app.config b/MediaBrowser.WebDashboard/app.config
index 8c2c664cd..544cdd7ba 100644
--- a/MediaBrowser.WebDashboard/app.config
+++ b/MediaBrowser.WebDashboard/app.config
@@ -5,7 +5,9 @@
-
+
+
+
@@ -26,5 +28,4 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index b867f7a92..1791f1c28 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file