From cd759e215e2654194de1195c3a7327672a79653e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 15 Jun 2015 00:17:12 -0400
Subject: [PATCH] 3.0.5641.4
---
.../Playback/BaseStreamingService.cs | 5 +
.../MediaBrowser.LocalMetadata.csproj | 1 -
.../Savers/SeasonXmlSaver.cs | 95 -------------------
.../Configuration/ServerConfiguration.cs | 5 +-
.../MediaBrowser.WebDashboard.csproj | 3 -
SharedVersion.cs | 2 +-
6 files changed, 10 insertions(+), 101 deletions(-)
delete mode 100644 MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 71ef689a70..41d785a34d 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -772,6 +772,11 @@ namespace MediaBrowser.Api.Playback
? null
: audioStream.Channels;
+ if (inputChannels <= 0)
+ {
+ inputChannels = null;
+ }
+
var codec = outputAudioCodec ?? string.Empty;
if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index 57174d63ad..14cec36276 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -78,7 +78,6 @@
<Compile Include="Savers\MovieXmlSaver.cs" />
<Compile Include="Savers\PersonXmlSaver.cs" />
<Compile Include="Savers\PlaylistXmlSaver.cs" />
- <Compile Include="Savers\SeasonXmlSaver.cs" />
<Compile Include="Savers\SeriesXmlSaver.cs" />
<Compile Include="Savers\XmlSaverHelpers.cs" />
</ItemGroup>
diff --git a/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs
deleted file mode 100644
index 30f3e0ca10..0000000000
--- a/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Security;
-using System.Text;
-using System.Threading;
-
-namespace MediaBrowser.LocalMetadata.Savers
-{
- public class SeasonXmlSaver
- {
- public string Name
- {
- get
- {
- return XmlProviderUtils.Name;
- }
- }
-
- private readonly IServerConfigurationManager _config;
-
- public SeasonXmlSaver(IServerConfigurationManager config)
- {
- _config = config;
- }
-
- /// <summary>
- /// Determines whether [is enabled for] [the specified item].
- /// </summary>
- /// <param name="item">The item.</param>
- /// <param name="updateType">Type of the update.</param>
- /// <returns><c>true</c> if [is enabled for] [the specified item]; otherwise, <c>false</c>.</returns>
- public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
- {
- if (!item.SupportsLocalMetadata)
- {
- return false;
- }
-
- if (!(item is Season))
- {
- return false;
- }
-
- return updateType >= ItemUpdateType.MetadataDownload || (updateType >= ItemUpdateType.MetadataImport && File.Exists(GetSavePath(item)));
- }
-
- private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
- /// <summary>
- /// Saves the specified item.
- /// </summary>
- /// <param name="item">The item.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns>Task.</returns>
- public void Save(IHasMetadata item, CancellationToken cancellationToken)
- {
- var builder = new StringBuilder();
-
- builder.Append("<Item>");
-
- var season = (Season)item;
-
- if (season.IndexNumber.HasValue)
- {
- builder.Append("<SeasonNumber>" + SecurityElement.Escape(season.IndexNumber.Value.ToString(_usCulture)) + "</SeasonNumber>");
- }
-
- XmlSaverHelpers.AddCommonNodes((Season)item, builder);
-
- builder.Append("</Item>");
-
- var xmlFilePath = GetSavePath(item);
-
- XmlSaverHelpers.Save(builder, xmlFilePath, new List<string>
- {
- "SeasonNumber"
- }, _config);
- }
-
- /// <summary>
- /// Gets the save path.
- /// </summary>
- /// <param name="item">The item.</param>
- /// <returns>System.String.</returns>
- public string GetSavePath(IHasMetadata item)
- {
- return Path.Combine(item.Path, "season.xml");
- }
- }
-}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f1d6bbcae6..e7490b3fa2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -429,7 +429,10 @@ namespace MediaBrowser.Model.Configuration
}
},
- new MetadataOptions(0, 1280) {ItemType = "Season"}
+ new MetadataOptions(0, 1280)
+ {
+ ItemType = "Season"
+ }
};
}
}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 73d957145e..b987f2069e 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -318,9 +318,6 @@
<Content Include="dashboard-ui\thirdparty\cordova\android\iap.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\thirdparty\cordova\android\imagestore.js">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\thirdparty\cordova\android\immersive.js" />
<Content Include="dashboard-ui\thirdparty\cordova\chromecast.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 0478d2aae0..a8ebfc1ea1 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5641.3")]
+[assembly: AssemblyVersion("3.0.5641.4")]