diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 23 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/ConditionProcessor.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 15 | ||||
| -rw-r--r-- | MediaBrowser.Model/Themes/AppTheme.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.Model/Themes/AppThemeInfo.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Themes/ThemeImage.cs | 18 |
8 files changed, 13 insertions, 92 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 6d3894f02..77b894eb8 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -6,14 +6,13 @@ namespace MediaBrowser.Model.Configuration public int EncodingThreadCount { get; set; } public string TranscodingTempPath { get; set; } public double DownMixAudioBoost { get; set; } - public string H264Encoder { get; set; } public bool EnableDebugLogging { get; set; } public bool EnableThrottling { get; set; } public int ThrottleThresholdInSeconds { get; set; } + public string HardwareVideoDecoder { get; set; } public EncodingOptions() { - H264Encoder = "libx264"; DownMixAudioBoost = 2; EnableThrottling = true; ThrottleThresholdInSeconds = 120; diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 87b5e4fd7..5121fcd6f 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -45,12 +45,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableHttps { get; set; } /// <summary> - /// Gets or sets a value indicating whether [enable user specific user views]. - /// </summary> - /// <value><c>true</c> if [enable user specific user views]; otherwise, <c>false</c>.</value> - public bool EnableUserSpecificUserViews { get; set; } - - /// <summary> /// Gets or sets the value pointing to the file system where the ssl certiifcate is located.. /// </summary> /// <value>The value pointing to the file system where the ssl certiifcate is located..</value> @@ -103,7 +97,13 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value> public bool DisableStartupScan { get; set; } - + + /// <summary> + /// Gets or sets a value indicating whether [enable user views]. + /// </summary> + /// <value><c>true</c> if [enable user views]; otherwise, <c>false</c>.</value> + public bool EnableUserViews { get; set; } + /// <summary> /// Gets or sets a value indicating whether [enable library metadata sub folder]. /// </summary> @@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Configuration public bool EnableWindowsShortcuts { get; set; } public bool EnableVideoFrameByFrameAnalysis { get; set; } - + /// <summary> /// Initializes a new instance of the <see cref="ServerConfiguration" /> class. /// </summary> @@ -274,11 +274,6 @@ namespace MediaBrowser.Model.Configuration InsecureApps9 = new[] { - "Chromecast", - "iOS", - "Unknown app", - "iPad", - "iPhone", "Windows Phone" }; @@ -581,4 +576,4 @@ namespace MediaBrowser.Model.Configuration }; } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs index 793036f40..fd3df9c76 100644 --- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs +++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs @@ -28,7 +28,6 @@ namespace MediaBrowser.Model.Dlna // TODO: Implement return true; case ProfileConditionValue.Has64BitOffsets: - // TODO: Implement return true; case ProfileConditionValue.IsAnamorphic: return IsConditionSatisfied(condition, isAnamorphic); diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index a1c075563..57fc711c2 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -74,8 +74,6 @@ namespace MediaBrowser.Model.Dto public string ShareUrl { get; set; } public float? Metascore { get; set; } - - public bool? IsUnidentified { get; set; } public bool? HasDynamicCategories { get; set; } public int? AnimeSeriesIndex { get; set; } @@ -278,12 +276,6 @@ namespace MediaBrowser.Model.Dto public int? ProductionYear { get; set; } /// <summary> - /// Gets or sets the season count. - /// </summary> - /// <value>The season count.</value> - public int? SeasonCount { get; set; } - - /// <summary> /// Gets or sets the players supported by a game. /// </summary> /// <value>The players.</value> @@ -1113,12 +1105,6 @@ namespace MediaBrowser.Model.Dto public DateTime? StartDate { get; set; } /// <summary> - /// Gets or sets the original air date. - /// </summary> - /// <value>The original air date.</value> - public DateTime? OriginalAirDate { get; set; } - - /// <summary> /// Gets or sets the completion percentage. /// </summary> /// <value>The completion percentage.</value> diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 19c5c833a..2a86b96d6 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -12,10 +12,10 @@ <FileAlignment>512</FileAlignment> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <FodyPath>..\packages\Fody.1.19.1.0</FodyPath> - <ProductVersion>10.0.0</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <RestorePackages>true</RestorePackages> + <ReleaseVersion> + </ReleaseVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -26,7 +26,6 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <PlatformTarget>AnyCPU</PlatformTarget> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -35,7 +34,6 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Mono|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -44,15 +42,11 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup> <RunPostBuildEvent>Always</RunPostBuildEvent> </PropertyGroup> <PropertyGroup> - <SignAssembly>false</SignAssembly> - </PropertyGroup> - <PropertyGroup> <AssemblyOriginatorKeyFile>MediaBrowser.Model.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> @@ -408,9 +402,6 @@ <Compile Include="Sync\SyncTarget.cs" /> <Compile Include="System\LogFile.cs" /> <Compile Include="System\PublicSystemInfo.cs" /> - <Compile Include="Themes\AppTheme.cs" /> - <Compile Include="Themes\AppThemeInfo.cs" /> - <Compile Include="Themes\ThemeImage.cs" /> <Compile Include="Updates\CheckForUpdateResult.cs" /> <Compile Include="Updates\PackageTargetSystem.cs" /> <Compile Include="Updates\InstallationInfo.cs" /> @@ -465,7 +456,7 @@ <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="System.XML" /> + <Reference Include="System.Xml" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> diff --git a/MediaBrowser.Model/Themes/AppTheme.cs b/MediaBrowser.Model/Themes/AppTheme.cs deleted file mode 100644 index 527f1de72..000000000 --- a/MediaBrowser.Model/Themes/AppTheme.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; - -namespace MediaBrowser.Model.Themes -{ - public class AppTheme - { - public string AppName { get; set; } - - public string Name { get; set; } - - public Dictionary<string, string> Options { get; set; } - - public List<ThemeImage> Images { get; set; } - - public AppTheme() - { - Options = new Dictionary<string, string>(); - - Images = new List<ThemeImage>(); - } - } -} diff --git a/MediaBrowser.Model/Themes/AppThemeInfo.cs b/MediaBrowser.Model/Themes/AppThemeInfo.cs deleted file mode 100644 index bc359530a..000000000 --- a/MediaBrowser.Model/Themes/AppThemeInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MediaBrowser.Model.Themes -{ - public class AppThemeInfo - { - public string AppName { get; set; } - - public string Name { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Themes/ThemeImage.cs b/MediaBrowser.Model/Themes/ThemeImage.cs deleted file mode 100644 index 2fe0820ae..000000000 --- a/MediaBrowser.Model/Themes/ThemeImage.cs +++ /dev/null @@ -1,18 +0,0 @@ - -namespace MediaBrowser.Model.Themes -{ - public class ThemeImage - { - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the cache tag. - /// </summary> - /// <value>The cache tag.</value> - public string CacheTag { get; set; } - } -} |