From d091fe0e6e5923bd0ce597c83d9a76650e3dc7f9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 8 Oct 2014 19:31:44 -0400 Subject: [PATCH] extract classes --- .../MediaBrowser.Model.Portable.csproj | 74 ++++++++++++- MediaBrowser.Model.Portable/packages.config | 2 +- .../MediaBrowser.Model.net35.csproj | 75 +++++++++++++ .../ApiClient/ConnectionMode.cs | 8 ++ .../ApiClient/ConnectionResult.cs | 13 --- .../ApiClient/ConnectionState.cs | 9 ++ .../ApiClient/GeneralCommandEventArgs.cs | 3 +- MediaBrowser.Model/ApiClient/IServerEvents.cs | 16 ++- MediaBrowser.Model/ApiClient/ServerInfo.cs | 11 -- .../ApiClient/SessionUpdatesEventArgs.cs | 5 +- MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs | 13 +++ .../Channels/AllChannelMediaQuery.cs | 61 +++++++++++ .../Channels/ChannelFeatures.cs | 11 -- .../Channels/ChannelFolderType.cs | 11 ++ .../Channels/ChannelItemSortField.cs | 13 +++ .../Channels/ChannelMediaType.cs | 9 -- MediaBrowser.Model/Channels/ChannelQuery.cs | 62 +---------- .../Chapters/ChapterProviderInfo.cs | 8 ++ .../Chapters/RemoteChapterInfo.cs | 6 -- .../Configuration/CinemaModeConfiguration.cs | 1 + .../Configuration/PeopleMetadataOptions.cs | 19 ++++ .../Configuration/ServerConfiguration.cs | 17 --- MediaBrowser.Model/Dlna/EncodingContext.cs | 8 ++ .../Dlna/ResolutionConfiguration.cs | 14 +++ .../Dlna/ResolutionNormalizer.cs | 18 ---- MediaBrowser.Model/Dlna/ResolutionOptions.cs | 8 ++ MediaBrowser.Model/Dlna/StreamInfo.cs | 29 ----- .../Dlna/SubtitleDeliveryMethod.cs | 22 ++++ MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs | 11 ++ MediaBrowser.Model/Dlna/TranscodingProfile.cs | 6 -- MediaBrowser.Model/Dto/MediaSourceInfo.cs | 7 -- MediaBrowser.Model/Dto/MediaSourceType.cs | 9 ++ MediaBrowser.Model/Dto/StreamOptions.cs | 98 ----------------- MediaBrowser.Model/Dto/VideoStreamOptions.cs | 102 ++++++++++++++++++ MediaBrowser.Model/Entities/ExtraType.cs | 8 -- .../Entities/MBRegistrationRecord.cs | 11 -- MediaBrowser.Model/Entities/SupporterInfo.cs | 15 +++ MediaBrowser.Model/Entities/TrailerType.cs | 10 ++ MediaBrowser.Model/Extensions/BoolHelper.cs | 16 +++ MediaBrowser.Model/Extensions/DoubleHelper.cs | 28 ----- MediaBrowser.Model/Extensions/FloatHelper.cs | 18 ++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 24 +++++ MediaBrowser.Model/MediaInfo/Container.cs | 7 -- MediaBrowser.Model/MediaInfo/MediaProtocol.cs | 9 ++ .../Providers/RemoteSubtitleInfo.cs | 6 -- .../Providers/SubtitleProviderInfo.cs | 8 ++ MediaBrowser.Model/Session/PlayerStateInfo.cs | 15 --- MediaBrowser.Model/Session/TranscodingInfo.cs | 17 +++ MediaBrowser.Model/Sync/SyncJobRequest.cs | 5 - MediaBrowser.Model/Sync/SyncLimitType.cs | 7 ++ MediaBrowser.Model/System/PublicSystemInfo.cs | 35 ++++++ MediaBrowser.Model/System/SystemInfo.cs | 33 ------ .../Intros/DefaultIntroProvider.cs | 4 + .../LiveTv/ChannelImageProvider.cs | 8 +- .../FFMpeg/FFMpegDownloader.cs | 2 +- Nuget/MediaBrowser.Common.Internal.nuspec | 4 +- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +- 59 files changed, 655 insertions(+), 422 deletions(-) create mode 100644 MediaBrowser.Model/ApiClient/ConnectionMode.cs create mode 100644 MediaBrowser.Model/ApiClient/ConnectionState.cs create mode 100644 MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs create mode 100644 MediaBrowser.Model/Channels/AllChannelMediaQuery.cs create mode 100644 MediaBrowser.Model/Channels/ChannelFolderType.cs create mode 100644 MediaBrowser.Model/Channels/ChannelItemSortField.cs create mode 100644 MediaBrowser.Model/Chapters/ChapterProviderInfo.cs create mode 100644 MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs create mode 100644 MediaBrowser.Model/Dlna/EncodingContext.cs create mode 100644 MediaBrowser.Model/Dlna/ResolutionConfiguration.cs create mode 100644 MediaBrowser.Model/Dlna/ResolutionOptions.cs create mode 100644 MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs create mode 100644 MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs create mode 100644 MediaBrowser.Model/Dto/MediaSourceType.cs create mode 100644 MediaBrowser.Model/Dto/VideoStreamOptions.cs create mode 100644 MediaBrowser.Model/Entities/SupporterInfo.cs create mode 100644 MediaBrowser.Model/Entities/TrailerType.cs create mode 100644 MediaBrowser.Model/Extensions/BoolHelper.cs create mode 100644 MediaBrowser.Model/Extensions/FloatHelper.cs create mode 100644 MediaBrowser.Model/MediaInfo/MediaProtocol.cs create mode 100644 MediaBrowser.Model/Providers/SubtitleProviderInfo.cs create mode 100644 MediaBrowser.Model/Session/TranscodingInfo.cs create mode 100644 MediaBrowser.Model/Sync/SyncLimitType.cs create mode 100644 MediaBrowser.Model/System/PublicSystemInfo.cs diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 73324c3a32..78aae83751 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -11,7 +11,7 @@ MediaBrowser.Model MediaBrowser.Model v4.0 - Profile158 + Profile344 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\ @@ -74,9 +74,15 @@ ApiClient\ApiClientExtensions.cs + + ApiClient\ConnectionMode.cs + ApiClient\ConnectionResult.cs + + ApiClient\ConnectionState.cs + ApiClient\GeneralCommandEventArgs.cs @@ -101,18 +107,30 @@ ApiClient\SessionUpdatesEventArgs.cs + + ApiClient\WakeOnLanInfo.cs + Branding\BrandingOptions.cs + + Channels\AllChannelMediaQuery.cs + Channels\ChannelFeatures.cs + + Channels\ChannelFolderType.cs + Channels\ChannelInfo.cs Channels\ChannelItemQuery.cs + + Channels\ChannelItemSortField.cs + Channels\ChannelMediaContentType.cs @@ -122,6 +140,9 @@ Channels\ChannelQuery.cs + + Chapters\ChapterProviderInfo.cs + Chapters\RemoteChapterInfo.cs @@ -167,6 +188,9 @@ Configuration\PathSubstitution.cs + + Configuration\PeopleMetadataOptions.cs + Configuration\ServerConfiguration.cs @@ -227,6 +251,9 @@ Dlna\DlnaProfileType.cs + + Dlna\EncodingContext.cs + Dlna\HeaderMatchType.cs @@ -254,9 +281,15 @@ Dlna\Profiles\DefaultProfile.cs + + Dlna\ResolutionConfiguration.cs + Dlna\ResolutionNormalizer.cs + + Dlna\ResolutionOptions.cs + Dlna\ResponseProfile.cs @@ -275,9 +308,15 @@ Dlna\StreamInfo.cs + + Dlna\SubtitleDeliveryMethod.cs + Dlna\SubtitleProfile.cs + + Dlna\SubtitleStreamInfo.cs + Dlna\TranscodeSeekInfo.cs @@ -338,6 +377,9 @@ Dto\MediaSourceInfo.cs + + Dto\MediaSourceType.cs + Dto\RatingType.cs @@ -362,6 +404,9 @@ Dto\UserItemDataDto.cs + + Dto\VideoStreamOptions.cs + Entities\BaseItemInfo.cs @@ -446,6 +491,12 @@ Entities\SortOrder.cs + + Entities\SupporterInfo.cs + + + Entities\TrailerType.cs + Entities\UserDataSaveReason.cs @@ -464,9 +515,15 @@ Events\GenericEventArgs.cs + + Extensions\BoolHelper.cs + Extensions\DoubleHelper.cs + + Extensions\FloatHelper.cs + Extensions\IHasPropertyChangedEvent.cs @@ -632,6 +689,9 @@ MediaInfo\IBlurayExaminer.cs + + MediaInfo\MediaProtocol.cs + MediaInfo\SubtitleFormat.cs @@ -746,6 +806,9 @@ Providers\SubtitleOptions.cs + + Providers\SubtitleProviderInfo.cs + Querying\AllThemeMediaResult.cs @@ -875,6 +938,9 @@ Session\SessionUserInfo.cs + + Session\TranscodingInfo.cs + Session\UserDataChangeInfo.cs @@ -896,6 +962,9 @@ Sync\SyncJobStatus.cs + + Sync\SyncLimitType.cs + Sync\SyncQuality.cs @@ -905,6 +974,9 @@ System\LogFile.cs + + System\PublicSystemInfo.cs + System\SystemInfo.cs diff --git a/MediaBrowser.Model.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config index a0f393fddb..1baa00e282 100644 --- a/MediaBrowser.Model.Portable/packages.config +++ b/MediaBrowser.Model.Portable/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 937288567d..d25245782f 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -55,6 +55,12 @@ Activity\ActivityLogEntry.cs + + ApiClient\ConnectionMode.cs + + + ApiClient\ConnectionState.cs + ApiClient\GeneralCommandEventArgs.cs @@ -73,18 +79,30 @@ ApiClient\SessionUpdatesEventArgs.cs + + ApiClient\WakeOnLanInfo.cs + Branding\BrandingOptions.cs + + Channels\AllChannelMediaQuery.cs + Channels\ChannelFeatures.cs + + Channels\ChannelFolderType.cs + Channels\ChannelInfo.cs Channels\ChannelItemQuery.cs + + Channels\ChannelItemSortField.cs + Channels\ChannelMediaContentType.cs @@ -94,6 +112,9 @@ Channels\ChannelQuery.cs + + Chapters\ChapterProviderInfo.cs + Chapters\RemoteChapterInfo.cs @@ -139,6 +160,9 @@ Configuration\PathSubstitution.cs + + Configuration\PeopleMetadataOptions.cs + Configuration\ServerConfiguration.cs @@ -199,6 +223,9 @@ Dlna\DlnaProfileType.cs + + Dlna\EncodingContext.cs + Dlna\HeaderMatchType.cs @@ -226,9 +253,15 @@ Dlna\Profiles\DefaultProfile.cs + + Dlna\ResolutionConfiguration.cs + Dlna\ResolutionNormalizer.cs + + Dlna\ResolutionOptions.cs + Dlna\ResponseProfile.cs @@ -247,9 +280,15 @@ Dlna\StreamInfo.cs + + Dlna\SubtitleDeliveryMethod.cs + Dlna\SubtitleProfile.cs + + Dlna\SubtitleStreamInfo.cs + Dlna\TranscodeSeekInfo.cs @@ -310,6 +349,9 @@ Dto\MediaSourceInfo.cs + + Dto\MediaSourceType.cs + Dto\RatingType.cs @@ -319,6 +361,9 @@ Dto\RecommendationType.cs + + Dto\StreamOptions.cs + Dto\StudioDto.cs @@ -331,6 +376,9 @@ Dto\UserItemDataDto.cs + + Dto\VideoStreamOptions.cs + Entities\BaseItemInfo.cs @@ -415,6 +463,12 @@ Entities\SortOrder.cs + + Entities\SupporterInfo.cs + + + Entities\TrailerType.cs + Entities\UserDataSaveReason.cs @@ -433,9 +487,15 @@ Events\GenericEventArgs.cs + + Extensions\BoolHelper.cs + Extensions\DoubleHelper.cs + + Extensions\FloatHelper.cs + Extensions\IHasPropertyChangedEvent.cs @@ -595,6 +655,9 @@ MediaInfo\IBlurayExaminer.cs + + MediaInfo\MediaProtocol.cs + MediaInfo\SubtitleFormat.cs @@ -709,6 +772,9 @@ Providers\SubtitleOptions.cs + + Providers\SubtitleProviderInfo.cs + Querying\AllThemeMediaResult.cs @@ -838,6 +904,9 @@ Session\SessionUserInfo.cs + + Session\TranscodingInfo.cs + Session\UserDataChangeInfo.cs @@ -859,6 +928,9 @@ Sync\SyncJobStatus.cs + + Sync\SyncLimitType.cs + Sync\SyncQuality.cs @@ -868,6 +940,9 @@ System\LogFile.cs + + System\PublicSystemInfo.cs + System\SystemInfo.cs diff --git a/MediaBrowser.Model/ApiClient/ConnectionMode.cs b/MediaBrowser.Model/ApiClient/ConnectionMode.cs new file mode 100644 index 0000000000..f14c88a093 --- /dev/null +++ b/MediaBrowser.Model/ApiClient/ConnectionMode.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.ApiClient +{ + public enum ConnectionMode + { + Local = 1, + Remote = 2 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/ApiClient/ConnectionResult.cs b/MediaBrowser.Model/ApiClient/ConnectionResult.cs index 348f059b49..0b6c0bfe95 100644 --- a/MediaBrowser.Model/ApiClient/ConnectionResult.cs +++ b/MediaBrowser.Model/ApiClient/ConnectionResult.cs @@ -12,17 +12,4 @@ namespace MediaBrowser.Model.ApiClient State = ConnectionState.Unavailable; } } - - public enum ConnectionState - { - Unavailable = 1, - ServerSignIn = 2, - SignedIn = 3 - } - - public enum ConnectionMode - { - Local = 1, - Remote = 2 - } } diff --git a/MediaBrowser.Model/ApiClient/ConnectionState.cs b/MediaBrowser.Model/ApiClient/ConnectionState.cs new file mode 100644 index 0000000000..9374c77f6f --- /dev/null +++ b/MediaBrowser.Model/ApiClient/ConnectionState.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.ApiClient +{ + public enum ConnectionState + { + Unavailable = 1, + ServerSignIn = 2, + SignedIn = 3 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs index ce518a7ccc..3c0b09da8f 100644 --- a/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs +++ b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs @@ -1,12 +1,11 @@ using MediaBrowser.Model.Session; -using System; namespace MediaBrowser.Model.ApiClient { /// /// Class SystemCommandEventArgs /// - public class GeneralCommandEventArgs : EventArgs + public class GeneralCommandEventArgs { /// /// Gets or sets the command. diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs index 72b4991577..88faad3884 100644 --- a/MediaBrowser.Model/ApiClient/IServerEvents.cs +++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Model.ApiClient /// /// Occurs when [system command]. /// - event EventHandler GeneralCommand; + event EventHandler> GeneralCommand; /// /// Occurs when [notification added]. /// @@ -109,7 +109,7 @@ namespace MediaBrowser.Model.ApiClient /// /// Occurs when [sessions updated]. /// - event EventHandler SessionsUpdated; + event EventHandler> SessionsUpdated; /// /// Occurs when [restart required]. /// @@ -118,5 +118,17 @@ namespace MediaBrowser.Model.ApiClient /// Occurs when [user data changed]. /// event EventHandler> UserDataChanged; + /// + /// Occurs when [playback start]. + /// + event EventHandler> PlaybackStart; + /// + /// Occurs when [playback stopped]. + /// + event EventHandler> PlaybackStopped; + /// + /// Occurs when [session ended]. + /// + event EventHandler> SessionEnded; } } diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs index c80a0b1d3d..0656337bac 100644 --- a/MediaBrowser.Model/ApiClient/ServerInfo.cs +++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs @@ -19,15 +19,4 @@ namespace MediaBrowser.Model.ApiClient LocalAddress = "http://localhost:8096"; } } - - public class WakeOnLanInfo - { - public string MacAddress { get; set; } - public int Port { get; set; } - - public WakeOnLanInfo() - { - Port = 9; - } - } } diff --git a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs index 483ee45d00..af9a0986b1 100644 --- a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs +++ b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs @@ -1,12 +1,11 @@ -using System; -using MediaBrowser.Model.Session; +using MediaBrowser.Model.Session; namespace MediaBrowser.Model.ApiClient { /// /// Class SessionUpdatesEventArgs /// - public class SessionUpdatesEventArgs : EventArgs + public class SessionUpdatesEventArgs { public SessionInfoDto[] Sessions { get; set; } } diff --git a/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs b/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs new file mode 100644 index 0000000000..f7a3c4ebb9 --- /dev/null +++ b/MediaBrowser.Model/ApiClient/WakeOnLanInfo.cs @@ -0,0 +1,13 @@ +namespace MediaBrowser.Model.ApiClient +{ + public class WakeOnLanInfo + { + public string MacAddress { get; set; } + public int Port { get; set; } + + public WakeOnLanInfo() + { + Port = 9; + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs new file mode 100644 index 0000000000..c5631899e2 --- /dev/null +++ b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Model.Channels +{ + public class AllChannelMediaQuery + { + /// + /// Gets or sets the channel ids. + /// + /// The channel ids. + public string[] ChannelIds { get; set; } + + /// + /// Gets or sets the user identifier. + /// + /// The user identifier. + public string UserId { get; set; } + + /// + /// Skips over a given number of items within the results. Use for paging. + /// + /// The start index. + public int? StartIndex { get; set; } + + /// + /// The maximum number of items to return + /// + /// The limit. + public int? Limit { get; set; } + + /// + /// Gets or sets the content types. + /// + /// The content types. + public ChannelMediaContentType[] ContentTypes { get; set; } + + /// + /// Gets or sets the extra types. + /// + /// The extra types. + public ExtraType[] ExtraTypes { get; set; } + public TrailerType[] TrailerTypes { get; set; } + + public AllChannelMediaQuery() + { + ChannelIds = new string[] { }; + + ContentTypes = new ChannelMediaContentType[] { }; + ExtraTypes = new ExtraType[] { }; + TrailerTypes = new TrailerType[] { }; + + Filters = new ItemFilter[] { }; + Fields = new List(); + } + + public ItemFilter[] Filters { get; set; } + public List Fields { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs index ef9ef67f2d..8dfdbcd7a4 100644 --- a/MediaBrowser.Model/Channels/ChannelFeatures.cs +++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs @@ -82,15 +82,4 @@ namespace MediaBrowser.Model.Channels DefaultSortFields = new List(); } } - - public enum ChannelItemSortField - { - Name = 0, - CommunityRating = 1, - PremiereDate = 2, - DateCreated = 3, - Runtime = 4, - PlayCount = 5, - CommunityPlayCount = 6 - } } diff --git a/MediaBrowser.Model/Channels/ChannelFolderType.cs b/MediaBrowser.Model/Channels/ChannelFolderType.cs new file mode 100644 index 0000000000..9261cb5cd3 --- /dev/null +++ b/MediaBrowser.Model/Channels/ChannelFolderType.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Model.Channels +{ + public enum ChannelFolderType + { + Container = 0, + + MusicAlbum = 1, + + PhotoAlbum = 2 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelItemSortField.cs b/MediaBrowser.Model/Channels/ChannelItemSortField.cs new file mode 100644 index 0000000000..6b5015b774 --- /dev/null +++ b/MediaBrowser.Model/Channels/ChannelItemSortField.cs @@ -0,0 +1,13 @@ +namespace MediaBrowser.Model.Channels +{ + public enum ChannelItemSortField + { + Name = 0, + CommunityRating = 1, + PremiereDate = 2, + DateCreated = 3, + Runtime = 4, + PlayCount = 5, + CommunityPlayCount = 6 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs index cf3239c9b7..102cb66447 100644 --- a/MediaBrowser.Model/Channels/ChannelMediaType.cs +++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs @@ -8,13 +8,4 @@ Photo = 2 } - - public enum ChannelFolderType - { - Container = 0, - - MusicAlbum = 1, - - PhotoAlbum = 2 - } } \ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs index cb61f358c0..3c6e43fde8 100644 --- a/MediaBrowser.Model/Channels/ChannelQuery.cs +++ b/MediaBrowser.Model/Channels/ChannelQuery.cs @@ -1,8 +1,4 @@ -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Querying; -using System.Collections.Generic; - -namespace MediaBrowser.Model.Channels +namespace MediaBrowser.Model.Channels { public class ChannelQuery { @@ -36,60 +32,4 @@ namespace MediaBrowser.Model.Channels /// null if [is favorite] contains no value, true if [is favorite]; otherwise, false. public bool? IsFavorite { get; set; } } - - public class AllChannelMediaQuery - { - /// - /// Gets or sets the channel ids. - /// - /// The channel ids. - public string[] ChannelIds { get; set; } - - /// - /// Gets or sets the user identifier. - /// - /// The user identifier. - public string UserId { get; set; } - - /// - /// Skips over a given number of items within the results. Use for paging. - /// - /// The start index. - public int? StartIndex { get; set; } - - /// - /// The maximum number of items to return - /// - /// The limit. - public int? Limit { get; set; } - - /// - /// Gets or sets the content types. - /// - /// The content types. - public ChannelMediaContentType[] ContentTypes { get; set; } - - /// - /// Gets or sets the extra types. - /// - /// The extra types. - public ExtraType[] ExtraTypes { get; set; } - public TrailerType[] TrailerTypes { get; set; } - - public AllChannelMediaQuery() - { - ChannelIds = new string[] { }; - - ContentTypes = new ChannelMediaContentType[] { }; - ExtraTypes = new ExtraType[] { }; - TrailerTypes = new TrailerType[] { }; - - Filters = new ItemFilter[] { }; - Fields = new List(); - } - - public ItemFilter[] Filters { get; set; } - public List Fields { get; set; } - } - } diff --git a/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs b/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs new file mode 100644 index 0000000000..570407c573 --- /dev/null +++ b/MediaBrowser.Model/Chapters/ChapterProviderInfo.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Chapters +{ + public class ChapterProviderInfo + { + public string Name { get; set; } + public string Id { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs b/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs index 52b6c1bcdf..f2674c8424 100644 --- a/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs +++ b/MediaBrowser.Model/Chapters/RemoteChapterInfo.cs @@ -15,10 +15,4 @@ namespace MediaBrowser.Model.Chapters /// The name. public string Name { get; set; } } - - public class ChapterProviderInfo - { - public string Name { get; set; } - public string Id { get; set; } - } } diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs index 8154e764a4..94d9ebabcb 100644 --- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs +++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs @@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Configuration public bool EnableIntrosFromUpcomingTrailers { get; set; } public bool EnableIntrosFromMoviesInLibrary { get; set; } public bool EnableIntrosParentalControl { get; set; } + public bool EnableIntrosFromSimilarMovies { get; set; } public string CustomIntroPath { get; set; } public bool EnableIntrosFromUpcomingDvdMovies { get; set; } public bool EnableIntrosFromUpcomingStreamingMovies { get; set; } diff --git a/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs b/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs new file mode 100644 index 0000000000..8564d5b5b4 --- /dev/null +++ b/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs @@ -0,0 +1,19 @@ +namespace MediaBrowser.Model.Configuration +{ + public class PeopleMetadataOptions + { + public bool DownloadActorMetadata { get; set; } + public bool DownloadDirectorMetadata { get; set; } + public bool DownloadProducerMetadata { get; set; } + public bool DownloadWriterMetadata { get; set; } + public bool DownloadComposerMetadata { get; set; } + public bool DownloadOtherPeopleMetadata { get; set; } + public bool DownloadGuestStarMetadata { get; set; } + + public PeopleMetadataOptions() + { + DownloadActorMetadata = true; + DownloadDirectorMetadata = true; + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index ab5b5bc3be..27818e5ed8 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -293,21 +293,4 @@ namespace MediaBrowser.Model.Configuration }; } } - - public class PeopleMetadataOptions - { - public bool DownloadActorMetadata { get; set; } - public bool DownloadDirectorMetadata { get; set; } - public bool DownloadProducerMetadata { get; set; } - public bool DownloadWriterMetadata { get; set; } - public bool DownloadComposerMetadata { get; set; } - public bool DownloadOtherPeopleMetadata { get; set; } - public bool DownloadGuestStarMetadata { get; set; } - - public PeopleMetadataOptions() - { - DownloadActorMetadata = true; - DownloadDirectorMetadata = true; - } - } } diff --git a/MediaBrowser.Model/Dlna/EncodingContext.cs b/MediaBrowser.Model/Dlna/EncodingContext.cs new file mode 100644 index 0000000000..f83d8ddc82 --- /dev/null +++ b/MediaBrowser.Model/Dlna/EncodingContext.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum EncodingContext + { + Streaming = 0, + Static = 1 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs new file mode 100644 index 0000000000..8efdb06609 --- /dev/null +++ b/MediaBrowser.Model/Dlna/ResolutionConfiguration.cs @@ -0,0 +1,14 @@ +namespace MediaBrowser.Model.Dlna +{ + public class ResolutionConfiguration + { + public int MaxWidth { get; set; } + public int MaxBitrate { get; set; } + + public ResolutionConfiguration(int maxWidth, int maxBitrate) + { + MaxWidth = maxWidth; + MaxBitrate = maxBitrate; + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs index a95de8d39d..b23c0b20b1 100644 --- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs +++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs @@ -42,22 +42,4 @@ namespace MediaBrowser.Model.Dlna }; } } - - public class ResolutionConfiguration - { - public int MaxWidth { get; set; } - public int MaxBitrate { get; set; } - - public ResolutionConfiguration(int maxWidth, int maxBitrate) - { - MaxWidth = maxWidth; - MaxBitrate = maxBitrate; - } - } - - public class ResolutionOptions - { - public int? MaxWidth { get; set; } - public int? MaxHeight { get; set; } - } } diff --git a/MediaBrowser.Model/Dlna/ResolutionOptions.cs b/MediaBrowser.Model/Dlna/ResolutionOptions.cs new file mode 100644 index 0000000000..6b711cfa0d --- /dev/null +++ b/MediaBrowser.Model/Dlna/ResolutionOptions.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Dlna +{ + public class ResolutionOptions + { + public int? MaxWidth { get; set; } + public int? MaxHeight { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index 4d6b301d1e..6231d99a4a 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -514,33 +514,4 @@ namespace MediaBrowser.Model.Dlna } } } - - public enum SubtitleDeliveryMethod - { - /// - /// The encode - /// - Encode = 0, - /// - /// The embed - /// - Embed = 1, - /// - /// The external - /// - External = 2, - /// - /// The HLS - /// - Hls = 3 - } - - public class SubtitleStreamInfo - { - public string Url { get; set; } - public string Language { get; set; } - public string Name { get; set; } - public bool IsForced { get; set; } - public string Format { get; set; } - } } diff --git a/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs new file mode 100644 index 0000000000..b4e13c5baa --- /dev/null +++ b/MediaBrowser.Model/Dlna/SubtitleDeliveryMethod.cs @@ -0,0 +1,22 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum SubtitleDeliveryMethod + { + /// + /// The encode + /// + Encode = 0, + /// + /// The embed + /// + Embed = 1, + /// + /// The external + /// + External = 2, + /// + /// The HLS + /// + Hls = 3 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs new file mode 100644 index 0000000000..1600408d60 --- /dev/null +++ b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Model.Dlna +{ + public class SubtitleStreamInfo + { + public string Url { get; set; } + public string Language { get; set; } + public string Name { get; set; } + public bool IsForced { get; set; } + public string Format { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs index 976f8e8d1f..ad82d6facd 100644 --- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs +++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs @@ -45,10 +45,4 @@ namespace MediaBrowser.Model.Dlna return list; } } - - public enum EncodingContext - { - Streaming = 0, - Static = 1 - } } diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index 46c51ed8b1..368f20181a 100644 --- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs @@ -117,11 +117,4 @@ namespace MediaBrowser.Model.Dto return null; } } - - public enum MediaSourceType - { - Default = 0, - Grouping = 1, - Cache = 2 - } } diff --git a/MediaBrowser.Model/Dto/MediaSourceType.cs b/MediaBrowser.Model/Dto/MediaSourceType.cs new file mode 100644 index 0000000000..a9cd71df56 --- /dev/null +++ b/MediaBrowser.Model/Dto/MediaSourceType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Dto +{ + public enum MediaSourceType + { + Default = 0, + Grouping = 1, + Cache = 2 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs index d281148ff8..5b7cdc6fb1 100644 --- a/MediaBrowser.Model/Dto/StreamOptions.cs +++ b/MediaBrowser.Model/Dto/StreamOptions.cs @@ -64,102 +64,4 @@ namespace MediaBrowser.Model.Dto /// The device id. public string DeviceId { get; set; } } - - /// - /// Class VideoStreamOptions - /// - [Obsolete] - public class VideoStreamOptions : StreamOptions - { - /// - /// Gets or sets the video codec. - /// Omit to copy - /// - /// The video codec. - public string VideoCodec { get; set; } - - /// - /// Gets or sets the video bit rate. - /// - /// The video bit rate. - public int? VideoBitRate { get; set; } - - /// - /// Gets or sets the width. - /// - /// The width. - public int? Width { get; set; } - - /// - /// Gets or sets the height. - /// - /// The height. - public int? Height { get; set; } - - /// - /// Gets or sets the width of the max. - /// - /// The width of the max. - public int? MaxWidth { get; set; } - - /// - /// Gets or sets the height of the max. - /// - /// The height of the max. - public int? MaxHeight { get; set; } - - /// - /// Gets or sets the frame rate. - /// - /// The frame rate. - public double? FrameRate { get; set; } - - /// - /// Gets or sets the index of the audio stream. - /// - /// The index of the audio stream. - public int? AudioStreamIndex { get; set; } - - /// - /// Gets or sets the index of the video stream. - /// - /// The index of the video stream. - public int? VideoStreamIndex { get; set; } - - /// - /// Gets or sets the index of the subtitle stream. - /// - /// The index of the subtitle stream. - public int? SubtitleStreamIndex { get; set; } - - /// - /// Gets or sets the profile. - /// - /// The profile. - public string Profile { get; set; } - - /// - /// Gets or sets the level. - /// - /// The level. - public string Level { get; set; } - - /// - /// Gets or sets the baseline stream audio bit rate. - /// - /// The baseline stream audio bit rate. - public int? BaselineStreamAudioBitRate { get; set; } - - /// - /// Gets or sets a value indicating whether [append baseline stream]. - /// - /// true if [append baseline stream]; otherwise, false. - public bool AppendBaselineStream { get; set; } - - /// - /// Gets or sets the time stamp offset ms. Only used with HLS. - /// - /// The time stamp offset ms. - public int? TimeStampOffsetMs { get; set; } - } } diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs new file mode 100644 index 0000000000..606e928f21 --- /dev/null +++ b/MediaBrowser.Model/Dto/VideoStreamOptions.cs @@ -0,0 +1,102 @@ +using System; + +namespace MediaBrowser.Model.Dto +{ + /// + /// Class VideoStreamOptions + /// + [Obsolete] + public class VideoStreamOptions : StreamOptions + { + /// + /// Gets or sets the video codec. + /// Omit to copy + /// + /// The video codec. + public string VideoCodec { get; set; } + + /// + /// Gets or sets the video bit rate. + /// + /// The video bit rate. + public int? VideoBitRate { get; set; } + + /// + /// Gets or sets the width. + /// + /// The width. + public int? Width { get; set; } + + /// + /// Gets or sets the height. + /// + /// The height. + public int? Height { get; set; } + + /// + /// Gets or sets the width of the max. + /// + /// The width of the max. + public int? MaxWidth { get; set; } + + /// + /// Gets or sets the height of the max. + /// + /// The height of the max. + public int? MaxHeight { get; set; } + + /// + /// Gets or sets the frame rate. + /// + /// The frame rate. + public double? FrameRate { get; set; } + + /// + /// Gets or sets the index of the audio stream. + /// + /// The index of the audio stream. + public int? AudioStreamIndex { get; set; } + + /// + /// Gets or sets the index of the video stream. + /// + /// The index of the video stream. + public int? VideoStreamIndex { get; set; } + + /// + /// Gets or sets the index of the subtitle stream. + /// + /// The index of the subtitle stream. + public int? SubtitleStreamIndex { get; set; } + + /// + /// Gets or sets the profile. + /// + /// The profile. + public string Profile { get; set; } + + /// + /// Gets or sets the level. + /// + /// The level. + public string Level { get; set; } + + /// + /// Gets or sets the baseline stream audio bit rate. + /// + /// The baseline stream audio bit rate. + public int? BaselineStreamAudioBitRate { get; set; } + + /// + /// Gets or sets a value indicating whether [append baseline stream]. + /// + /// true if [append baseline stream]; otherwise, false. + public bool AppendBaselineStream { get; set; } + + /// + /// Gets or sets the time stamp offset ms. Only used with HLS. + /// + /// The time stamp offset ms. + public int? TimeStampOffsetMs { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs index 92fb00731e..ab8da58c07 100644 --- a/MediaBrowser.Model/Entities/ExtraType.cs +++ b/MediaBrowser.Model/Entities/ExtraType.cs @@ -13,12 +13,4 @@ namespace MediaBrowser.Model.Entities ThemeSong = 8, ThemeVideo = 9 } - - public enum TrailerType - { - ComingSoonToTheaters = 1, - ComingSoonToDvd = 2, - ComingSoonToStreaming = 3, - Archive = 4 - } } diff --git a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs b/MediaBrowser.Model/Entities/MBRegistrationRecord.cs index 3a4af19d87..00176fb344 100644 --- a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs +++ b/MediaBrowser.Model/Entities/MBRegistrationRecord.cs @@ -11,15 +11,4 @@ namespace MediaBrowser.Model.Entities public bool TrialVersion { get; set; } public bool IsValid { get; set; } } - - public class SupporterInfo - { - public string Email { get; set; } - public string SupporterKey { get; set; } - public DateTime? ExpirationDate { get; set; } - public DateTime RegistrationDate { get; set; } - public string PlanType { get; set; } - public bool IsActiveSupporter { get; set; } - public bool IsExpiredSupporter { get; set; } - } } \ No newline at end of file diff --git a/MediaBrowser.Model/Entities/SupporterInfo.cs b/MediaBrowser.Model/Entities/SupporterInfo.cs new file mode 100644 index 0000000000..233d5615fe --- /dev/null +++ b/MediaBrowser.Model/Entities/SupporterInfo.cs @@ -0,0 +1,15 @@ +using System; + +namespace MediaBrowser.Model.Entities +{ + public class SupporterInfo + { + public string Email { get; set; } + public string SupporterKey { get; set; } + public DateTime? ExpirationDate { get; set; } + public DateTime RegistrationDate { get; set; } + public string PlanType { get; set; } + public bool IsActiveSupporter { get; set; } + public bool IsExpiredSupporter { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Entities/TrailerType.cs b/MediaBrowser.Model/Entities/TrailerType.cs new file mode 100644 index 0000000000..c96a05bcd6 --- /dev/null +++ b/MediaBrowser.Model/Entities/TrailerType.cs @@ -0,0 +1,10 @@ +namespace MediaBrowser.Model.Entities +{ + public enum TrailerType + { + ComingSoonToTheaters = 1, + ComingSoonToDvd = 2, + ComingSoonToStreaming = 3, + Archive = 4 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Extensions/BoolHelper.cs b/MediaBrowser.Model/Extensions/BoolHelper.cs new file mode 100644 index 0000000000..5b61f864b0 --- /dev/null +++ b/MediaBrowser.Model/Extensions/BoolHelper.cs @@ -0,0 +1,16 @@ +namespace MediaBrowser.Model.Extensions +{ + public static class BoolHelper + { + /// + /// Tries the parse culture invariant. + /// + /// The s. + /// The result. + /// true if XXXX, false otherwise. + public static bool TryParseCultureInvariant(string s, out bool result) + { + return bool.TryParse(s, out result); + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Extensions/DoubleHelper.cs b/MediaBrowser.Model/Extensions/DoubleHelper.cs index e6a4e05812..bcaf2d7800 100644 --- a/MediaBrowser.Model/Extensions/DoubleHelper.cs +++ b/MediaBrowser.Model/Extensions/DoubleHelper.cs @@ -18,32 +18,4 @@ namespace MediaBrowser.Model.Extensions return double.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result); } } - - public static class FloatHelper - { - /// - /// Tries the parse culture invariant. - /// - /// The s. - /// The result. - /// true if XXXX, false otherwise. - public static bool TryParseCultureInvariant(string s, out float result) - { - return float.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result); - } - } - - public static class BoolHelper - { - /// - /// Tries the parse culture invariant. - /// - /// The s. - /// The result. - /// true if XXXX, false otherwise. - public static bool TryParseCultureInvariant(string s, out bool result) - { - return bool.TryParse(s, out result); - } - } } diff --git a/MediaBrowser.Model/Extensions/FloatHelper.cs b/MediaBrowser.Model/Extensions/FloatHelper.cs new file mode 100644 index 0000000000..171eccf931 --- /dev/null +++ b/MediaBrowser.Model/Extensions/FloatHelper.cs @@ -0,0 +1,18 @@ +using System.Globalization; + +namespace MediaBrowser.Model.Extensions +{ + public static class FloatHelper + { + /// + /// Tries the parse culture invariant. + /// + /// The s. + /// The result. + /// true if XXXX, false otherwise. + public static bool TryParseCultureInvariant(string s, out float result) + { + return float.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out result); + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index b0cc3986c8..dc8b3d5196 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -60,7 +60,9 @@ Properties\SharedVersion.cs + + @@ -70,28 +72,45 @@ + + + + + + + + + + + + + + + + + @@ -105,6 +124,7 @@ + @@ -249,6 +269,7 @@ + @@ -312,6 +333,7 @@ + @@ -319,9 +341,11 @@ + + diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs index 89ce9864cf..3762edf9fa 100644 --- a/MediaBrowser.Model/MediaInfo/Container.cs +++ b/MediaBrowser.Model/MediaInfo/Container.cs @@ -6,11 +6,4 @@ namespace MediaBrowser.Model.MediaInfo public const string MP4 = "mp4"; public const string MKV = "mkv"; } - - public enum MediaProtocol - { - File = 0, - Http = 1, - Rtmp = 2 - } } diff --git a/MediaBrowser.Model/MediaInfo/MediaProtocol.cs b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs new file mode 100644 index 0000000000..ad63fa058d --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/MediaProtocol.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.MediaInfo +{ + public enum MediaProtocol + { + File = 0, + Http = 1, + Rtmp = 2 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs index aa697fee3d..0a4a52cd5f 100644 --- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs +++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs @@ -16,10 +16,4 @@ namespace MediaBrowser.Model.Providers public int? DownloadCount { get; set; } public bool? IsHashMatch { get; set; } } - - public class SubtitleProviderInfo - { - public string Name { get; set; } - public string Id { get; set; } - } } diff --git a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs new file mode 100644 index 0000000000..ecce18bd5d --- /dev/null +++ b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Providers +{ + public class SubtitleProviderInfo + { + public string Name { get; set; } + public string Id { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs index e196d9d59e..c9afef8e0e 100644 --- a/MediaBrowser.Model/Session/PlayerStateInfo.cs +++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs @@ -56,19 +56,4 @@ /// The play method. public PlayMethod? PlayMethod { get; set; } } - - public class TranscodingInfo - { - public string AudioCodec { get; set; } - public string VideoCodec { get; set; } - public string Container { get; set; } - public int? Bitrate { get; set; } - - public float? Framerate { get; set; } - public double? CompletionPercentage { get; set; } - - public int? Width { get; set; } - public int? Height { get; set; } - public int? AudioChannels { get; set; } - } } \ No newline at end of file diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs new file mode 100644 index 0000000000..b3ab32a448 --- /dev/null +++ b/MediaBrowser.Model/Session/TranscodingInfo.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Session +{ + public class TranscodingInfo + { + public string AudioCodec { get; set; } + public string VideoCodec { get; set; } + public string Container { get; set; } + public int? Bitrate { get; set; } + + public float? Framerate { get; set; } + public double? CompletionPercentage { get; set; } + + public int? Width { get; set; } + public int? Height { get; set; } + public int? AudioChannels { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/Sync/SyncJobRequest.cs b/MediaBrowser.Model/Sync/SyncJobRequest.cs index 7728aad9bd..987f396e40 100644 --- a/MediaBrowser.Model/Sync/SyncJobRequest.cs +++ b/MediaBrowser.Model/Sync/SyncJobRequest.cs @@ -50,9 +50,4 @@ namespace MediaBrowser.Model.Sync ItemIds = new List(); } } - - public enum SyncLimitType - { - ItemCount = 0 - } } diff --git a/MediaBrowser.Model/Sync/SyncLimitType.cs b/MediaBrowser.Model/Sync/SyncLimitType.cs new file mode 100644 index 0000000000..d20f9e33d1 --- /dev/null +++ b/MediaBrowser.Model/Sync/SyncLimitType.cs @@ -0,0 +1,7 @@ +namespace MediaBrowser.Model.Sync +{ + public enum SyncLimitType + { + ItemCount = 0 + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs new file mode 100644 index 0000000000..3afe72e818 --- /dev/null +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -0,0 +1,35 @@ +namespace MediaBrowser.Model.System +{ + public class PublicSystemInfo + { + /// + /// Gets or sets the local address. + /// + /// The local address. + public string LocalAddress { get; set; } + + /// + /// Gets or sets the wan address. + /// + /// The wan address. + public string WanAddress { get; set; } + + /// + /// Gets or sets the name of the server. + /// + /// The name of the server. + public string ServerName { get; set; } + + /// + /// Gets or sets the version. + /// + /// The version. + public string Version { get; set; } + + /// + /// Gets or sets the id. + /// + /// The id. + public string Id { get; set; } + } +} \ No newline at end of file diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 152448330d..415c619ea8 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -152,37 +152,4 @@ namespace MediaBrowser.Model.System FailedPluginAssemblies = new List(); } } - - public class PublicSystemInfo - { - /// - /// Gets or sets the local address. - /// - /// The local address. - public string LocalAddress { get; set; } - - /// - /// Gets or sets the wan address. - /// - /// The wan address. - public string WanAddress { get; set; } - - /// - /// Gets or sets the name of the server. - /// - /// The name of the server. - public string ServerName { get; set; } - - /// - /// Gets or sets the version. - /// - /// The version. - public string Version { get; set; } - - /// - /// Gets or sets the id. - /// - /// The id. - public string Id { get; set; } - } } diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs index 6c3eb2dc4d..f2b3474b9d 100644 --- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs +++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs @@ -109,6 +109,10 @@ namespace MediaBrowser.Server.Implementations.Intros { trailerTypes.Add(TrailerType.ComingSoonToStreaming); } + if (config.EnableIntrosFromSimilarMovies) + { + trailerTypes.Add(TrailerType.Archive); + } if (trailerTypes.Count > 0 && IsSupporter) { diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs index 4dd9f756dd..ed67df01e4 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs @@ -105,13 +105,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService) { - var liveTvItem = item as LiveTvChannel; - - if (liveTvItem != null) - { - return !liveTvItem.HasImage(ImageType.Primary) && (liveTvItem.HasProviderImage ?? true); - } - return false; + return GetSupportedImages(item).Any(i => !item.HasImage(i)); } } } diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs index cc289faf29..7af8546ab0 100644 --- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs +++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg private readonly string[] _fontUrls = { - "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1" + "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/ARIALUNI.7z" }; public FFMpegDownloader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem) diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 82e865afa4..b95240dba5 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.463 + 3.0.466 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index c8c2d69d2a..0590378ef9 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.463 + 3.0.466 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 5d9637525b..af83164339 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.463 + 3.0.466 MediaBrowser.Model - Signed Edition Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 724883697e..d62d6f0a30 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.463 + 3.0.466 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +