alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-22 16:46:54 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

3.0.5324.37963

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-30 22:09:23 -04:00
parent 51e964dae3
commit a37a11c486
21 changed files with 196 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.FileOrganization;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Notifications;
using MediaBrowser.Model.Weather;
using System;
namespace MediaBrowser.Model.Configuration
{
@@ -10,18 +10,6 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public class ServerConfiguration : BaseApplicationConfiguration
{
/// <summary>
/// Gets or sets the zip code to use when displaying weather
/// </summary>
/// <value>The weather location.</value>
public string WeatherLocation { get; set; }
/// <summary>
/// Gets or sets the weather unit to use when displaying weather
/// </summary>
/// <value>The weather unit.</value>
public WeatherUnits WeatherUnit { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [enable u pn p].
/// </summary>
@@ -191,9 +179,6 @@ namespace MediaBrowser.Model.Configuration
public SubtitleOptions SubtitleOptions { get; set; }
[Obsolete]
public string[] ManualLoginClients { get; set; }
public ChannelOptions ChannelOptions { get; set; }
public ChapterOptions ChapterOptions { get; set; }
@@ -237,8 +222,6 @@ namespace MediaBrowser.Model.Configuration
SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
SortRemoveWords = new[] { "the", "a", "an" };
ManualLoginClients = new string[] { };
SeasonZeroDisplayName = "Specials";
EnableRealtimeMonitor = true;
@@ -304,7 +287,6 @@ namespace MediaBrowser.Model.Configuration
};
SubtitleOptions = new SubtitleOptions();
TvFileOrganizationOptions = new TvFileOrganizationOptions();
}
}
}

38
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
View File

@@ -92,7 +92,7 @@ namespace MediaBrowser.Model.Dlna
return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
}
public string BuildVideoHeader(string container,
public List<string> BuildVideoHeader(string container,
string videoCodec,
string audioCodec,
int? width,
@@ -149,30 +149,42 @@ namespace MediaBrowser.Model.Dlna
timestamp,
isAnamorphic);
string orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
List<string> orgPnValues = new List<string>();
if (string.IsNullOrEmpty(orgPn))
if (mediaProfile != null && !string.IsNullOrEmpty(mediaProfile.OrgPn))
{
orgPnValues.Add(mediaProfile.OrgPn);
}
else
{
foreach (string s in GetVideoOrgPnValue(container, videoCodec, audioCodec, width, height, timestamp))
{
orgPn = s;
orgPnValues.Add(s);
break;
}
}
if (string.IsNullOrEmpty(orgPn))
List<string> contentFeatureList = new List<string>();
foreach (string orgPn in orgPnValues)
{
// TODO: Support multiple values and return multiple headers?
foreach (string s in (orgPn ?? string.Empty).Split(','))
{
orgPn = s;
break;
}
string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
contentFeatureList.Add(value);
}
string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
if (orgPnValues.Count == 0)
{
string contentFeatures = string.Empty;
return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
contentFeatureList.Add(value);
}
return contentFeatureList;
}
private string GetImageOrgPnValue(string container, int? width, int? height)

17
MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs Normal file
View File

@@ -0,0 +1,17 @@

namespace MediaBrowser.Model.FileOrganization
{
public class AutoOrganizeOptions
{
/// <summary>
/// Gets or sets the tv options.
/// </summary>
/// <value>The tv options.</value>
public TvFileOrganizationOptions TvOptions { get; set; }
public AutoOrganizeOptions()
{
TvOptions = new TvFileOrganizationOptions();
}
}
}

2
MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs → MediaBrowser.Model/FileOrganization/TvFileOrganizationOptions.cs
View File

@@ -1,5 +1,5 @@

namespace MediaBrowser.Model.Configuration
namespace MediaBrowser.Model.FileOrganization
{
public class TvFileOrganizationOptions
{

2
MediaBrowser.Model/Configuration/LiveTvOptions.cs → MediaBrowser.Model/LiveTv/LiveTvOptions.cs
View File

@@ -1,4 +1,4 @@
namespace MediaBrowser.Model.Configuration
namespace MediaBrowser.Model.LiveTv
{
public class LiveTvOptions
{

5
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -79,13 +79,14 @@
<Compile Include="Configuration\ChapterOptions.cs" />
<Compile Include="Configuration\XbmcMetadataOptions.cs" />
<Compile Include="Configuration\SubtitlePlaybackMode.cs" />
<Compile Include="Configuration\TvFileOrganizationOptions.cs" />
<Compile Include="FileOrganization\AutoOrganizeOptions.cs" />
<Compile Include="FileOrganization\TvFileOrganizationOptions.cs" />
<Compile Include="Configuration\BaseApplicationConfiguration.cs" />
<Compile Include="Configuration\DlnaOptions.cs" />
<Compile Include="Configuration\EncodingQuality.cs" />
<Compile Include="Configuration\ImageOption.cs" />
<Compile Include="Configuration\ImageSavingConvention.cs" />
<Compile Include="Configuration\LiveTvOptions.cs" />
<Compile Include="LiveTv\LiveTvOptions.cs" />
<Compile Include="Configuration\MetadataPlugin.cs" />
<Compile Include="Configuration\MetadataOptions.cs" />
<Compile Include="Configuration\MetadataPluginSummary.cs" />