aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ChapterOptions.cs3
-rw-r--r--MediaBrowser.Model/Configuration/EncodingOptions.cs4
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs19
-rw-r--r--MediaBrowser.Model/Configuration/UserConfiguration.cs2
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs9
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs6
-rw-r--r--MediaBrowser.Model/Dto/IItemDto.cs6
-rw-r--r--MediaBrowser.Model/Dto/UserDto.cs6
-rw-r--r--MediaBrowser.Model/Entities/CollectionType.cs20
-rw-r--r--MediaBrowser.Model/Entities/MetadataProviders.cs2
-rw-r--r--MediaBrowser.Model/Library/UserViewQuery.cs6
-rw-r--r--MediaBrowser.Model/LiveTv/ChannelInfoDto.cs6
-rw-r--r--MediaBrowser.Model/Querying/ItemFields.cs5
-rw-r--r--MediaBrowser.Model/Session/GeneralCommandType.cs4
14 files changed, 33 insertions, 65 deletions
diff --git a/MediaBrowser.Model/Configuration/ChapterOptions.cs b/MediaBrowser.Model/Configuration/ChapterOptions.cs
index fd3930704..f9ff6b4f9 100644
--- a/MediaBrowser.Model/Configuration/ChapterOptions.cs
+++ b/MediaBrowser.Model/Configuration/ChapterOptions.cs
@@ -13,11 +13,10 @@
public string[] DisabledFetchers { get; set; }
public bool ExtractDuringLibraryScan { get; set; }
-
+
public ChapterOptions()
{
DownloadMovieChapters = true;
- ExtractDuringLibraryScan = true;
DisabledFetchers = new string[] { };
FetcherOrder = new string[] { };
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 77b894eb8..77aa9e683 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -8,14 +8,14 @@ namespace MediaBrowser.Model.Configuration
public double DownMixAudioBoost { get; set; }
public bool EnableDebugLogging { get; set; }
public bool EnableThrottling { get; set; }
- public int ThrottleThresholdInSeconds { get; set; }
+ public int ThrottleThresholdSeconds { get; set; }
public string HardwareVideoDecoder { get; set; }
public EncodingOptions()
{
DownMixAudioBoost = 2;
EnableThrottling = true;
- ThrottleThresholdInSeconds = 120;
+ ThrottleThresholdSeconds = 100;
EncodingThreadCount = -1;
}
}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 7208ccb1d..30a634387 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -63,6 +63,12 @@ namespace MediaBrowser.Model.Configuration
public bool IsPortAuthorized { get; set; }
/// <summary>
+ /// Gets or sets a value indicating whether [enable high quality image scaling].
+ /// </summary>
+ /// <value><c>true</c> if [enable high quality image scaling]; otherwise, <c>false</c>.</value>
+ public bool EnableHighQualityImageScaling { get; set; }
+
+ /// <summary>
/// Gets or sets the item by name path.
/// </summary>
/// <value>The item by name path.</value>
@@ -93,12 +99,6 @@ namespace MediaBrowser.Model.Configuration
public bool EnableLocalizedGuids { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [disable startup scan].
- /// </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>
@@ -219,7 +219,6 @@ namespace MediaBrowser.Model.Configuration
public int SharingExpirationDays { get; set; }
- public bool DisableXmlSavers { get; set; }
public bool EnableWindowsShortcuts { get; set; }
public bool EnableVideoFrameByFrameAnalysis { get; set; }
@@ -228,12 +227,16 @@ namespace MediaBrowser.Model.Configuration
public string[] Migrations { get; set; }
+ public int MigrationVersion { get; set; }
+ public bool EnableImagePreDownloading { get; set; }
+ public bool EnableSharedCollectionViewImage { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary>
public ServerConfiguration()
{
- Migrations = new string[] {};
+ Migrations = new string[] { };
ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096;
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 349780958..278d22cfb 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -63,9 +63,9 @@ namespace MediaBrowser.Model.Configuration
LatestItemsExcludes = new string[] { };
OrderedViews = new string[] { };
DisplayChannelsWithinViews = new string[] { };
+ DisplayChannelsInline = true;
PlainFolderViews = new string[] { };
- DisplayCollectionsView = true;
IncludeTrailersInSuggestions = true;
EnableCinemaMode = true;
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 1834e24fe..d451fe8a0 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -525,6 +525,15 @@ namespace MediaBrowser.Model.Dlna
bool isEligibleForDirectPlay,
bool isEligibleForDirectStream)
{
+ if (videoStream == null)
+ {
+ _logger.Info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}",
+ profile.Name ?? "Unknown Profile",
+ mediaSource.Path ?? "Unknown path");
+
+ return null;
+ }
+
// See if it can be direct played
DirectPlayProfile directPlay = null;
foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index ff67db1b6..91beba726 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -531,12 +531,6 @@ namespace MediaBrowser.Model.Dto
public double? PrimaryImageAspectRatio { get; set; }
/// <summary>
- /// Gets or sets the primary image aspect ratio, before image enhancements.
- /// </summary>
- /// <value>The original primary image aspect ratio.</value>
- public double? OriginalPrimaryImageAspectRatio { get; set; }
-
- /// <summary>
/// Gets or sets the artists.
/// </summary>
/// <value>The artists.</value>
diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs
index af46d29b9..3e7d1c608 100644
--- a/MediaBrowser.Model/Dto/IItemDto.cs
+++ b/MediaBrowser.Model/Dto/IItemDto.cs
@@ -11,11 +11,5 @@ namespace MediaBrowser.Model.Dto
/// </summary>
/// <value>The primary image aspect ratio.</value>
double? PrimaryImageAspectRatio { get; set; }
-
- /// <summary>
- /// Gets or sets the original primary image aspect ratio.
- /// </summary>
- /// <value>The original primary image aspect ratio.</value>
- double? OriginalPrimaryImageAspectRatio { get; set; }
}
}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index fc5d2f134..f133f3343 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -123,12 +123,6 @@ namespace MediaBrowser.Model.Dto
public double? PrimaryImageAspectRatio { get; set; }
/// <summary>
- /// Gets or sets the original primary image aspect ratio.
- /// </summary>
- /// <value>The original primary image aspect ratio.</value>
- public double? OriginalPrimaryImageAspectRatio { get; set; }
-
- /// <summary>
/// Gets a value indicating whether this instance has primary image.
/// </summary>
/// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index a259f4c07..dfd8f309c 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -47,25 +47,5 @@
public const string MovieFavorites = "MovieFavorites";
public const string MovieGenres = "MovieGenres";
public const string MovieGenre = "MovieGenre";
-
- public const string LatestGames = "LatestGames";
- public const string RecentlyPlayedGames = "RecentlyPlayedGames";
- public const string GameSystems = "GameSystems";
- public const string GameGenres = "GameGenres";
- public const string GameFavorites = "GameFavorites";
- public const string GameGenre = "GameGenre";
-
- public const string MusicArtists = "MusicArtists";
- public const string MusicAlbumArtists = "MusicAlbumArtists";
- public const string MusicAlbums = "MusicAlbums";
- public const string MusicGenres = "MusicGenres";
- public const string MusicGenre = "MusicGenre";
- public const string MusicLatest = "MusicLatest";
- public const string MusicPlaylists = "MusicPlaylists";
- public const string MusicSongs = "MusicSongs";
- public const string MusicFavorites = "MusicFavorites";
- public const string MusicFavoriteArtists = "MusicFavoriteArtists";
- public const string MusicFavoriteAlbums = "MusicFavoriteAlbums";
- public const string MusicFavoriteSongs = "MusicFavoriteSongs";
}
}
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index 7644b150a..f5ab0c1d4 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -36,8 +36,6 @@ namespace MediaBrowser.Model.Entities
MusicBrainzArtist = 10,
MusicBrainzReleaseGroup = 11,
Zap2It = 12,
- NesBox = 13,
- NesBoxRom = 14,
TvRage = 15,
AudioDbArtist = 16,
AudioDbAlbum = 17,
diff --git a/MediaBrowser.Model/Library/UserViewQuery.cs b/MediaBrowser.Model/Library/UserViewQuery.cs
index cceb22c84..f2b78d303 100644
--- a/MediaBrowser.Model/Library/UserViewQuery.cs
+++ b/MediaBrowser.Model/Library/UserViewQuery.cs
@@ -15,6 +15,12 @@ namespace MediaBrowser.Model.Library
/// <value><c>true</c> if [include external content]; otherwise, <c>false</c>.</value>
public bool IncludeExternalContent { get; set; }
+ /// <summary>
+ /// Gets or sets a value indicating whether [include hidden].
+ /// </summary>
+ /// <value><c>true</c> if [include hidden]; otherwise, <c>false</c>.</value>
+ public bool IncludeHidden { get; set; }
+
public UserViewQuery()
{
IncludeExternalContent = true;
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index fd901f29e..91493def8 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -106,12 +106,6 @@ namespace MediaBrowser.Model.LiveTv
public double? PrimaryImageAspectRatio { get; set; }
/// <summary>
- /// Gets or sets the primary image aspect ratio, before image enhancements.
- /// </summary>
- /// <value>The original primary image aspect ratio.</value>
- public double? OriginalPrimaryImageAspectRatio { get; set; }
-
- /// <summary>
/// Gets a value indicating whether this instance has primary image.
/// </summary>
/// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index eea561f72..e8b1414b7 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -166,11 +166,6 @@
PrimaryImageAspectRatio,
/// <summary>
- /// The original primary image aspect ratio
- /// </summary>
- OriginalPrimaryImageAspectRatio,
-
- /// <summary>
/// The revenue
/// </summary>
Revenue,
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index 79220f066..64b61678e 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -34,6 +34,8 @@
DisplayContent = 26,
GoToSearch = 27,
DisplayMessage = 28,
- SetRepeatMode = 29
+ SetRepeatMode = 29,
+ ChannelUp = 30,
+ ChannelDown = 31
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-05 23:38:23 +0000