diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 7f8f4c3251..57d2657962 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -62,6 +62,9 @@
ApiClient\ApiClientExtensions.cs
+
+ ApiClient\GeneralCommandEventArgs.cs
+
ApiClient\HttpResponseEventArgs.cs
@@ -71,45 +74,93 @@
ApiClient\IServerEvents.cs
-
- ApiClient\ServerEventArgs.cs
+
+ ApiClient\SessionUpdatesEventArgs.cs
+
+
+ Channels\ChannelItemQuery.cs
Channels\ChannelQuery.cs
-
- Configuration\AutoOrganize.cs
-
Configuration\BaseApplicationConfiguration.cs
Configuration\DlnaOptions.cs
+
+ Configuration\EncodingQuality.cs
+
+
+ Configuration\ImageOption.cs
+
+
+ Configuration\ImageSavingConvention.cs
+
+
+ Configuration\LiveTvOptions.cs
+
Configuration\MetadataOptions.cs
Configuration\MetadataPlugin.cs
+
+ Configuration\MetadataPluginSummary.cs
+
+
+ Configuration\MetadataPluginType.cs
+
+
+ Configuration\NotificationOption.cs
+
Configuration\NotificationOptions.cs
+
+ Configuration\NotificationType.cs
+
+
+ Configuration\PathSubstitution.cs
+
+
+ Configuration\SendToUserType.cs
+
Configuration\ServerConfiguration.cs
+
+ Configuration\SubtitleOptions.cs
+
+
+ Configuration\TvFileOrganizationOptions.cs
+
+
+ Configuration\UnratedItem.cs
+
Configuration\UserConfiguration.cs
+
+ Dlna\AudioOptions.cs
+
Dlna\CodecProfile.cs
+
+ Dlna\CodecType.cs
+
Dlna\ConditionProcessor.cs
Dlna\ContainerProfile.cs
+
+ Dlna\ContentFeatureBuilder.cs
+
Dlna\DeviceIdentification.cs
@@ -119,30 +170,57 @@
Dlna\DeviceProfileInfo.cs
+
+ Dlna\DeviceProfileType.cs
+
Dlna\DirectPlayProfile.cs
+
+ Dlna\DlnaFlags.cs
+
Dlna\DlnaMaps.cs
+
+ Dlna\DlnaProfileType.cs
+
Dlna\EventSubscription.cs
Dlna\Filter.cs
+
+ Dlna\HeaderMatchType.cs
+
+
+ Dlna\HttpHeaderInfo.cs
+
Dlna\MediaFormatProfile.cs
Dlna\MediaFormatProfileResolver.cs
+
+ Dlna\ProfileCondition.cs
+
+
+ Dlna\ProfileConditionType.cs
+
+
+ Dlna\ProfileConditionValue.cs
+
Dlna\ResponseProfile.cs
Dlna\SearchCriteria.cs
+
+ Dlna\SearchType.cs
+
Dlna\SortCriteria.cs
@@ -152,15 +230,27 @@
Dlna\StreamInfo.cs
+
+ Dlna\TranscodeSeekInfo.cs
+
Dlna\TranscodingProfile.cs
+
+ Dlna\VideoOptions.cs
+
+
+ Dlna\XmlAttribute.cs
+
Drawing\DrawingUtils.cs
Drawing\ImageOutputFormat.cs
+
+ Drawing\ImageSize.cs
+
Dto\BaseItemDto.cs
@@ -191,24 +281,36 @@
Dto\ItemIndex.cs
-
- Dto\MediaVersionInfo.cs
+
+ Dto\MediaSourceInfo.cs
+
+
+ Dto\RatingType.cs
Dto\RecommendationDto.cs
+
+ Dto\RecommendationType.cs
+
Dto\StreamOptions.cs
Dto\StudioDto.cs
+
+ Dto\SubtitleDownloadOptions.cs
+
Dto\UserDto.cs
Dto\UserItemDataDto.cs
+
+ Dto\VideoStreamOptions.cs
+
Entities\BaseItemInfo.cs
@@ -221,12 +323,18 @@
Entities\DisplayPreferences.cs
+
+ Entities\EmptyRequestResult.cs
+
Entities\IHasProviderIds.cs
Entities\ImageType.cs
+
+ Entities\IsoType.cs
+
Entities\ItemReview.cs
@@ -239,9 +347,15 @@
Entities\MBRegistrationRecord.cs
+
+ Entities\MediaInfo.cs
+
Entities\MediaStream.cs
+
+ Entities\MediaStreamType.cs
+
Entities\MediaType.cs
@@ -254,6 +368,9 @@
Entities\MetadataProviders.cs
+
+ Entities\PackageReviewInfo.cs
+
Entities\ParentalRating.cs
@@ -263,15 +380,27 @@
Entities\PluginSecurityInfo.cs
-
- Entities\RequestResult.cs
+
+ Entities\ProviderIdsExtensions.cs
+
+
+ Entities\ScrollDirection.cs
Entities\SeriesStatus.cs
+
+ Entities\SortOrder.cs
+
+
+ Entities\UserDataSaveReason.cs
+
Entities\Video3DFormat.cs
+
+ Entities\VideoSize.cs
+
Entities\VideoType.cs
@@ -281,12 +410,21 @@
Events\GenericEventArgs.cs
-
- FileOrganization\FileOrganizationQuery.cs
+
+ FileOrganization\EpisodeFileOrganizationRequest.cs
FileOrganization\FileOrganizationResult.cs
+
+ FileOrganization\FileOrganizationResultQuery.cs
+
+
+ FileOrganization\FileOrganizerType.cs
+
+
+ FileOrganization\FileSortingStatus.cs
+
Games\GameSystem.cs
@@ -296,15 +434,33 @@
Globalization\CultureDto.cs
+
+ Globalization\LocalizatonOption.cs
+
IO\FileSystemEntryInfo.cs
+
+ IO\FileSystemEntryType.cs
+
+
+ IO\IIsoManager.cs
+
+
+ IO\IIsoMount.cs
+
+
+ IO\IIsoMounter.cs
+
IO\IZipClient.cs
Library\PlayAccess.cs
+
+ LiveTv\BaseTimerInfoDto.cs
+
LiveTv\ChannelInfoDto.cs
@@ -314,18 +470,45 @@
LiveTv\ChannelType.cs
+
+ LiveTv\DayPattern.cs
+
+
+ LiveTv\GuideInfo.cs
+
+
+ LiveTv\LiveTvInfo.cs
+
LiveTv\LiveTvServiceInfo.cs
+
+ LiveTv\LiveTvServiceStatus.cs
+
+
+ LiveTv\LiveTvTunerInfoDto.cs
+
+
+ LiveTv\LiveTvTunerStatus.cs
+
+
+ LiveTv\ProgramAudio.cs
+
LiveTv\ProgramInfoDto.cs
LiveTv\ProgramQuery.cs
+
+ LiveTv\RecommendedProgramQuery.cs
+
LiveTv\RecordingGroupDto.cs
+
+ LiveTv\RecordingGroupQuery.cs
+
LiveTv\RecordingInfoDto.cs
@@ -338,9 +521,15 @@
LiveTv\SeriesTimerInfoDto.cs
+
+ LiveTv\SeriesTimerQuery.cs
+
LiveTv\TimerInfoDto.cs
+
+ LiveTv\TimerQuery.cs
+
Logging\ILogger.cs
@@ -353,15 +542,27 @@
Logging\NullLogger.cs
+
+ MediaInfo\AudioCodec.cs
+
MediaInfo\BlurayDiscInfo.cs
-
- MediaInfo\Constants.cs
+
+ MediaInfo\Container.cs
MediaInfo\IBlurayExaminer.cs
+
+ MediaInfo\SubtitleFormat.cs
+
+
+ MediaInfo\TransportStreamTimestamp.cs
+
+
+ MediaInfo\VideoCodec.cs
+
Net\HttpException.cs
@@ -380,9 +581,15 @@
Net\WebSocketState.cs
+
+ News\NewsChannel.cs
+
News\NewsItem.cs
+
+ News\NewsQuery.cs
+
Notifications\Notification.cs
@@ -392,12 +599,21 @@
Notifications\NotificationQuery.cs
+
+ Notifications\NotificationRequest.cs
+
Notifications\NotificationResult.cs
+
+ Notifications\NotificationServiceInfo.cs
+
Notifications\NotificationsSummary.cs
+
+ Notifications\NotificationTypeInfo.cs
+
Plugins\BasePluginConfiguration.cs
@@ -407,12 +623,18 @@
Providers\ExternalIdInfo.cs
+
+ Providers\ExternalUrl.cs
+
Providers\ImageProviderInfo.cs
Providers\RemoteImageInfo.cs
+
+ Providers\RemoteImageQuery.cs
+
Providers\RemoteImageResult.cs
@@ -422,6 +644,9 @@
Providers\RemoteSubtitleInfo.cs
+
+ Querying\AllThemeMediaResult.cs
+
Querying\ArtistsQuery.cs
@@ -458,14 +683,23 @@
Querying\QueryResult.cs
+
+ Querying\SeasonQuery.cs
+
Querying\SessionQuery.cs
+
+ Querying\SimilarItemsByNameQuery.cs
+
Querying\SimilarItemsQuery.cs
-
- Querying\ThemeSongsResult.cs
+
+ Querying\ThemeMediaResult.cs
+
+
+ Querying\UpcomingEpisodesQuery.cs
Querying\UserQuery.cs
@@ -488,14 +722,35 @@
Session\BrowseRequest.cs
+
+ Session\ClientCapabilities.cs
+
Session\GeneralCommand.cs
+
+ Session\GeneralCommandType.cs
+
Session\MessageCommand.cs
-
- Session\PlaybackReports.cs
+
+ Session\PlaybackProgressInfo.cs
+
+
+ Session\PlaybackStartInfo.cs
+
+
+ Session\PlaybackStopInfo.cs
+
+
+ Session\PlayCommand.cs
+
+
+ Session\PlayerStateInfo.cs
+
+
+ Session\PlayMethod.cs
Session\PlayRequest.cs
@@ -503,12 +758,18 @@
Session\PlaystateCommand.cs
+
+ Session\PlaystateRequest.cs
+
Session\SessionCapabilities.cs
Session\SessionInfoDto.cs
+
+ Session\SessionUserInfo.cs
+
Session\UserDataChangeInfo.cs
@@ -536,6 +797,9 @@
Themes\AppTheme.cs
+
+ Themes\AppThemeInfo.cs
+
Themes\ThemeImage.cs
@@ -577,6 +841,7 @@
+
if $(ConfigurationName) == Release (
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index d65aef7f0d..318a26b7c5 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -52,51 +52,102 @@
+
+ ApiClient\GeneralCommandEventArgs.cs
+
ApiClient\HttpResponseEventArgs.cs
ApiClient\IServerEvents.cs
-
- ApiClient\ServerEventArgs.cs
+
+ ApiClient\SessionUpdatesEventArgs.cs
+
+
+ Channels\ChannelItemQuery.cs
Channels\ChannelQuery.cs
-
- Configuration\AutoOrganize.cs
-
Configuration\BaseApplicationConfiguration.cs
Configuration\DlnaOptions.cs
+
+ Configuration\EncodingQuality.cs
+
+
+ Configuration\ImageOption.cs
+
+
+ Configuration\ImageSavingConvention.cs
+
+
+ Configuration\LiveTvOptions.cs
+
Configuration\MetadataOptions.cs
Configuration\MetadataPlugin.cs
+
+ Configuration\MetadataPluginSummary.cs
+
+
+ Configuration\MetadataPluginType.cs
+
+
+ Configuration\NotificationOption.cs
+
Configuration\NotificationOptions.cs
+
+ Configuration\NotificationType.cs
+
+
+ Configuration\PathSubstitution.cs
+
+
+ Configuration\SendToUserType.cs
+
Configuration\ServerConfiguration.cs
+
+ Configuration\SubtitleOptions.cs
+
+
+ Configuration\TvFileOrganizationOptions.cs
+
+
+ Configuration\UnratedItem.cs
+
Configuration\UserConfiguration.cs
+
+ Dlna\AudioOptions.cs
+
Dlna\CodecProfile.cs
+
+ Dlna\CodecType.cs
+
Dlna\ConditionProcessor.cs
Dlna\ContainerProfile.cs
+
+ Dlna\ContentFeatureBuilder.cs
+
Dlna\DeviceIdentification.cs
@@ -106,30 +157,57 @@
Dlna\DeviceProfileInfo.cs
+
+ Dlna\DeviceProfileType.cs
+
Dlna\DirectPlayProfile.cs
+
+ Dlna\DlnaFlags.cs
+
Dlna\DlnaMaps.cs
+
+ Dlna\DlnaProfileType.cs
+
Dlna\EventSubscription.cs
Dlna\Filter.cs
+
+ Dlna\HeaderMatchType.cs
+
+
+ Dlna\HttpHeaderInfo.cs
+
Dlna\MediaFormatProfile.cs
Dlna\MediaFormatProfileResolver.cs
+
+ Dlna\ProfileCondition.cs
+
+
+ Dlna\ProfileConditionType.cs
+
+
+ Dlna\ProfileConditionValue.cs
+
Dlna\ResponseProfile.cs
Dlna\SearchCriteria.cs
+
+ Dlna\SearchType.cs
+
Dlna\SortCriteria.cs
@@ -139,15 +217,27 @@
Dlna\StreamInfo.cs
+
+ Dlna\TranscodeSeekInfo.cs
+
Dlna\TranscodingProfile.cs
+
+ Dlna\VideoOptions.cs
+
+
+ Dlna\XmlAttribute.cs
+
Drawing\DrawingUtils.cs
Drawing\ImageOutputFormat.cs
+
+ Drawing\ImageSize.cs
+
Dto\BaseItemDto.cs
@@ -178,24 +268,36 @@
Dto\ItemIndex.cs
-
- Dto\MediaVersionInfo.cs
+
+ Dto\MediaSourceInfo.cs
+
+
+ Dto\RatingType.cs
Dto\RecommendationDto.cs
+
+ Dto\RecommendationType.cs
+
Dto\StreamOptions.cs
Dto\StudioDto.cs
+
+ Dto\SubtitleDownloadOptions.cs
+
Dto\UserDto.cs
Dto\UserItemDataDto.cs
+
+ Dto\VideoStreamOptions.cs
+
Entities\BaseItemInfo.cs
@@ -208,12 +310,18 @@
Entities\DisplayPreferences.cs
+
+ Entities\EmptyRequestResult.cs
+
Entities\IHasProviderIds.cs
Entities\ImageType.cs
+
+ Entities\IsoType.cs
+
Entities\ItemReview.cs
@@ -226,9 +334,15 @@
Entities\MBRegistrationRecord.cs
+
+ Entities\MediaInfo.cs
+
Entities\MediaStream.cs
+
+ Entities\MediaStreamType.cs
+
Entities\MediaType.cs
@@ -241,6 +355,9 @@
Entities\MetadataProviders.cs
+
+ Entities\PackageReviewInfo.cs
+
Entities\ParentalRating.cs
@@ -250,15 +367,27 @@
Entities\PluginSecurityInfo.cs
-
- Entities\RequestResult.cs
+
+ Entities\ProviderIdsExtensions.cs
+
+
+ Entities\ScrollDirection.cs
Entities\SeriesStatus.cs
+
+ Entities\SortOrder.cs
+
+
+ Entities\UserDataSaveReason.cs
+
Entities\Video3DFormat.cs
+
+ Entities\VideoSize.cs
+
Entities\VideoType.cs
@@ -268,12 +397,21 @@
Events\GenericEventArgs.cs
-
- FileOrganization\FileOrganizationQuery.cs
+
+ FileOrganization\EpisodeFileOrganizationRequest.cs
FileOrganization\FileOrganizationResult.cs
+
+ FileOrganization\FileOrganizationResultQuery.cs
+
+
+ FileOrganization\FileOrganizerType.cs
+
+
+ FileOrganization\FileSortingStatus.cs
+
Games\GameSystem.cs
@@ -283,15 +421,27 @@
Globalization\CultureDto.cs
+
+ Globalization\LocalizatonOption.cs
+
IO\FileSystemEntryInfo.cs
+
+ IO\FileSystemEntryType.cs
+
+
+ IO\IIsoMount.cs
+
IO\IZipClient.cs
Library\PlayAccess.cs
+
+ LiveTv\BaseTimerInfoDto.cs
+
LiveTv\ChannelInfoDto.cs
@@ -301,18 +451,45 @@
LiveTv\ChannelType.cs
+
+ LiveTv\DayPattern.cs
+
+
+ LiveTv\GuideInfo.cs
+
+
+ LiveTv\LiveTvInfo.cs
+
LiveTv\LiveTvServiceInfo.cs
+
+ LiveTv\LiveTvServiceStatus.cs
+
+
+ LiveTv\LiveTvTunerInfoDto.cs
+
+
+ LiveTv\LiveTvTunerStatus.cs
+
+
+ LiveTv\ProgramAudio.cs
+
LiveTv\ProgramInfoDto.cs
LiveTv\ProgramQuery.cs
+
+ LiveTv\RecommendedProgramQuery.cs
+
LiveTv\RecordingGroupDto.cs
+
+ LiveTv\RecordingGroupQuery.cs
+
LiveTv\RecordingInfoDto.cs
@@ -325,9 +502,15 @@
LiveTv\SeriesTimerInfoDto.cs
+
+ LiveTv\SeriesTimerQuery.cs
+
LiveTv\TimerInfoDto.cs
+
+ LiveTv\TimerQuery.cs
+
Logging\ILogger.cs
@@ -340,15 +523,27 @@
Logging\NullLogger.cs
+
+ MediaInfo\AudioCodec.cs
+
MediaInfo\BlurayDiscInfo.cs
-
- MediaInfo\Constants.cs
+
+ MediaInfo\Container.cs
MediaInfo\IBlurayExaminer.cs
+
+ MediaInfo\SubtitleFormat.cs
+
+
+ MediaInfo\TransportStreamTimestamp.cs
+
+
+ MediaInfo\VideoCodec.cs
+
Net\HttpException.cs
@@ -367,9 +562,15 @@
Net\WebSocketState.cs
+
+ News\NewsChannel.cs
+
News\NewsItem.cs
+
+ News\NewsQuery.cs
+
Notifications\Notification.cs
@@ -379,12 +580,21 @@
Notifications\NotificationQuery.cs
+
+ Notifications\NotificationRequest.cs
+
Notifications\NotificationResult.cs
+
+ Notifications\NotificationServiceInfo.cs
+
Notifications\NotificationsSummary.cs
+
+ Notifications\NotificationTypeInfo.cs
+
Plugins\BasePluginConfiguration.cs
@@ -394,12 +604,18 @@
Providers\ExternalIdInfo.cs
+
+ Providers\ExternalUrl.cs
+
Providers\ImageProviderInfo.cs
Providers\RemoteImageInfo.cs
+
+ Providers\RemoteImageQuery.cs
+
Providers\RemoteImageResult.cs
@@ -409,6 +625,9 @@
Providers\RemoteSubtitleInfo.cs
+
+ Querying\AllThemeMediaResult.cs
+
Querying\ArtistsQuery.cs
@@ -445,14 +664,23 @@
Querying\QueryResult.cs
+
+ Querying\SeasonQuery.cs
+
Querying\SessionQuery.cs
+
+ Querying\SimilarItemsByNameQuery.cs
+
Querying\SimilarItemsQuery.cs
-
- Querying\ThemeSongsResult.cs
+
+ Querying\ThemeMediaResult.cs
+
+
+ Querying\UpcomingEpisodesQuery.cs
Querying\UserQuery.cs
@@ -475,14 +703,35 @@
Session\BrowseRequest.cs
+
+ Session\ClientCapabilities.cs
+
Session\GeneralCommand.cs
+
+ Session\GeneralCommandType.cs
+
Session\MessageCommand.cs
-
- Session\PlaybackReports.cs
+
+ Session\PlaybackProgressInfo.cs
+
+
+ Session\PlaybackStartInfo.cs
+
+
+ Session\PlaybackStopInfo.cs
+
+
+ Session\PlayCommand.cs
+
+
+ Session\PlayerStateInfo.cs
+
+
+ Session\PlayMethod.cs
Session\PlayRequest.cs
@@ -490,12 +739,18 @@
Session\PlaystateCommand.cs
+
+ Session\PlaystateRequest.cs
+
Session\SessionCapabilities.cs
Session\SessionInfoDto.cs
+
+ Session\SessionUserInfo.cs
+
Session\UserDataChangeInfo.cs
@@ -523,6 +778,9 @@
Themes\AppTheme.cs
+
+ Themes\AppThemeInfo.cs
+
Themes\ThemeImage.cs
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
similarity index 76%
rename from MediaBrowser.Model/ApiClient/ServerEventArgs.cs
rename to MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
index ad0defe686..ce518a7ccc 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs
@@ -20,12 +20,4 @@ namespace MediaBrowser.Model.ApiClient
/// The type of the known command.
public GeneralCommandType? KnownCommandType { get; set; }
}
-
- ///
- /// Class SessionUpdatesEventArgs
- ///
- public class SessionUpdatesEventArgs : EventArgs
- {
- public SessionInfoDto[] Sessions { get; set; }
- }
}
diff --git a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs
new file mode 100644
index 0000000000..483ee45d00
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs
@@ -0,0 +1,13 @@
+using System;
+using MediaBrowser.Model.Session;
+
+namespace MediaBrowser.Model.ApiClient
+{
+ ///
+ /// Class SessionUpdatesEventArgs
+ ///
+ public class SessionUpdatesEventArgs : EventArgs
+ {
+ public SessionInfoDto[] Sessions { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelItemQuery.cs b/MediaBrowser.Model/Channels/ChannelItemQuery.cs
new file mode 100644
index 0000000000..2da955e885
--- /dev/null
+++ b/MediaBrowser.Model/Channels/ChannelItemQuery.cs
@@ -0,0 +1,48 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.Channels
+{
+ public class ChannelItemQuery
+ {
+ ///
+ /// Gets or sets the channel identifier.
+ ///
+ /// The channel identifier.
+ public string ChannelId { get; set; }
+
+ ///
+ /// Gets or sets the category identifier.
+ ///
+ /// The category identifier.
+ public string CategoryId { 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; }
+
+ public SortOrder? SortOrder { get; set; }
+ public string[] SortBy { get; set; }
+ public ItemFilter[] Filters { get; set; }
+
+ public ChannelItemQuery()
+ {
+ Filters = new ItemFilter[] { };
+ SortBy = new string[] { };
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index e09769b00f..7c3f76fda9 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,7 +1,4 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
{
public class ChannelQuery
{
@@ -23,47 +20,4 @@ namespace MediaBrowser.Model.Channels
/// The limit.
public int? Limit { get; set; }
}
-
- public class ChannelItemQuery
- {
- ///
- /// Gets or sets the channel identifier.
- ///
- /// The channel identifier.
- public string ChannelId { get; set; }
-
- ///
- /// Gets or sets the category identifier.
- ///
- /// The category identifier.
- public string CategoryId { 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; }
-
- public SortOrder? SortOrder { get; set; }
- public string[] SortBy { get; set; }
- public ItemFilter[] Filters { get; set; }
-
- public ChannelItemQuery()
- {
- Filters = new ItemFilter[] { };
- SortBy = new string[] { };
- }
- }
}
diff --git a/MediaBrowser.Model/Configuration/EncodingQuality.cs b/MediaBrowser.Model/Configuration/EncodingQuality.cs
new file mode 100644
index 0000000000..ba5a1f279a
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/EncodingQuality.cs
@@ -0,0 +1,10 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public enum EncodingQuality
+ {
+ Auto,
+ HighSpeed,
+ HighQuality,
+ MaxQuality
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ImageOption.cs b/MediaBrowser.Model/Configuration/ImageOption.cs
new file mode 100644
index 0000000000..ade0af83ed
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/ImageOption.cs
@@ -0,0 +1,29 @@
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.Configuration
+{
+ public class ImageOption
+ {
+ ///
+ /// Gets or sets the type.
+ ///
+ /// The type.
+ public ImageType Type { get; set; }
+ ///
+ /// Gets or sets the limit.
+ ///
+ /// The limit.
+ public int Limit { get; set; }
+
+ ///
+ /// Gets or sets the minimum width.
+ ///
+ /// The minimum width.
+ public int MinWidth { get; set; }
+
+ public ImageOption()
+ {
+ Limit = 1;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
new file mode 100644
index 0000000000..611678e67f
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public enum ImageSavingConvention
+ {
+ Legacy,
+ Compatible
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs
new file mode 100644
index 0000000000..ae8aeb200e
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/LiveTvOptions.cs
@@ -0,0 +1,7 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public class LiveTvOptions
+ {
+ public int? GuideDays { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index 7b2bcc178c..88fa486f97 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -74,29 +74,4 @@ namespace MediaBrowser.Model.Configuration
return !DisabledMetadataSavers.Contains(name, StringComparer.OrdinalIgnoreCase);
}
}
-
- public class ImageOption
- {
- ///
- /// Gets or sets the type.
- ///
- /// The type.
- public ImageType Type { get; set; }
- ///
- /// Gets or sets the limit.
- ///
- /// The limit.
- public int Limit { get; set; }
-
- ///
- /// Gets or sets the minimum width.
- ///
- /// The minimum width.
- public int MinWidth { get; set; }
-
- public ImageOption()
- {
- Limit = 1;
- }
- }
}
diff --git a/MediaBrowser.Model/Configuration/MetadataPlugin.cs b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
index b019cf71a1..f3e0ce1064 100644
--- a/MediaBrowser.Model/Configuration/MetadataPlugin.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
@@ -1,7 +1,4 @@
-using MediaBrowser.Model.Entities;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
{
public class MetadataPlugin
{
@@ -17,44 +14,4 @@ namespace MediaBrowser.Model.Configuration
/// The type.
public MetadataPluginType Type { get; set; }
}
-
- public class MetadataPluginSummary
- {
- ///
- /// Gets or sets the type of the item.
- ///
- /// The type of the item.
- public string ItemType { get; set; }
-
- ///
- /// Gets or sets the plugins.
- ///
- /// The plugins.
- public List Plugins { get; set; }
-
- ///
- /// Gets or sets the supported image types.
- ///
- /// The supported image types.
- public List SupportedImageTypes { get; set; }
-
- public MetadataPluginSummary()
- {
- SupportedImageTypes = new List();
- Plugins = new List();
- }
- }
-
- ///
- /// Enum MetadataPluginType
- ///
- public enum MetadataPluginType
- {
- LocalImageProvider,
- ImageFetcher,
- ImageSaver,
- LocalMetadataProvider,
- MetadataFetcher,
- MetadataSaver
- }
}
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
new file mode 100644
index 0000000000..90b3933eb9
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.Configuration
+{
+ public class MetadataPluginSummary
+ {
+ ///
+ /// Gets or sets the type of the item.
+ ///
+ /// The type of the item.
+ public string ItemType { get; set; }
+
+ ///
+ /// Gets or sets the plugins.
+ ///
+ /// The plugins.
+ public List Plugins { get; set; }
+
+ ///
+ /// Gets or sets the supported image types.
+ ///
+ /// The supported image types.
+ public List SupportedImageTypes { get; set; }
+
+ public MetadataPluginSummary()
+ {
+ SupportedImageTypes = new List();
+ Plugins = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginType.cs b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
new file mode 100644
index 0000000000..95ca3b2e6a
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
@@ -0,0 +1,15 @@
+namespace MediaBrowser.Model.Configuration
+{
+ ///
+ /// Enum MetadataPluginType
+ ///
+ public enum MetadataPluginType
+ {
+ LocalImageProvider,
+ ImageFetcher,
+ ImageSaver,
+ LocalMetadataProvider,
+ MetadataFetcher,
+ MetadataSaver
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/NotificationOption.cs b/MediaBrowser.Model/Configuration/NotificationOption.cs
new file mode 100644
index 0000000000..5fcf3550c9
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/NotificationOption.cs
@@ -0,0 +1,54 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public class NotificationOption
+ {
+ public string Type { get; set; }
+
+ ///
+ /// User Ids to not monitor (it's opt out)
+ ///
+ public string[] DisabledMonitorUsers { get; set; }
+
+ ///
+ /// User Ids to send to (if SendToUserMode == Custom)
+ ///
+ public string[] SendToUsers { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this is enabled.
+ ///
+ /// true if enabled; otherwise, false.
+ public bool Enabled { get; set; }
+
+ ///
+ /// Gets or sets the title format string.
+ ///
+ /// The title format string.
+ public string Title { get; set; }
+
+ ///
+ /// Gets or sets the description.
+ ///
+ /// The description.
+ public string Description { get; set; }
+
+ ///
+ /// Gets or sets the disabled services.
+ ///
+ /// The disabled services.
+ public string[] DisabledServices { get; set; }
+
+ ///
+ /// Gets or sets the send to user mode.
+ ///
+ /// The send to user mode.
+ public SendToUserType SendToUserMode { get; set; }
+
+ public NotificationOption()
+ {
+ DisabledServices = new string[] { };
+ DisabledMonitorUsers = new string[] { };
+ SendToUsers = new string[] { };
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs
index fedc1c2f80..7034bd39eb 100644
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ b/MediaBrowser.Model/Configuration/NotificationOptions.cs
@@ -118,80 +118,4 @@ namespace MediaBrowser.Model.Configuration
return false;
}
}
-
- public class NotificationOption
- {
- public string Type { get; set; }
-
- ///
- /// User Ids to not monitor (it's opt out)
- ///
- public string[] DisabledMonitorUsers { get; set; }
-
- ///
- /// User Ids to send to (if SendToUserMode == Custom)
- ///
- public string[] SendToUsers { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this is enabled.
- ///
- /// true if enabled; otherwise, false.
- public bool Enabled { get; set; }
-
- ///
- /// Gets or sets the title format string.
- ///
- /// The title format string.
- public string Title { get; set; }
-
- ///
- /// Gets or sets the description.
- ///
- /// The description.
- public string Description { get; set; }
-
- ///
- /// Gets or sets the disabled services.
- ///
- /// The disabled services.
- public string[] DisabledServices { get; set; }
-
- ///
- /// Gets or sets the send to user mode.
- ///
- /// The send to user mode.
- public SendToUserType SendToUserMode { get; set; }
-
- public NotificationOption()
- {
- DisabledServices = new string[] { };
- DisabledMonitorUsers = new string[] { };
- SendToUsers = new string[] { };
- }
- }
-
- public enum NotificationType
- {
- ApplicationUpdateAvailable,
- ApplicationUpdateInstalled,
- AudioPlayback,
- GamePlayback,
- InstallationFailed,
- PluginError,
- PluginInstalled,
- PluginUpdateInstalled,
- PluginUninstalled,
- NewLibraryContent,
- ServerRestartRequired,
- TaskFailed,
- VideoPlayback
- }
-
- public enum SendToUserType
- {
- All = 0,
- Admins = 1,
- Custom = 2
- }
}
diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs
new file mode 100644
index 0000000000..eaafb651ce
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/NotificationType.cs
@@ -0,0 +1,19 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public enum NotificationType
+ {
+ ApplicationUpdateAvailable,
+ ApplicationUpdateInstalled,
+ AudioPlayback,
+ GamePlayback,
+ InstallationFailed,
+ PluginError,
+ PluginInstalled,
+ PluginUpdateInstalled,
+ PluginUninstalled,
+ NewLibraryContent,
+ ServerRestartRequired,
+ TaskFailed,
+ VideoPlayback
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/PathSubstitution.cs b/MediaBrowser.Model/Configuration/PathSubstitution.cs
new file mode 100644
index 0000000000..576dd2d5ae
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/PathSubstitution.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public class PathSubstitution
+ {
+ public string From { get; set; }
+ public string To { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/SendToUserType.cs b/MediaBrowser.Model/Configuration/SendToUserType.cs
new file mode 100644
index 0000000000..a2eac4c2d9
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/SendToUserType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public enum SendToUserType
+ {
+ All = 0,
+ Admins = 1,
+ Custom = 2
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index b2c499b9a9..36598b2453 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -290,48 +290,4 @@ namespace MediaBrowser.Model.Configuration
SubtitleOptions = new SubtitleOptions();
}
}
-
- public enum ImageSavingConvention
- {
- Legacy,
- Compatible
- }
-
- public enum EncodingQuality
- {
- Auto,
- HighSpeed,
- HighQuality,
- MaxQuality
- }
-
- public class LiveTvOptions
- {
- public int? GuideDays { get; set; }
- }
-
- public class PathSubstitution
- {
- public string From { get; set; }
- public string To { get; set; }
- }
-
- public class SubtitleOptions
- {
- public bool SkipIfGraphicalSubtitlesPresent { get; set; }
- public bool SkipIfAudioTrackMatches { get; set; }
- public string[] DownloadLanguages { get; set; }
- public bool DownloadMovieSubtitles { get; set; }
- public bool DownloadEpisodeSubtitles { get; set; }
-
- public string OpenSubtitlesUsername { get; set; }
- public string OpenSubtitlesPasswordHash { get; set; }
-
- public SubtitleOptions()
- {
- DownloadLanguages = new string[] { };
-
- SkipIfAudioTrackMatches = true;
- }
- }
}
diff --git a/MediaBrowser.Model/Configuration/SubtitleOptions.cs b/MediaBrowser.Model/Configuration/SubtitleOptions.cs
new file mode 100644
index 0000000000..96e04e5115
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/SubtitleOptions.cs
@@ -0,0 +1,21 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public class SubtitleOptions
+ {
+ public bool SkipIfGraphicalSubtitlesPresent { get; set; }
+ public bool SkipIfAudioTrackMatches { get; set; }
+ public string[] DownloadLanguages { get; set; }
+ public bool DownloadMovieSubtitles { get; set; }
+ public bool DownloadEpisodeSubtitles { get; set; }
+
+ public string OpenSubtitlesUsername { get; set; }
+ public string OpenSubtitlesPasswordHash { get; set; }
+
+ public SubtitleOptions()
+ {
+ DownloadLanguages = new string[] { };
+
+ SkipIfAudioTrackMatches = true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/AutoOrganize.cs b/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs
similarity index 100%
rename from MediaBrowser.Model/Configuration/AutoOrganize.cs
rename to MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs
diff --git a/MediaBrowser.Model/Configuration/UnratedItem.cs b/MediaBrowser.Model/Configuration/UnratedItem.cs
new file mode 100644
index 0000000000..1082d684b0
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/UnratedItem.cs
@@ -0,0 +1,16 @@
+namespace MediaBrowser.Model.Configuration
+{
+ public enum UnratedItem
+ {
+ Movie,
+ Trailer,
+ Series,
+ Music,
+ Game,
+ Book,
+ LiveTvChannel,
+ LiveTvProgram,
+ ChannelContent,
+ Other
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index f8df194362..2658e89732 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -79,18 +79,4 @@ namespace MediaBrowser.Model.Configuration
BlockUnratedItems = new UnratedItem[] { };
}
}
-
- public enum UnratedItem
- {
- Movie,
- Trailer,
- Series,
- Music,
- Game,
- Book,
- LiveTvChannel,
- LiveTvProgram,
- ChannelContent,
- Other
- }
}
diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
new file mode 100644
index 0000000000..d04133a3d9
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
+
+namespace MediaBrowser.Model.Dlna
+{
+ ///
+ /// Class AudioOptions.
+ ///
+ public class AudioOptions
+ {
+ public string ItemId { get; set; }
+ public List MediaSources { get; set; }
+ public DeviceProfile Profile { get; set; }
+
+ ///
+ /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
+ ///
+ public string MediaSourceId { get; set; }
+
+ public string DeviceId { get; set; }
+
+ ///
+ /// Allows an override of supported number of audio channels
+ /// Example: DeviceProfile supports five channel, but user only has stereo speakers
+ ///
+ public int? MaxAudioChannels { get; set; }
+
+ ///
+ /// The application's configured quality setting
+ ///
+ public int? MaxBitrate { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 2b04b7fdb7..7d7e0057eb 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -32,56 +32,4 @@ namespace MediaBrowser.Model.Dlna
return codecs.Count == 0 || codecs.Contains(codec, StringComparer.OrdinalIgnoreCase);
}
}
-
- public enum CodecType
- {
- Video = 0,
- VideoAudio = 1,
- Audio = 2
- }
-
- public class ProfileCondition
- {
- [XmlAttribute("condition")]
- public ProfileConditionType Condition { get; set; }
-
- [XmlAttribute("property")]
- public ProfileConditionValue Property { get; set; }
-
- [XmlAttribute("value")]
- public string Value { get; set; }
-
- [XmlAttribute("isRequired")]
- public bool IsRequired { get; set; }
-
- public ProfileCondition()
- {
- IsRequired = true;
- }
- }
-
- public enum ProfileConditionType
- {
- Equals = 0,
- NotEquals = 1,
- LessThanEqual = 2,
- GreaterThanEqual = 3
- }
-
- public enum ProfileConditionValue
- {
- AudioChannels,
- AudioBitrate,
- AudioProfile,
- Width,
- Height,
- Has64BitOffsets,
- PacketLength,
- VideoBitDepth,
- VideoBitrate,
- VideoFramerate,
- VideoLevel,
- VideoProfile,
- VideoTimestamp
- }
}
diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
new file mode 100644
index 0000000000..415cae7acf
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum CodecType
+ {
+ Video = 0,
+ VideoAudio = 1,
+ Audio = 2
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
index 87cf000b1a..97f4409daf 100644
--- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs
+++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
@@ -1,6 +1,4 @@
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
{
public class DeviceIdentification
{
@@ -60,23 +58,4 @@ namespace MediaBrowser.Model.Dlna
Headers = new HttpHeaderInfo[] {};
}
}
-
- public class HttpHeaderInfo
- {
- [XmlAttribute("name")]
- public string Name { get; set; }
-
- [XmlAttribute("value")]
- public string Value { get; set; }
-
- [XmlAttribute("match")]
- public HeaderMatchType Match { get; set; }
- }
-
- public enum HeaderMatchType
- {
- Equals = 0,
- Regex = 1,
- Substring = 2
- }
}
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index ceb27386c1..b2afdf2924 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -21,10 +21,4 @@ namespace MediaBrowser.Model.Dlna
/// The type.
public DeviceProfileType Type { get; set; }
}
-
- public enum DeviceProfileType
- {
- System = 0,
- User = 1
- }
}
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileType.cs b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
new file mode 100644
index 0000000000..f881a45395
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum DeviceProfileType
+ {
+ System = 0,
+ User = 1
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index e195c94507..5cfcafca42 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -33,20 +33,4 @@ namespace MediaBrowser.Model.Dlna
return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList();
}
}
-
- public class XmlAttribute
- {
- [XmlAttribute("name")]
- public string Name { get; set; }
-
- [XmlAttribute("value")]
- public string Value { get; set; }
- }
-
- public enum DlnaProfileType
- {
- Audio = 0,
- Video = 1,
- Photo = 2
- }
}
diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs
new file mode 100644
index 0000000000..23859312dc
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace MediaBrowser.Model.Dlna
+{
+ [Flags]
+ public enum DlnaFlags : ulong
+ {
+ BackgroundTransferMode = (1 << 22),
+ ByteBasedSeek = (1 << 29),
+ ConnectionStall = (1 << 21),
+ DlnaV15 = (1 << 20),
+ InteractiveTransferMode = (1 << 23),
+ PlayContainer = (1 << 28),
+ RtspPause = (1 << 25),
+ S0Increase = (1 << 27),
+ SenderPaced = (1L << 31),
+ SnIncrease = (1 << 26),
+ StreamingTransferMode = (1 << 24),
+ TimeBasedSeek = (1 << 30)
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs
index d2871474ad..0a4069d8f5 100644
--- a/MediaBrowser.Model/Dlna/DlnaMaps.cs
+++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
{
public class DlnaMaps
{
@@ -55,21 +53,4 @@ namespace MediaBrowser.Model.Dlna
return orgOp;
}
}
-
- [Flags]
- public enum DlnaFlags : ulong
- {
- BackgroundTransferMode = (1 << 22),
- ByteBasedSeek = (1 << 29),
- ConnectionStall = (1 << 21),
- DlnaV15 = (1 << 20),
- InteractiveTransferMode = (1 << 23),
- PlayContainer = (1 << 28),
- RtspPause = (1 << 25),
- S0Increase = (1 << 27),
- SenderPaced = (1L << 31),
- SnIncrease = (1 << 26),
- StreamingTransferMode = (1 << 24),
- TimeBasedSeek = (1 << 30)
- }
}
diff --git a/MediaBrowser.Model/Dlna/DlnaProfileType.cs b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
new file mode 100644
index 0000000000..1bad14081a
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum DlnaProfileType
+ {
+ Audio = 0,
+ Video = 1,
+ Photo = 2
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/HeaderMatchType.cs b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
new file mode 100644
index 0000000000..7a0d5c24f9
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum HeaderMatchType
+ {
+ Equals = 0,
+ Regex = 1,
+ Substring = 2
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
new file mode 100644
index 0000000000..926963ef67
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
@@ -0,0 +1,16 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+ public class HttpHeaderInfo
+ {
+ [XmlAttribute("name")]
+ public string Name { get; set; }
+
+ [XmlAttribute("value")]
+ public string Value { get; set; }
+
+ [XmlAttribute("match")]
+ public HeaderMatchType Match { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs
new file mode 100644
index 0000000000..24733426c8
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs
@@ -0,0 +1,24 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+ public class ProfileCondition
+ {
+ [XmlAttribute("condition")]
+ public ProfileConditionType Condition { get; set; }
+
+ [XmlAttribute("property")]
+ public ProfileConditionValue Property { get; set; }
+
+ [XmlAttribute("value")]
+ public string Value { get; set; }
+
+ [XmlAttribute("isRequired")]
+ public bool IsRequired { get; set; }
+
+ public ProfileCondition()
+ {
+ IsRequired = true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
new file mode 100644
index 0000000000..22156c47d7
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
@@ -0,0 +1,10 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum ProfileConditionType
+ {
+ Equals = 0,
+ NotEquals = 1,
+ LessThanEqual = 2,
+ GreaterThanEqual = 3
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
new file mode 100644
index 0000000000..56a322f5ad
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -0,0 +1,19 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum ProfileConditionValue
+ {
+ AudioChannels,
+ AudioBitrate,
+ AudioProfile,
+ Width,
+ Height,
+ Has64BitOffsets,
+ PacketLength,
+ VideoBitDepth,
+ VideoBitrate,
+ VideoFramerate,
+ VideoLevel,
+ VideoProfile,
+ VideoTimestamp
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index d3f8b83322..bb4221b513 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -37,13 +37,4 @@ namespace MediaBrowser.Model.Dlna
}
}
}
-
- public enum SearchType
- {
- Unknown = 0,
- Audio = 1,
- Image = 2,
- Video = 3,
- Playlist = 4
- }
}
diff --git a/MediaBrowser.Model/Dlna/SearchType.cs b/MediaBrowser.Model/Dlna/SearchType.cs
new file mode 100644
index 0000000000..68c047603d
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/SearchType.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum SearchType
+ {
+ Unknown = 0,
+ Audio = 1,
+ Image = 2,
+ Video = 3,
+ Playlist = 4
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index ae9806f974..9af3689b22 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -403,47 +403,4 @@ namespace MediaBrowser.Model.Dlna
}
}
}
-
- ///
- /// Class AudioOptions.
- ///
- public class AudioOptions
- {
- public string ItemId { get; set; }
- public List MediaSources { get; set; }
- public DeviceProfile Profile { get; set; }
-
- ///
- /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
- ///
- public string MediaSourceId { get; set; }
-
- public string DeviceId { get; set; }
-
- ///
- /// Allows an override of supported number of audio channels
- /// Example: DeviceProfile supports five channel, but user only has stereo speakers
- ///
- public int? MaxAudioChannels { get; set; }
-
- ///
- /// The application's configured quality setting
- ///
- public int? MaxBitrate { get; set; }
- }
-
- ///
- /// Class VideoOptions.
- ///
- public class VideoOptions : AudioOptions
- {
- public int? AudioStreamIndex { get; set; }
- public int? SubtitleStreamIndex { get; set; }
- public int? MaxAudioTranscodingBitrate { get; set; }
-
- public VideoOptions()
- {
- MaxAudioTranscodingBitrate = 128000;
- }
- }
}
diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
new file mode 100644
index 0000000000..564ce5c605
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+ public enum TranscodeSeekInfo
+ {
+ Auto = 0,
+ Bytes = 1
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index ba02e9be25..162d62718a 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -38,10 +38,4 @@ namespace MediaBrowser.Model.Dlna
return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList();
}
}
-
- public enum TranscodeSeekInfo
- {
- Auto = 0,
- Bytes = 1
- }
}
diff --git a/MediaBrowser.Model/Dlna/VideoOptions.cs b/MediaBrowser.Model/Dlna/VideoOptions.cs
new file mode 100644
index 0000000000..39a5ab1b1c
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/VideoOptions.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Dlna
+{
+ ///
+ /// Class VideoOptions.
+ ///
+ public class VideoOptions : AudioOptions
+ {
+ public int? AudioStreamIndex { get; set; }
+ public int? SubtitleStreamIndex { get; set; }
+ public int? MaxAudioTranscodingBitrate { get; set; }
+
+ public VideoOptions()
+ {
+ MaxAudioTranscodingBitrate = 128000;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/XmlAttribute.cs b/MediaBrowser.Model/Dlna/XmlAttribute.cs
new file mode 100644
index 0000000000..e8e13ba0de
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/XmlAttribute.cs
@@ -0,0 +1,13 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+ public class XmlAttribute
+ {
+ [XmlAttribute("name")]
+ public string Name { get; set; }
+
+ [XmlAttribute("value")]
+ public string Value { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs
index ae483b6f67..7f679a826b 100644
--- a/MediaBrowser.Model/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-
-namespace MediaBrowser.Model.Drawing
+namespace MediaBrowser.Model.Drawing
{
///
/// Class DrawingUtils
@@ -145,83 +143,4 @@ namespace MediaBrowser.Model.Drawing
return scaleFactor;
}
}
-
- ///
- /// Struct ImageSize
- ///
- public struct ImageSize
- {
- private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
- private double _height;
- private double _width;
-
- ///
- /// Gets or sets the height.
- ///
- /// The height.
- public double Height
- {
- get
- {
- return _height;
- }
- set
- {
- _height = value;
- }
- }
-
- ///
- /// Gets or sets the width.
- ///
- /// The width.
- public double Width
- {
- get { return _width; }
- set { _width = value; }
- }
-
- public bool Equals(ImageSize size)
- {
- return Width.Equals(size.Width) && Height.Equals(size.Height);
- }
-
- public override string ToString()
- {
- return string.Format("{0}-{1}", Width, Height);
- }
-
- public ImageSize(string value)
- {
- _width = 0;
-
- _height = 0;
-
- ParseValue(value);
- }
-
- private void ParseValue(string value)
- {
- if (!string.IsNullOrEmpty(value))
- {
- string[] parts = value.Split('-');
-
- if (parts.Length == 2)
- {
- double val;
-
- if (double.TryParse(parts[0], NumberStyles.Any, UsCulture, out val))
- {
- _width = val;
- }
-
- if (double.TryParse(parts[1], NumberStyles.Any, UsCulture, out val))
- {
- _height = val;
- }
- }
- }
- }
- }
}
diff --git a/MediaBrowser.Model/Drawing/ImageSize.cs b/MediaBrowser.Model/Drawing/ImageSize.cs
new file mode 100644
index 0000000000..acc245938b
--- /dev/null
+++ b/MediaBrowser.Model/Drawing/ImageSize.cs
@@ -0,0 +1,83 @@
+using System.Globalization;
+
+namespace MediaBrowser.Model.Drawing
+{
+ ///
+ /// Struct ImageSize
+ ///
+ public struct ImageSize
+ {
+ private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+ private double _height;
+ private double _width;
+
+ ///
+ /// Gets or sets the height.
+ ///
+ /// The height.
+ public double Height
+ {
+ get
+ {
+ return _height;
+ }
+ set
+ {
+ _height = value;
+ }
+ }
+
+ ///
+ /// Gets or sets the width.
+ ///
+ /// The width.
+ public double Width
+ {
+ get { return _width; }
+ set { _width = value; }
+ }
+
+ public bool Equals(ImageSize size)
+ {
+ return Width.Equals(size.Width) && Height.Equals(size.Height);
+ }
+
+ public override string ToString()
+ {
+ return string.Format("{0}-{1}", Width, Height);
+ }
+
+ public ImageSize(string value)
+ {
+ _width = 0;
+
+ _height = 0;
+
+ ParseValue(value);
+ }
+
+ private void ParseValue(string value)
+ {
+ if (!string.IsNullOrEmpty(value))
+ {
+ string[] parts = value.Split('-');
+
+ if (parts.Length == 2)
+ {
+ double val;
+
+ if (double.TryParse(parts[0], NumberStyles.Any, UsCulture, out val))
+ {
+ _width = val;
+ }
+
+ if (double.TryParse(parts[1], NumberStyles.Any, UsCulture, out val))
+ {
+ _height = val;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs
index 3ec6419184..af46d29b9f 100644
--- a/MediaBrowser.Model/Dto/IItemDto.cs
+++ b/MediaBrowser.Model/Dto/IItemDto.cs
@@ -18,10 +18,4 @@ namespace MediaBrowser.Model.Dto
/// The original primary image aspect ratio.
double? OriginalPrimaryImageAspectRatio { get; set; }
}
-
- public enum RatingType
- {
- Score,
- Likes
- }
}
diff --git a/MediaBrowser.Model/Dto/MediaVersionInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
similarity index 100%
rename from MediaBrowser.Model/Dto/MediaVersionInfo.cs
rename to MediaBrowser.Model/Dto/MediaSourceInfo.cs
diff --git a/MediaBrowser.Model/Dto/RatingType.cs b/MediaBrowser.Model/Dto/RatingType.cs
new file mode 100644
index 0000000000..f151adce9c
--- /dev/null
+++ b/MediaBrowser.Model/Dto/RatingType.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dto
+{
+ public enum RatingType
+ {
+ Score,
+ Likes
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/RecommendationDto.cs b/MediaBrowser.Model/Dto/RecommendationDto.cs
index 68b71e466b..275f97c281 100644
--- a/MediaBrowser.Model/Dto/RecommendationDto.cs
+++ b/MediaBrowser.Model/Dto/RecommendationDto.cs
@@ -11,19 +11,4 @@ namespace MediaBrowser.Model.Dto
public string CategoryId { get; set; }
}
-
- public enum RecommendationType
- {
- SimilarToRecentlyPlayed = 0,
-
- SimilarToLikedItem = 1,
-
- HasDirectorFromRecentlyPlayed = 2,
-
- HasActorFromRecentlyPlayed = 3,
-
- HasLikedDirector = 4,
-
- HasLikedActor = 5
- }
}
diff --git a/MediaBrowser.Model/Dto/RecommendationType.cs b/MediaBrowser.Model/Dto/RecommendationType.cs
new file mode 100644
index 0000000000..1adf9b0824
--- /dev/null
+++ b/MediaBrowser.Model/Dto/RecommendationType.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Dto
+{
+ public enum RecommendationType
+ {
+ SimilarToRecentlyPlayed = 0,
+
+ SimilarToLikedItem = 1,
+
+ HasDirectorFromRecentlyPlayed = 2,
+
+ HasActorFromRecentlyPlayed = 3,
+
+ HasLikedDirector = 4,
+
+ HasLikedActor = 5
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index 861fa4e01e..9cf301270d 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -1,102 +1,5 @@
namespace MediaBrowser.Model.Dto
{
- ///
- /// Class VideoStreamOptions
- ///
- 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; }
- }
-
///
/// Class StreamOptions
///
@@ -158,19 +61,4 @@
/// The device id.
public string DeviceId { get; set; }
}
-
- public class SubtitleDownloadOptions
- {
- ///
- /// Gets or sets the item identifier.
- ///
- /// The item identifier.
- public string ItemId { get; set; }
-
- ///
- /// Gets or sets the index of the stream.
- ///
- /// The index of the stream.
- public int StreamIndex { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs b/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs
new file mode 100644
index 0000000000..a0b49f42cc
--- /dev/null
+++ b/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Dto
+{
+ public class SubtitleDownloadOptions
+ {
+ ///
+ /// Gets or sets the item identifier.
+ ///
+ /// The item identifier.
+ public string ItemId { get; set; }
+
+ ///
+ /// Gets or sets the index of the stream.
+ ///
+ /// The index of the stream.
+ public int StreamIndex { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs
new file mode 100644
index 0000000000..73dc700185
--- /dev/null
+++ b/MediaBrowser.Model/Dto/VideoStreamOptions.cs
@@ -0,0 +1,99 @@
+namespace MediaBrowser.Model.Dto
+{
+ ///
+ /// Class VideoStreamOptions
+ ///
+ 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/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 62233ac275..2fdab9799e 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -122,34 +122,4 @@ namespace MediaBrowser.Model.Entities
PrimaryImageHeight = Convert.ToInt32(size.Height);
}
}
-
- ///
- /// Enum ScrollDirection
- ///
- public enum ScrollDirection
- {
- ///
- /// The horizontal
- ///
- Horizontal,
- ///
- /// The vertical
- ///
- Vertical
- }
-
- ///
- /// Enum SortOrder
- ///
- public enum SortOrder
- {
- ///
- /// The ascending
- ///
- Ascending,
- ///
- /// The descending
- ///
- Descending
- }
}
diff --git a/MediaBrowser.Model/Entities/RequestResult.cs b/MediaBrowser.Model/Entities/EmptyRequestResult.cs
similarity index 100%
rename from MediaBrowser.Model/Entities/RequestResult.cs
rename to MediaBrowser.Model/Entities/EmptyRequestResult.cs
diff --git a/MediaBrowser.Model/Entities/IHasProviderIds.cs b/MediaBrowser.Model/Entities/IHasProviderIds.cs
index efb75412f5..796850dbd4 100644
--- a/MediaBrowser.Model/Entities/IHasProviderIds.cs
+++ b/MediaBrowser.Model/Entities/IHasProviderIds.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace MediaBrowser.Model.Entities
{
@@ -14,102 +13,4 @@ namespace MediaBrowser.Model.Entities
/// The provider ids.
Dictionary ProviderIds { get; set; }
}
-
- ///
- /// Class ProviderIdsExtensions
- ///
- public static class ProviderIdsExtensions
- {
- ///
- /// Determines whether [has provider identifier] [the specified instance].
- ///
- /// The instance.
- /// The provider.
- /// true if [has provider identifier] [the specified instance]; otherwise, false.
- public static bool HasProviderId(this IHasProviderIds instance, MetadataProviders provider)
- {
- return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString()));
- }
-
- ///
- /// Gets a provider id
- ///
- /// The instance.
- /// The provider.
- /// System.String.
- public static string GetProviderId(this IHasProviderIds instance, MetadataProviders provider)
- {
- return instance.GetProviderId(provider.ToString());
- }
-
- ///
- /// Gets a provider id
- ///
- /// The instance.
- /// The name.
- /// System.String.
- public static string GetProviderId(this IHasProviderIds instance, string name)
- {
- if (instance == null)
- {
- throw new ArgumentNullException("instance");
- }
-
- if (instance.ProviderIds == null)
- {
- return null;
- }
-
- string id;
- instance.ProviderIds.TryGetValue(name, out id);
- return id;
- }
-
- ///
- /// Sets a provider id
- ///
- /// The instance.
- /// The name.
- /// The value.
- public static void SetProviderId(this IHasProviderIds instance, string name, string value)
- {
- if (instance == null)
- {
- throw new ArgumentNullException("instance");
- }
-
- // If it's null remove the key from the dictionary
- if (string.IsNullOrEmpty(value))
- {
- if (instance.ProviderIds != null)
- {
- if (instance.ProviderIds.ContainsKey(name))
- {
- instance.ProviderIds.Remove(name);
- }
- }
- }
- else
- {
- // Ensure it exists
- if (instance.ProviderIds == null)
- {
- instance.ProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase);
- }
-
- instance.ProviderIds[name] = value;
- }
- }
-
- ///
- /// Sets a provider id
- ///
- /// The instance.
- /// The provider.
- /// The value.
- public static void SetProviderId(this IHasProviderIds instance, MetadataProviders provider, string value)
- {
- instance.SetProviderId(provider.ToString(), value);
- }
- }
}
diff --git a/MediaBrowser.Model/Entities/IsoType.cs b/MediaBrowser.Model/Entities/IsoType.cs
new file mode 100644
index 0000000000..567b98ab9a
--- /dev/null
+++ b/MediaBrowser.Model/Entities/IsoType.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Entities
+{
+ ///
+ /// Enum IsoType
+ ///
+ public enum IsoType
+ {
+ ///
+ /// The DVD
+ ///
+ Dvd,
+ ///
+ /// The blu ray
+ ///
+ BluRay
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MediaInfo.cs b/MediaBrowser.Model/Entities/MediaInfo.cs
new file mode 100644
index 0000000000..ef26cfa148
--- /dev/null
+++ b/MediaBrowser.Model/Entities/MediaInfo.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Entities
+{
+ public class MediaInfo
+ {
+ ///
+ /// Gets or sets the media streams.
+ ///
+ /// The media streams.
+ public List MediaStreams { get; set; }
+
+ ///
+ /// Gets or sets the format.
+ ///
+ /// The format.
+ public string Format { get; set; }
+
+ public int? TotalBitrate { get; set; }
+
+ public MediaInfo()
+ {
+ MediaStreams = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index d54e3c0ef9..66163c1ef7 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Diagnostics;
namespace MediaBrowser.Model.Entities
{
@@ -147,49 +146,4 @@ namespace MediaBrowser.Model.Entities
/// The level.
public double? Level { get; set; }
}
-
- ///
- /// Enum MediaStreamType
- ///
- public enum MediaStreamType
- {
- ///
- /// The audio
- ///
- Audio,
- ///
- /// The video
- ///
- Video,
- ///
- /// The subtitle
- ///
- Subtitle,
- ///
- /// The embedded image
- ///
- EmbeddedImage
- }
-
- public class MediaInfo
- {
- ///
- /// Gets or sets the media streams.
- ///
- /// The media streams.
- public List MediaStreams { get; set; }
-
- ///
- /// Gets or sets the format.
- ///
- /// The format.
- public string Format { get; set; }
-
- public int? TotalBitrate { get; set; }
-
- public MediaInfo()
- {
- MediaStreams = new List();
- }
- }
}
diff --git a/MediaBrowser.Model/Entities/MediaStreamType.cs b/MediaBrowser.Model/Entities/MediaStreamType.cs
new file mode 100644
index 0000000000..084a411f9c
--- /dev/null
+++ b/MediaBrowser.Model/Entities/MediaStreamType.cs
@@ -0,0 +1,25 @@
+namespace MediaBrowser.Model.Entities
+{
+ ///
+ /// Enum MediaStreamType
+ ///
+ public enum MediaStreamType
+ {
+ ///
+ /// The audio
+ ///
+ Audio,
+ ///
+ /// The video
+ ///
+ Video,
+ ///
+ /// The subtitle
+ ///
+ Subtitle,
+ ///
+ /// The embedded image
+ ///
+ EmbeddedImage
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs
index 857e91fec5..9aa7207ed1 100644
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -8,10 +8,4 @@ namespace MediaBrowser.Model.Entities
public VideoSize? VideoSize { get; set; }
public bool IsDirectLink { get; set; }
}
-
- public enum VideoSize
- {
- StandardDefinition,
- HighDefinition
- }
}
diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
index c350935f40..52500a41ea 100644
--- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs
+++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace MediaBrowser.Model.Entities
{
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
new file mode 100644
index 0000000000..e10232baa9
--- /dev/null
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Entities
+{
+ ///
+ /// Class ProviderIdsExtensions
+ ///
+ public static class ProviderIdsExtensions
+ {
+ ///
+ /// Determines whether [has provider identifier] [the specified instance].
+ ///
+ /// The instance.
+ /// The provider.
+ /// true if [has provider identifier] [the specified instance]; otherwise, false.
+ public static bool HasProviderId(this IHasProviderIds instance, MetadataProviders provider)
+ {
+ return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString()));
+ }
+
+ ///
+ /// Gets a provider id
+ ///
+ /// The instance.
+ /// The provider.
+ /// System.String.
+ public static string GetProviderId(this IHasProviderIds instance, MetadataProviders provider)
+ {
+ return instance.GetProviderId(provider.ToString());
+ }
+
+ ///
+ /// Gets a provider id
+ ///
+ /// The instance.
+ /// The name.
+ /// System.String.
+ public static string GetProviderId(this IHasProviderIds instance, string name)
+ {
+ if (instance == null)
+ {
+ throw new ArgumentNullException("instance");
+ }
+
+ if (instance.ProviderIds == null)
+ {
+ return null;
+ }
+
+ string id;
+ instance.ProviderIds.TryGetValue(name, out id);
+ return id;
+ }
+
+ ///
+ /// Sets a provider id
+ ///
+ /// The instance.
+ /// The name.
+ /// The value.
+ public static void SetProviderId(this IHasProviderIds instance, string name, string value)
+ {
+ if (instance == null)
+ {
+ throw new ArgumentNullException("instance");
+ }
+
+ // If it's null remove the key from the dictionary
+ if (string.IsNullOrEmpty(value))
+ {
+ if (instance.ProviderIds != null)
+ {
+ if (instance.ProviderIds.ContainsKey(name))
+ {
+ instance.ProviderIds.Remove(name);
+ }
+ }
+ }
+ else
+ {
+ // Ensure it exists
+ if (instance.ProviderIds == null)
+ {
+ instance.ProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ }
+
+ instance.ProviderIds[name] = value;
+ }
+ }
+
+ ///
+ /// Sets a provider id
+ ///
+ /// The instance.
+ /// The provider.
+ /// The value.
+ public static void SetProviderId(this IHasProviderIds instance, MetadataProviders provider, string value)
+ {
+ instance.SetProviderId(provider.ToString(), value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/ScrollDirection.cs b/MediaBrowser.Model/Entities/ScrollDirection.cs
new file mode 100644
index 0000000000..ed22103003
--- /dev/null
+++ b/MediaBrowser.Model/Entities/ScrollDirection.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Entities
+{
+ ///
+ /// Enum ScrollDirection
+ ///
+ public enum ScrollDirection
+ {
+ ///
+ /// The horizontal
+ ///
+ Horizontal,
+ ///
+ /// The vertical
+ ///
+ Vertical
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/SortOrder.cs b/MediaBrowser.Model/Entities/SortOrder.cs
new file mode 100644
index 0000000000..5130449ba8
--- /dev/null
+++ b/MediaBrowser.Model/Entities/SortOrder.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Entities
+{
+ ///
+ /// Enum SortOrder
+ ///
+ public enum SortOrder
+ {
+ ///
+ /// The ascending
+ ///
+ Ascending,
+ ///
+ /// The descending
+ ///
+ Descending
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/VideoSize.cs b/MediaBrowser.Model/Entities/VideoSize.cs
new file mode 100644
index 0000000000..0100f3b904
--- /dev/null
+++ b/MediaBrowser.Model/Entities/VideoSize.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Entities
+{
+ public enum VideoSize
+ {
+ StandardDefinition,
+ HighDefinition
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs
index b2742add16..aa9a3c55f2 100644
--- a/MediaBrowser.Model/Entities/VideoType.cs
+++ b/MediaBrowser.Model/Entities/VideoType.cs
@@ -27,19 +27,4 @@ namespace MediaBrowser.Model.Entities
///
HdDvd
}
-
- ///
- /// Enum IsoType
- ///
- public enum IsoType
- {
- ///
- /// The DVD
- ///
- Dvd,
- ///
- /// The blu ray
- ///
- BluRay
- }
}
diff --git a/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs
new file mode 100644
index 0000000000..0b12ebc51d
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.FileOrganization
+{
+ public class EpisodeFileOrganizationRequest
+ {
+ public string ResultId { get; set; }
+
+ public string SeriesId { get; set; }
+
+ public int SeasonNumber { get; set; }
+
+ public int EpisodeNumber { get; set; }
+
+ public int? EndingEpisodeNumber { get; set; }
+
+ public bool RememberCorrection { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
index 4a3235a42c..ef9d0ca2ae 100644
--- a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
+++ b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs
@@ -100,18 +100,4 @@ namespace MediaBrowser.Model.FileOrganization
DuplicatePaths = new List();
}
}
-
- public enum FileSortingStatus
- {
- Success,
- Failure,
- SkippedExisting
- }
-
- public enum FileOrganizerType
- {
- Movie,
- Episode,
- Song
- }
}
diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs b/MediaBrowser.Model/FileOrganization/FileOrganizationResultQuery.cs
similarity index 57%
rename from MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs
rename to MediaBrowser.Model/FileOrganization/FileOrganizationResultQuery.cs
index ce57507571..18287534ea 100644
--- a/MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs
+++ b/MediaBrowser.Model/FileOrganization/FileOrganizationResultQuery.cs
@@ -15,19 +15,4 @@ namespace MediaBrowser.Model.FileOrganization
/// The limit.
public int? Limit { get; set; }
}
-
- public class EpisodeFileOrganizationRequest
- {
- public string ResultId { get; set; }
-
- public string SeriesId { get; set; }
-
- public int SeasonNumber { get; set; }
-
- public int EpisodeNumber { get; set; }
-
- public int? EndingEpisodeNumber { get; set; }
-
- public bool RememberCorrection { get; set; }
- }
}
diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs b/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs
new file mode 100644
index 0000000000..cbbeb9ce23
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.FileOrganization
+{
+ public enum FileOrganizerType
+ {
+ Movie,
+ Episode,
+ Song
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs b/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs
new file mode 100644
index 0000000000..8a467c05fb
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.FileOrganization
+{
+ public enum FileSortingStatus
+ {
+ Success,
+ Failure,
+ SkippedExisting
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs
index 9f5f00d80e..16aea8436b 100644
--- a/MediaBrowser.Model/Globalization/CountryInfo.cs
+++ b/MediaBrowser.Model/Globalization/CountryInfo.cs
@@ -30,10 +30,4 @@ namespace MediaBrowser.Model.Globalization
/// The name of the three letter ISO region.
public string ThreeLetterISORegionName { get; set; }
}
-
- public class LocalizatonOption
- {
- public string Name { get; set; }
- public string Value { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Globalization/LocalizatonOption.cs b/MediaBrowser.Model/Globalization/LocalizatonOption.cs
new file mode 100644
index 0000000000..61749cbc36
--- /dev/null
+++ b/MediaBrowser.Model/Globalization/LocalizatonOption.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Globalization
+{
+ public class LocalizatonOption
+ {
+ public string Name { get; set; }
+ public string Value { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
index dc4840456c..f17e2e5c34 100644
--- a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
+++ b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
@@ -24,27 +24,4 @@ namespace MediaBrowser.Model.IO
/// The type.
public FileSystemEntryType Type { get; set; }
}
-
- ///
- /// Enum FileSystemEntryType
- ///
- public enum FileSystemEntryType
- {
- ///
- /// The file
- ///
- File,
- ///
- /// The directory
- ///
- Directory,
- ///
- /// The network computer
- ///
- NetworkComputer,
- ///
- /// The network share
- ///
- NetworkShare
- }
}
diff --git a/MediaBrowser.Model/IO/FileSystemEntryType.cs b/MediaBrowser.Model/IO/FileSystemEntryType.cs
new file mode 100644
index 0000000000..e7c67c6061
--- /dev/null
+++ b/MediaBrowser.Model/IO/FileSystemEntryType.cs
@@ -0,0 +1,25 @@
+namespace MediaBrowser.Model.IO
+{
+ ///
+ /// Enum FileSystemEntryType
+ ///
+ public enum FileSystemEntryType
+ {
+ ///
+ /// The file
+ ///
+ File,
+ ///
+ /// The directory
+ ///
+ Directory,
+ ///
+ /// The network computer
+ ///
+ NetworkComputer,
+ ///
+ /// The network share
+ ///
+ NetworkShare
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
new file mode 100644
index 0000000000..2d88215bb5
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -0,0 +1,108 @@
+using System;
+using System.ComponentModel;
+
+namespace MediaBrowser.Model.LiveTv
+{
+ public class BaseTimerInfoDto : INotifyPropertyChanged
+ {
+ ///
+ /// Occurs when a property value changes.
+ ///
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ ///
+ /// Id of the recording.
+ ///
+ public string Id { get; set; }
+
+ ///
+ /// Gets or sets the external identifier.
+ ///
+ /// The external identifier.
+ public string ExternalId { get; set; }
+
+ ///
+ /// ChannelId of the recording.
+ ///
+ public string ChannelId { get; set; }
+
+ ///
+ /// Gets or sets the external channel identifier.
+ ///
+ /// The external channel identifier.
+ public string ExternalChannelId { get; set; }
+
+ ///
+ /// ChannelName of the recording.
+ ///
+ public string ChannelName { get; set; }
+
+ ///
+ /// Gets or sets the program identifier.
+ ///
+ /// The program identifier.
+ public string ProgramId { get; set; }
+
+ ///
+ /// Gets or sets the external program identifier.
+ ///
+ /// The external program identifier.
+ public string ExternalProgramId { get; set; }
+
+ ///
+ /// Name of the recording.
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// Description of the recording.
+ ///
+ public string Overview { get; set; }
+
+ ///
+ /// The start date of the recording, in UTC.
+ ///
+ public DateTime StartDate { get; set; }
+
+ ///
+ /// The end date of the recording, in UTC.
+ ///
+ public DateTime EndDate { get; set; }
+
+ ///
+ /// Gets or sets the name of the service.
+ ///
+ /// The name of the service.
+ public string ServiceName { get; set; }
+
+ ///
+ /// Gets or sets the priority.
+ ///
+ /// The priority.
+ public int Priority { get; set; }
+
+ ///
+ /// Gets or sets the pre padding seconds.
+ ///
+ /// The pre padding seconds.
+ public int PrePaddingSeconds { get; set; }
+
+ ///
+ /// Gets or sets the post padding seconds.
+ ///
+ /// The post padding seconds.
+ public int PostPaddingSeconds { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is pre padding required.
+ ///
+ /// true if this instance is pre padding required; otherwise, false.
+ public bool IsPrePaddingRequired { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is post padding required.
+ ///
+ /// true if this instance is post padding required; otherwise, false.
+ public bool IsPostPaddingRequired { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/DayPattern.cs b/MediaBrowser.Model/LiveTv/DayPattern.cs
new file mode 100644
index 0000000000..8251795dc3
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/DayPattern.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public enum DayPattern
+ {
+ Daily,
+ Weekdays,
+ Weekends
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/GuideInfo.cs b/MediaBrowser.Model/LiveTv/GuideInfo.cs
new file mode 100644
index 0000000000..c21f6d8717
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/GuideInfo.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace MediaBrowser.Model.LiveTv
+{
+ public class GuideInfo
+ {
+ ///
+ /// Gets or sets the start date.
+ ///
+ /// The start date.
+ public DateTime StartDate { get; set; }
+
+ ///
+ /// Gets or sets the end date.
+ ///
+ /// The end date.
+ public DateTime EndDate { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
new file mode 100644
index 0000000000..dd31c5a6bd
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.LiveTv
+{
+ public class LiveTvInfo
+ {
+ ///
+ /// Gets or sets the services.
+ ///
+ /// The services.
+ public List Services { get; set; }
+
+ ///
+ /// Gets or sets the name of the active service.
+ ///
+ /// The name of the active service.
+ public string ActiveServiceName { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is enabled.
+ ///
+ /// true if this instance is enabled; otherwise, false.
+ public bool IsEnabled { get; set; }
+
+ ///
+ /// Gets or sets the enabled users.
+ ///
+ /// The enabled users.
+ public List EnabledUsers { get; set; }
+
+ ///
+ /// Gets or sets the status.
+ ///
+ /// The status.
+ public LiveTvServiceStatus Status { get; set; }
+
+ ///
+ /// Gets or sets the status message.
+ ///
+ /// The status message.
+ public string StatusMessage { get; set; }
+
+ public LiveTvInfo()
+ {
+ Services = new List();
+ EnabledUsers = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index 85f58be3bc..264870ffbb 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace MediaBrowser.Model.LiveTv
{
@@ -51,140 +50,4 @@ namespace MediaBrowser.Model.LiveTv
Tuners = new List();
}
}
-
- public class GuideInfo
- {
- ///
- /// Gets or sets the start date.
- ///
- /// The start date.
- public DateTime StartDate { get; set; }
-
- ///
- /// Gets or sets the end date.
- ///
- /// The end date.
- public DateTime EndDate { get; set; }
- }
-
- public class LiveTvInfo
- {
- ///
- /// Gets or sets the services.
- ///
- /// The services.
- public List Services { get; set; }
-
- ///
- /// Gets or sets the name of the active service.
- ///
- /// The name of the active service.
- public string ActiveServiceName { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is enabled.
- ///
- /// true if this instance is enabled; otherwise, false.
- public bool IsEnabled { get; set; }
-
- ///
- /// Gets or sets the enabled users.
- ///
- /// The enabled users.
- public List EnabledUsers { get; set; }
-
- ///
- /// Gets or sets the status.
- ///
- /// The status.
- public LiveTvServiceStatus Status { get; set; }
-
- ///
- /// Gets or sets the status message.
- ///
- /// The status message.
- public string StatusMessage { get; set; }
-
- public LiveTvInfo()
- {
- Services = new List();
- EnabledUsers = new List();
- }
- }
-
- public class LiveTvTunerInfoDto
- {
- ///
- /// Gets or sets the type of the source.
- ///
- /// The type of the source.
- public string SourceType { get; set; }
-
- ///
- /// Gets or sets the name.
- ///
- /// The name.
- public string Name { get; set; }
-
- ///
- /// Gets or sets the identifier.
- ///
- /// The identifier.
- public string Id { get; set; }
-
- ///
- /// Gets or sets the status.
- ///
- /// The status.
- public LiveTvTunerStatus Status { get; set; }
-
- ///
- /// Gets or sets the channel identifier.
- ///
- /// The channel identifier.
- public string ChannelId { get; set; }
-
- ///
- /// Gets or sets the name of the channel.
- ///
- /// The name of the channel.
- public string ChannelName { get; set; }
-
- ///
- /// Gets or sets the recording identifier.
- ///
- /// The recording identifier.
- public string RecordingId { get; set; }
-
- ///
- /// Gets or sets the name of the program.
- ///
- /// The name of the program.
- public string ProgramName { get; set; }
-
- ///
- /// Gets or sets the clients.
- ///
- /// The clients.
- public List Clients { get; set; }
-
- public LiveTvTunerInfoDto()
- {
- Clients = new List();
- }
- }
-
- public enum LiveTvServiceStatus
- {
- Ok = 0,
- Unavailable = 1
- }
-
- public enum LiveTvTunerStatus
- {
- Available = 0,
- Disabled = 1,
- RecordingTv = 2,
- LiveTv = 3
- }
}
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs
new file mode 100644
index 0000000000..20fe845003
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public enum LiveTvServiceStatus
+ {
+ Ok = 0,
+ Unavailable = 1
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
new file mode 100644
index 0000000000..28e8c158ae
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.LiveTv
+{
+ public class LiveTvTunerInfoDto
+ {
+ ///
+ /// Gets or sets the type of the source.
+ ///
+ /// The type of the source.
+ public string SourceType { get; set; }
+
+ ///
+ /// Gets or sets the name.
+ ///
+ /// The name.
+ public string Name { get; set; }
+
+ ///
+ /// Gets or sets the identifier.
+ ///
+ /// The identifier.
+ public string Id { get; set; }
+
+ ///
+ /// Gets or sets the status.
+ ///
+ /// The status.
+ public LiveTvTunerStatus Status { get; set; }
+
+ ///
+ /// Gets or sets the channel identifier.
+ ///
+ /// The channel identifier.
+ public string ChannelId { get; set; }
+
+ ///
+ /// Gets or sets the name of the channel.
+ ///
+ /// The name of the channel.
+ public string ChannelName { get; set; }
+
+ ///
+ /// Gets or sets the recording identifier.
+ ///
+ /// The recording identifier.
+ public string RecordingId { get; set; }
+
+ ///
+ /// Gets or sets the name of the program.
+ ///
+ /// The name of the program.
+ public string ProgramName { get; set; }
+
+ ///
+ /// Gets or sets the clients.
+ ///
+ /// The clients.
+ public List Clients { get; set; }
+
+ public LiveTvTunerInfoDto()
+ {
+ Clients = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs
new file mode 100644
index 0000000000..055199fca7
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs
@@ -0,0 +1,10 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public enum LiveTvTunerStatus
+ {
+ Available = 0,
+ Disabled = 1,
+ RecordingTv = 2,
+ LiveTv = 3
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/ProgramAudio.cs b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
new file mode 100644
index 0000000000..902079b9ab
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public enum ProgramAudio
+ {
+ Mono,
+ Stereo,
+ Dolby,
+ DolbyDigital,
+ Thx
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 4e7ab82243..fb931820e5 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -216,13 +216,4 @@ namespace MediaBrowser.Model.LiveTv
public event PropertyChangedEventHandler PropertyChanged;
}
-
- public enum ProgramAudio
- {
- Mono,
- Stereo,
- Dolby,
- DolbyDigital,
- Thx
- }
}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index a2a8249942..36c06d4c08 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -32,31 +32,4 @@ namespace MediaBrowser.Model.LiveTv
ChannelIdList = new string[] { };
}
}
-
- public class RecommendedProgramQuery
- {
- ///
- /// Gets or sets the user identifier.
- ///
- /// The user identifier.
- public string UserId { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is airing.
- ///
- /// true if this instance is airing; otherwise, false.
- public bool? IsAiring { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance has aired.
- ///
- /// null if [has aired] contains no value, true if [has aired]; otherwise, false.
- public bool? HasAired { get; set; }
-
- ///
- /// The maximum number of items to return
- ///
- /// The limit.
- public int? Limit { get; set; }
- }
}
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
new file mode 100644
index 0000000000..907902123e
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -0,0 +1,29 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public class RecommendedProgramQuery
+ {
+ ///
+ /// Gets or sets the user identifier.
+ ///
+ /// The user identifier.
+ public string UserId { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is airing.
+ ///
+ /// true if this instance is airing; otherwise, false.
+ public bool? IsAiring { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance has aired.
+ ///
+ /// null if [has aired] contains no value, true if [has aired]; otherwise, false.
+ public bool? HasAired { get; set; }
+
+ ///
+ /// The maximum number of items to return
+ ///
+ /// The limit.
+ public int? Limit { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs b/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs
new file mode 100644
index 0000000000..8c20e7f3fa
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public class RecordingGroupQuery
+ {
+ ///
+ /// Gets or sets the user identifier.
+ ///
+ /// The user identifier.
+ public string UserId { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 1fa9af49b3..daa137db64 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Model.LiveTv
+namespace MediaBrowser.Model.LiveTv
{
///
/// Class RecordingQuery.
@@ -61,43 +59,4 @@ namespace MediaBrowser.Model.LiveTv
/// The series timer identifier.
public string SeriesTimerId { get; set; }
}
-
- public class RecordingGroupQuery
- {
- ///
- /// Gets or sets the user identifier.
- ///
- /// The user identifier.
- public string UserId { get; set; }
- }
-
- public class TimerQuery
- {
- ///
- /// Gets or sets the channel identifier.
- ///
- /// The channel identifier.
- public string ChannelId { get; set; }
-
- ///
- /// Gets or sets the series timer identifier.
- ///
- /// The series timer identifier.
- public string SeriesTimerId { get; set; }
- }
-
- public class SeriesTimerQuery
- {
- ///
- /// Gets or sets the sort by - SortName, Priority
- ///
- /// The sort by.
- public string SortBy { get; set; }
-
- ///
- /// Gets or sets the sort order.
- ///
- /// The sort order.
- public SortOrder SortOrder { get; set; }
- }
}
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 95e9dcb01e..7ab716c4da 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -13,11 +13,4 @@ namespace MediaBrowser.Model.LiveTv
ConflictedNotOk,
Error
}
-
- public enum DayPattern
- {
- Daily,
- Weekdays,
- Weekends
- }
}
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
new file mode 100644
index 0000000000..95260cc0e4
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
@@ -0,0 +1,19 @@
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.LiveTv
+{
+ public class SeriesTimerQuery
+ {
+ ///
+ /// Gets or sets the sort by - SortName, Priority
+ ///
+ /// The sort by.
+ public string SortBy { get; set; }
+
+ ///
+ /// Gets or sets the sort order.
+ ///
+ /// The sort order.
+ public SortOrder SortOrder { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index 137c957192..16cac945fa 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace MediaBrowser.Model.LiveTv
+namespace MediaBrowser.Model.LiveTv
{
public class TimerInfoDto : BaseTimerInfoDto
{
@@ -36,107 +33,4 @@ namespace MediaBrowser.Model.LiveTv
public ProgramInfoDto ProgramInfo { get; set; }
}
-
- public class BaseTimerInfoDto : INotifyPropertyChanged
- {
- ///
- /// Occurs when a property value changes.
- ///
- public event PropertyChangedEventHandler PropertyChanged;
-
- ///
- /// Id of the recording.
- ///
- public string Id { get; set; }
-
- ///
- /// Gets or sets the external identifier.
- ///
- /// The external identifier.
- public string ExternalId { get; set; }
-
- ///
- /// ChannelId of the recording.
- ///
- public string ChannelId { get; set; }
-
- ///
- /// Gets or sets the external channel identifier.
- ///
- /// The external channel identifier.
- public string ExternalChannelId { get; set; }
-
- ///
- /// ChannelName of the recording.
- ///
- public string ChannelName { get; set; }
-
- ///
- /// Gets or sets the program identifier.
- ///
- /// The program identifier.
- public string ProgramId { get; set; }
-
- ///
- /// Gets or sets the external program identifier.
- ///
- /// The external program identifier.
- public string ExternalProgramId { get; set; }
-
- ///
- /// Name of the recording.
- ///
- public string Name { get; set; }
-
- ///
- /// Description of the recording.
- ///
- public string Overview { get; set; }
-
- ///
- /// The start date of the recording, in UTC.
- ///
- public DateTime StartDate { get; set; }
-
- ///
- /// The end date of the recording, in UTC.
- ///
- public DateTime EndDate { get; set; }
-
- ///
- /// Gets or sets the name of the service.
- ///
- /// The name of the service.
- public string ServiceName { get; set; }
-
- ///
- /// Gets or sets the priority.
- ///
- /// The priority.
- public int Priority { get; set; }
-
- ///
- /// Gets or sets the pre padding seconds.
- ///
- /// The pre padding seconds.
- public int PrePaddingSeconds { get; set; }
-
- ///
- /// Gets or sets the post padding seconds.
- ///
- /// The post padding seconds.
- public int PostPaddingSeconds { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is pre padding required.
- ///
- /// true if this instance is pre padding required; otherwise, false.
- public bool IsPrePaddingRequired { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is post padding required.
- ///
- /// true if this instance is post padding required; otherwise, false.
- public bool IsPostPaddingRequired { get; set; }
- }
}
diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs
new file mode 100644
index 0000000000..e6ceff5300
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.LiveTv
+{
+ public class TimerQuery
+ {
+ ///
+ /// Gets or sets the channel identifier.
+ ///
+ /// The channel identifier.
+ public string ChannelId { get; set; }
+
+ ///
+ /// Gets or sets the series timer identifier.
+ ///
+ /// The series timer identifier.
+ public string SeriesTimerId { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 1f72844223..748e5f0a82 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -57,35 +57,64 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,26 +123,64 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -138,9 +205,11 @@
+
+
@@ -148,14 +217,24 @@
+
+
+
+
+
-
+
+
+
+
+
+
@@ -184,22 +263,25 @@
-
+
+
+
+
-
+
diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
new file mode 100644
index 0000000000..a76c0e742c
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.MediaInfo
+{
+ public class AudioCodec
+ {
+ public const string AAC = "AAC";
+ public const string MP3 = "MP3";
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
index 01e75e6f8c..963e8dd95e 100644
--- a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
@@ -34,11 +34,4 @@ namespace MediaBrowser.Model.MediaInfo
/// The chapters.
public List Chapters { get; set; }
}
-
- public enum TransportStreamTimestamp
- {
- None,
- Zero,
- Valid
- }
}
diff --git a/MediaBrowser.Model/MediaInfo/Constants.cs b/MediaBrowser.Model/MediaInfo/Constants.cs
deleted file mode 100644
index 8f2e36b39b..0000000000
--- a/MediaBrowser.Model/MediaInfo/Constants.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-
-namespace MediaBrowser.Model.MediaInfo
-{
- public class Container
- {
- public const string MP4 = "MP4";
- }
-
- public class AudioCodec
- {
- public const string AAC = "AAC";
- public const string MP3 = "MP3";
- }
-
- public class VideoCodec
- {
- public const string H263 = "H263";
- public const string H264 = "H264";
- public const string H265 = "H265";
- public const string MPEG4 = "MPEG4";
- public const string MSMPEG4 = "MSMPEG4";
- public const string VC1 = "VC1";
- }
-
- public class SubtitleFormat
- {
- public const string SRT = "SRT";
- }
-}
diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs
new file mode 100644
index 0000000000..0305b9cfa6
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/Container.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.MediaInfo
+{
+ public class Container
+ {
+ public const string MP4 = "MP4";
+ }
+}
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
new file mode 100644
index 0000000000..51a0dbc9e7
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
@@ -0,0 +1,7 @@
+namespace MediaBrowser.Model.MediaInfo
+{
+ public class SubtitleFormat
+ {
+ public const string SRT = "SRT";
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
new file mode 100644
index 0000000000..4c808a8dcd
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.MediaInfo
+{
+ public enum TransportStreamTimestamp
+ {
+ None,
+ Zero,
+ Valid
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaInfo/VideoCodec.cs b/MediaBrowser.Model/MediaInfo/VideoCodec.cs
new file mode 100644
index 0000000000..7405eb13e9
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/VideoCodec.cs
@@ -0,0 +1,12 @@
+namespace MediaBrowser.Model.MediaInfo
+{
+ public class VideoCodec
+ {
+ public const string H263 = "H263";
+ public const string H264 = "H264";
+ public const string H265 = "H265";
+ public const string MPEG4 = "MPEG4";
+ public const string MSMPEG4 = "MSMPEG4";
+ public const string VC1 = "VC1";
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/News/NewsChannel.cs b/MediaBrowser.Model/News/NewsChannel.cs
new file mode 100644
index 0000000000..c3955b0a07
--- /dev/null
+++ b/MediaBrowser.Model/News/NewsChannel.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.News
+{
+ public class NewsChannel
+ {
+ public string Title { get; set; }
+ public string Link { get; set; }
+ public string Description { get; set; }
+ public List Items { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/News/NewsItem.cs b/MediaBrowser.Model/News/NewsItem.cs
index 181f43db7f..2a05c420a7 100644
--- a/MediaBrowser.Model/News/NewsItem.cs
+++ b/MediaBrowser.Model/News/NewsItem.cs
@@ -1,16 +1,7 @@
using System;
-using System.Collections.Generic;
namespace MediaBrowser.Model.News
{
- public class NewsChannel
- {
- public string Title { get; set; }
- public string Link { get; set; }
- public string Description { get; set; }
- public List Items { get; set; }
- }
-
public class NewsItem
{
public string Title { get; set; }
@@ -20,11 +11,4 @@ namespace MediaBrowser.Model.News
public string Guid { get; set; }
public DateTime Date { get; set; }
}
-
- public class NewsQuery
- {
- public int? StartIndex { get; set; }
-
- public int? Limit { get; set; }
- }
}
diff --git a/MediaBrowser.Model/News/NewsQuery.cs b/MediaBrowser.Model/News/NewsQuery.cs
new file mode 100644
index 0000000000..5678889217
--- /dev/null
+++ b/MediaBrowser.Model/News/NewsQuery.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.News
+{
+ public class NewsQuery
+ {
+ public int? StartIndex { get; set; }
+
+ public int? Limit { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Notifications/Notification.cs b/MediaBrowser.Model/Notifications/Notification.cs
index d894911e7e..731c3d3035 100644
--- a/MediaBrowser.Model/Notifications/Notification.cs
+++ b/MediaBrowser.Model/Notifications/Notification.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Model.Configuration;
-using System;
-using System.Collections.Generic;
+using System;
namespace MediaBrowser.Model.Notifications
{
@@ -27,70 +25,4 @@ namespace MediaBrowser.Model.Notifications
Date = DateTime.UtcNow;
}
}
-
- public class NotificationRequest
- {
- public string Name { get; set; }
-
- public string Description { get; set; }
-
- public string Url { get; set; }
-
- public NotificationLevel Level { get; set; }
-
- public List UserIds { get; set; }
-
- public DateTime Date { get; set; }
-
- ///
- /// The corresponding type name used in configuration. Not for display.
- ///
- public string NotificationType { get; set; }
-
- public Dictionary Variables { get; set; }
-
- public SendToUserType? SendToUserMode { get; set; }
-
- public List ExcludeUserIds { get; set; }
-
- public NotificationRequest()
- {
- UserIds = new List();
- Date = DateTime.UtcNow;
-
- Variables = new Dictionary(StringComparer.OrdinalIgnoreCase);
-
- ExcludeUserIds = new List();
- }
- }
-
- public class NotificationTypeInfo
- {
- public string Type { get; set; }
-
- public string Name { get; set; }
-
- public bool Enabled { get; set; }
-
- public string Category { get; set; }
-
- public bool IsBasedOnUserEvent { get; set; }
-
- public string DefaultTitle { get; set; }
-
- public string DefaultDescription { get; set; }
-
- public List Variables { get; set; }
-
- public NotificationTypeInfo()
- {
- Variables = new List();
- }
- }
-
- public class NotificationServiceInfo
- {
- public string Name { get; set; }
- public string Id { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
new file mode 100644
index 0000000000..d47e9c4f22
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Model.Notifications
+{
+ public class NotificationRequest
+ {
+ public string Name { get; set; }
+
+ public string Description { get; set; }
+
+ public string Url { get; set; }
+
+ public NotificationLevel Level { get; set; }
+
+ public List UserIds { get; set; }
+
+ public DateTime Date { get; set; }
+
+ ///
+ /// The corresponding type name used in configuration. Not for display.
+ ///
+ public string NotificationType { get; set; }
+
+ public Dictionary Variables { get; set; }
+
+ public SendToUserType? SendToUserMode { get; set; }
+
+ public List ExcludeUserIds { get; set; }
+
+ public NotificationRequest()
+ {
+ UserIds = new List();
+ Date = DateTime.UtcNow;
+
+ Variables = new Dictionary(StringComparer.OrdinalIgnoreCase);
+
+ ExcludeUserIds = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs
new file mode 100644
index 0000000000..0ffe7d4ae9
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Notifications
+{
+ public class NotificationServiceInfo
+ {
+ public string Name { get; set; }
+ public string Id { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
new file mode 100644
index 0000000000..59b39fbc78
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Notifications
+{
+ public class NotificationTypeInfo
+ {
+ public string Type { get; set; }
+
+ public string Name { get; set; }
+
+ public bool Enabled { get; set; }
+
+ public string Category { get; set; }
+
+ public bool IsBasedOnUserEvent { get; set; }
+
+ public string DefaultTitle { get; set; }
+
+ public string DefaultDescription { get; set; }
+
+ public List Variables { get; set; }
+
+ public NotificationTypeInfo()
+ {
+ Variables = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index e041f06af9..2c5cfe91b9 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -21,19 +21,4 @@ namespace MediaBrowser.Model.Providers
/// The URL format string.
public string UrlFormatString { get; set; }
}
-
- public class ExternalUrl
- {
- ///
- /// Gets or sets the name.
- ///
- /// The name.
- public string Name { get; set; }
-
- ///
- /// Gets or sets the type of the item.
- ///
- /// The type of the item.
- public string Url { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Providers/ExternalUrl.cs b/MediaBrowser.Model/Providers/ExternalUrl.cs
new file mode 100644
index 0000000000..fb744f446d
--- /dev/null
+++ b/MediaBrowser.Model/Providers/ExternalUrl.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Providers
+{
+ public class ExternalUrl
+ {
+ ///
+ /// Gets or sets the name.
+ ///
+ /// The name.
+ public string Name { get; set; }
+
+ ///
+ /// Gets or sets the type of the item.
+ ///
+ /// The type of the item.
+ public string Url { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Providers/RemoteImageQuery.cs b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
new file mode 100644
index 0000000000..8d5231a253
--- /dev/null
+++ b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
@@ -0,0 +1,15 @@
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.Providers
+{
+ public class RemoteImageQuery
+ {
+ public string ProviderName { get; set; }
+
+ public ImageType? ImageType { get; set; }
+
+ public bool IncludeDisabledProviders { get; set; }
+
+ public bool IncludeAllLanguages { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Providers/RemoteImageResult.cs b/MediaBrowser.Model/Providers/RemoteImageResult.cs
index ed2788c0b4..1c60db6ae1 100644
--- a/MediaBrowser.Model/Providers/RemoteImageResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageResult.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.Providers
{
@@ -26,15 +25,4 @@ namespace MediaBrowser.Model.Providers
/// The providers.
public List Providers { get; set; }
}
-
- public class RemoteImageQuery
- {
- public string ProviderName { get; set; }
-
- public ImageType? ImageType { get; set; }
-
- public bool IncludeDisabledProviders { get; set; }
-
- public bool IncludeAllLanguages { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Querying/ThemeSongsResult.cs b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
similarity index 58%
rename from MediaBrowser.Model/Querying/ThemeSongsResult.cs
rename to MediaBrowser.Model/Querying/AllThemeMediaResult.cs
index 9b0a1c61b7..89640eb65b 100644
--- a/MediaBrowser.Model/Querying/ThemeSongsResult.cs
+++ b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
@@ -1,18 +1,5 @@
-
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
{
- ///
- /// Class ThemeMediaResult
- ///
- public class ThemeMediaResult : ItemsResult
- {
- ///
- /// Gets or sets the owner id.
- ///
- /// The owner id.
- public string OwnerId { get; set; }
- }
-
public class AllThemeMediaResult
{
public ThemeMediaResult ThemeVideosResult { get; set; }
@@ -30,4 +17,4 @@ namespace MediaBrowser.Model.Querying
SoundtrackSongsResult = new ThemeMediaResult();
}
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index 589b46433a..e2fc3220a1 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -22,24 +22,4 @@ namespace MediaBrowser.Model.Querying
Fields = new ItemFields[] { };
}
}
-
- public class SeasonQuery
- {
- public string UserId { get; set; }
-
- public string SeriesId { get; set; }
-
- public bool? IsMissing { get; set; }
-
- public bool? IsVirtualUnaired { get; set; }
-
- public ItemFields[] Fields { get; set; }
-
- public bool? IsSpecialSeason { get; set; }
-
- public SeasonQuery()
- {
- Fields = new ItemFields[] { };
- }
- }
}
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index 913fae4d91..0e9c9882f3 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -39,38 +39,4 @@ namespace MediaBrowser.Model.Querying
/// The fields.
public ItemFields[] Fields { get; set; }
}
-
- public class UpcomingEpisodesQuery
- {
- ///
- /// Gets or sets the user id.
- ///
- /// The user id.
- public string UserId { get; set; }
-
- ///
- /// Gets or sets the parent identifier.
- ///
- /// The parent identifier.
- public string ParentId { 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; }
-
- ///
- /// Fields to return within the items, in addition to basic information
- ///
- /// The fields.
- public ItemFields[] Fields { get; set; }
- }
-
}
diff --git a/MediaBrowser.Model/Querying/SeasonQuery.cs b/MediaBrowser.Model/Querying/SeasonQuery.cs
new file mode 100644
index 0000000000..b1fe635bbe
--- /dev/null
+++ b/MediaBrowser.Model/Querying/SeasonQuery.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.Querying
+{
+ public class SeasonQuery
+ {
+ public string UserId { get; set; }
+
+ public string SeriesId { get; set; }
+
+ public bool? IsMissing { get; set; }
+
+ public bool? IsVirtualUnaired { get; set; }
+
+ public ItemFields[] Fields { get; set; }
+
+ public bool? IsSpecialSeason { get; set; }
+
+ public SeasonQuery()
+ {
+ Fields = new ItemFields[] { };
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs
new file mode 100644
index 0000000000..7d0d4da317
--- /dev/null
+++ b/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs
@@ -0,0 +1,29 @@
+namespace MediaBrowser.Model.Querying
+{
+ public class SimilarItemsByNameQuery
+ {
+ ///
+ /// The user to localize search results for
+ ///
+ /// The user id.
+ public string UserId { get; set; }
+
+ ///
+ /// Gets or sets the name.
+ ///
+ /// The name.
+ public string Name { get; set; }
+
+ ///
+ /// The maximum number of items to return
+ ///
+ /// The limit.
+ public int? Limit { get; set; }
+
+ ///
+ /// Fields to return within the items, in addition to basic information
+ ///
+ /// The fields.
+ public ItemFields[] Fields { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
index d792aa76dc..0dd4915508 100644
--- a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
@@ -26,31 +26,4 @@
/// The fields.
public ItemFields[] Fields { get; set; }
}
-
- public class SimilarItemsByNameQuery
- {
- ///
- /// The user to localize search results for
- ///
- /// The user id.
- public string UserId { get; set; }
-
- ///
- /// Gets or sets the name.
- ///
- /// The name.
- public string Name { get; set; }
-
- ///
- /// The maximum number of items to return
- ///
- /// The limit.
- public int? Limit { get; set; }
-
- ///
- /// Fields to return within the items, in addition to basic information
- ///
- /// The fields.
- public ItemFields[] Fields { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Querying/ThemeMediaResult.cs b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
new file mode 100644
index 0000000000..80478a9102
--- /dev/null
+++ b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
@@ -0,0 +1,15 @@
+
+namespace MediaBrowser.Model.Querying
+{
+ ///
+ /// Class ThemeMediaResult
+ ///
+ public class ThemeMediaResult : ItemsResult
+ {
+ ///
+ /// Gets or sets the owner id.
+ ///
+ /// The owner id.
+ public string OwnerId { get; set; }
+ }
+}
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
new file mode 100644
index 0000000000..e5a875e883
--- /dev/null
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -0,0 +1,35 @@
+namespace MediaBrowser.Model.Querying
+{
+ public class UpcomingEpisodesQuery
+ {
+ ///
+ /// Gets or sets the user id.
+ ///
+ /// The user id.
+ public string UserId { get; set; }
+
+ ///
+ /// Gets or sets the parent identifier.
+ ///
+ /// The parent identifier.
+ public string ParentId { 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; }
+
+ ///
+ /// Fields to return within the items, in addition to basic information
+ ///
+ /// The fields.
+ public ItemFields[] Fields { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
new file mode 100644
index 0000000000..5bee060875
--- /dev/null
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Session
+{
+ public class ClientCapabilities
+ {
+ public List PlayableMediaTypes { get; set; }
+ public List SupportedCommands { get; set; }
+
+ public ClientCapabilities()
+ {
+ PlayableMediaTypes = new List();
+ SupportedCommands = new List();
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 98b3c50b31..7e818245de 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -16,40 +16,4 @@ namespace MediaBrowser.Model.Session
Arguments = new Dictionary(StringComparer.OrdinalIgnoreCase);
}
}
-
- ///
- /// This exists simply to identify a set of known commands.
- ///
- public enum GeneralCommandType
- {
- MoveUp = 0,
- MoveDown = 1,
- MoveLeft = 2,
- MoveRight = 3,
- PageUp = 4,
- PageDown = 5,
- PreviousLetter = 6,
- NextLetter = 7,
- ToggleOsd = 8,
- ToggleContextMenu = 9,
- Select = 10,
- Back = 11,
- TakeScreenshot = 12,
- SendKey = 13,
- SendString = 14,
- GoHome = 15,
- GoToSettings = 16,
- VolumeUp = 17,
- VolumeDown = 18,
- Mute = 19,
- Unmute = 20,
- ToggleMute = 21,
- SetVolume = 22,
- SetAudioStreamIndex = 23,
- SetSubtitleStreamIndex = 24,
- ToggleFullscreen = 25,
- DisplayContent = 26,
- GoToSearch = 27,
- DisplayMessage = 28
- }
}
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
new file mode 100644
index 0000000000..f8773a2463
--- /dev/null
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -0,0 +1,38 @@
+namespace MediaBrowser.Model.Session
+{
+ ///
+ /// This exists simply to identify a set of known commands.
+ ///
+ public enum GeneralCommandType
+ {
+ MoveUp = 0,
+ MoveDown = 1,
+ MoveLeft = 2,
+ MoveRight = 3,
+ PageUp = 4,
+ PageDown = 5,
+ PreviousLetter = 6,
+ NextLetter = 7,
+ ToggleOsd = 8,
+ ToggleContextMenu = 9,
+ Select = 10,
+ Back = 11,
+ TakeScreenshot = 12,
+ SendKey = 13,
+ SendString = 14,
+ GoHome = 15,
+ GoToSettings = 16,
+ VolumeUp = 17,
+ VolumeDown = 18,
+ Mute = 19,
+ Unmute = 20,
+ ToggleMute = 21,
+ SetVolume = 22,
+ SetAudioStreamIndex = 23,
+ SetSubtitleStreamIndex = 24,
+ ToggleFullscreen = 25,
+ DisplayContent = 26,
+ GoToSearch = 27,
+ DisplayMessage = 28
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayCommand.cs b/MediaBrowser.Model/Session/PlayCommand.cs
new file mode 100644
index 0000000000..3a5a951d70
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlayCommand.cs
@@ -0,0 +1,29 @@
+namespace MediaBrowser.Model.Session
+{
+ ///
+ /// Enum PlayCommand
+ ///
+ public enum PlayCommand
+ {
+ ///
+ /// The play now
+ ///
+ PlayNow = 0,
+ ///
+ /// The play next
+ ///
+ PlayNext = 1,
+ ///
+ /// The play last
+ ///
+ PlayLast = 2,
+ ///
+ /// The play instant mix
+ ///
+ PlayInstantMix = 3,
+ ///
+ /// The play shuffle
+ ///
+ PlayShuffle = 4
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayMethod.cs b/MediaBrowser.Model/Session/PlayMethod.cs
new file mode 100644
index 0000000000..87b7286272
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlayMethod.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Session
+{
+ public enum PlayMethod
+ {
+ Transcode = 0,
+ DirectStream = 1,
+ DirectPlay = 2
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index 74d7a70a35..5db5e90cb7 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -30,31 +30,4 @@ namespace MediaBrowser.Model.Session
/// The controlling user identifier.
public string ControllingUserId { get; set; }
}
-
- ///
- /// Enum PlayCommand
- ///
- public enum PlayCommand
- {
- ///
- /// The play now
- ///
- PlayNow = 0,
- ///
- /// The play next
- ///
- PlayNext = 1,
- ///
- /// The play last
- ///
- PlayLast = 2,
- ///
- /// The play instant mix
- ///
- PlayInstantMix = 3,
- ///
- /// The play shuffle
- ///
- PlayShuffle = 4
- }
}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaybackReports.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
similarity index 61%
rename from MediaBrowser.Model/Session/PlaybackReports.cs
rename to MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 93960076e3..f04dea1eac 100644
--- a/MediaBrowser.Model/Session/PlaybackReports.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -1,25 +1,7 @@
using MediaBrowser.Model.Entities;
-using System.Collections.Generic;
namespace MediaBrowser.Model.Session
{
- ///
- /// Class PlaybackStartInfo.
- ///
- public class PlaybackStartInfo : PlaybackProgressInfo
- {
- public PlaybackStartInfo()
- {
- QueueableMediaTypes = new List();
- }
-
- ///
- /// Gets or sets the queueable media types.
- ///
- /// The queueable media types.
- public List QueueableMediaTypes { get; set; }
- }
-
///
/// Class PlaybackProgressInfo.
///
@@ -97,47 +79,4 @@ namespace MediaBrowser.Model.Session
/// The play method.
public PlayMethod PlayMethod { get; set; }
}
-
- public enum PlayMethod
- {
- Transcode = 0,
- DirectStream = 1,
- DirectPlay = 2
- }
-
- ///
- /// Class PlaybackStopInfo.
- ///
- public class PlaybackStopInfo
- {
- ///
- /// Gets or sets the item.
- ///
- /// The item.
- public BaseItemInfo Item { get; set; }
-
- ///
- /// Gets or sets the item identifier.
- ///
- /// The item identifier.
- public string ItemId { get; set; }
-
- ///
- /// Gets or sets the session id.
- ///
- /// The session id.
- public string SessionId { get; set; }
-
- ///
- /// Gets or sets the media version identifier.
- ///
- /// The media version identifier.
- public string MediaSourceId { get; set; }
-
- ///
- /// Gets or sets the position ticks.
- ///
- /// The position ticks.
- public long? PositionTicks { get; set; }
- }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaybackStartInfo.cs b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
new file mode 100644
index 0000000000..d1ea2841e5
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Session
+{
+ ///
+ /// Class PlaybackStartInfo.
+ ///
+ public class PlaybackStartInfo : PlaybackProgressInfo
+ {
+ public PlaybackStartInfo()
+ {
+ QueueableMediaTypes = new List();
+ }
+
+ ///
+ /// Gets or sets the queueable media types.
+ ///
+ /// The queueable media types.
+ public List QueueableMediaTypes { get; set; }
+ }
+}
diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
new file mode 100644
index 0000000000..38025f1832
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -0,0 +1,40 @@
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.Session
+{
+ ///
+ /// Class PlaybackStopInfo.
+ ///
+ public class PlaybackStopInfo
+ {
+ ///
+ /// Gets or sets the item.
+ ///
+ /// The item.
+ public BaseItemInfo Item { get; set; }
+
+ ///
+ /// Gets or sets the item identifier.
+ ///
+ /// The item identifier.
+ public string ItemId { get; set; }
+
+ ///
+ /// Gets or sets the session id.
+ ///
+ /// The session id.
+ public string SessionId { get; set; }
+
+ ///
+ /// Gets or sets the media version identifier.
+ ///
+ /// The media version identifier.
+ public string MediaSourceId { get; set; }
+
+ ///
+ /// Gets or sets the position ticks.
+ ///
+ /// The position ticks.
+ public long? PositionTicks { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs
new file mode 100644
index 0000000000..c9afef8e0e
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs
@@ -0,0 +1,59 @@
+namespace MediaBrowser.Model.Session
+{
+ public class PlayerStateInfo
+ {
+ ///
+ /// Gets or sets the now playing position ticks.
+ ///
+ /// The now playing position ticks.
+ public long? PositionTicks { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance can seek.
+ ///
+ /// true if this instance can seek; otherwise, false.
+ public bool CanSeek { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is paused.
+ ///
+ /// true if this instance is paused; otherwise, false.
+ public bool IsPaused { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether this instance is muted.
+ ///
+ /// true if this instance is muted; otherwise, false.
+ public bool IsMuted { get; set; }
+
+ ///
+ /// Gets or sets the volume level.
+ ///
+ /// The volume level.
+ public int? VolumeLevel { get; set; }
+
+ ///
+ /// Gets or sets the index of the now playing audio stream.
+ ///
+ /// The index of the now playing audio stream.
+ public int? AudioStreamIndex { get; set; }
+
+ ///
+ /// Gets or sets the index of the now playing subtitle stream.
+ ///
+ /// The index of the now playing subtitle stream.
+ public int? SubtitleStreamIndex { get; set; }
+
+ ///
+ /// Gets or sets the now playing media version identifier.
+ ///
+ /// The now playing media version identifier.
+ public string MediaSourceId { get; set; }
+
+ ///
+ /// Gets or sets the play method.
+ ///
+ /// The play method.
+ public PlayMethod? PlayMethod { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 6466c64852..2af4f26e37 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -39,17 +39,4 @@ namespace MediaBrowser.Model.Session
///
FastForward
}
-
- public class PlaystateRequest
- {
- public PlaystateCommand Command { get; set; }
-
- public long? SeekPositionTicks { get; set; }
-
- ///
- /// Gets or sets the controlling user identifier.
- ///
- /// The controlling user identifier.
- public string ControllingUserId { get; set; }
- }
}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaystateRequest.cs b/MediaBrowser.Model/Session/PlaystateRequest.cs
new file mode 100644
index 0000000000..8a046b5031
--- /dev/null
+++ b/MediaBrowser.Model/Session/PlaystateRequest.cs
@@ -0,0 +1,15 @@
+namespace MediaBrowser.Model.Session
+{
+ public class PlaystateRequest
+ {
+ public PlaystateCommand Command { get; set; }
+
+ public long? SeekPositionTicks { get; set; }
+
+ ///
+ /// Gets or sets the controlling user identifier.
+ ///
+ /// The controlling user identifier.
+ public string ControllingUserId { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 0dc1195001..46e214d249 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -148,90 +148,4 @@ namespace MediaBrowser.Model.Session
SupportedCommands = new List();
}
}
-
- ///
- /// Class SessionUserInfo.
- ///
- public class SessionUserInfo
- {
- ///
- /// Gets or sets the user identifier.
- ///
- /// The user identifier.
- public string UserId { get; set; }
- ///
- /// Gets or sets the name of the user.
- ///
- /// The name of the user.
- public string UserName { get; set; }
- }
-
- public class ClientCapabilities
- {
- public List PlayableMediaTypes { get; set; }
- public List SupportedCommands { get; set; }
-
- public ClientCapabilities()
- {
- PlayableMediaTypes = new List();
- SupportedCommands = new List();
- }
- }
-
- public class PlayerStateInfo
- {
- ///
- /// Gets or sets the now playing position ticks.
- ///
- /// The now playing position ticks.
- public long? PositionTicks { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance can seek.
- ///
- /// true if this instance can seek; otherwise, false.
- public bool CanSeek { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is paused.
- ///
- /// true if this instance is paused; otherwise, false.
- public bool IsPaused { get; set; }
-
- ///
- /// Gets or sets a value indicating whether this instance is muted.
- ///
- /// true if this instance is muted; otherwise, false.
- public bool IsMuted { get; set; }
-
- ///
- /// Gets or sets the volume level.
- ///
- /// The volume level.
- public int? VolumeLevel { get; set; }
-
- ///
- /// Gets or sets the index of the now playing audio stream.
- ///
- /// The index of the now playing audio stream.
- public int? AudioStreamIndex { get; set; }
-
- ///
- /// Gets or sets the index of the now playing subtitle stream.
- ///
- /// The index of the now playing subtitle stream.
- public int? SubtitleStreamIndex { get; set; }
-
- ///
- /// Gets or sets the now playing media version identifier.
- ///
- /// The now playing media version identifier.
- public string MediaSourceId { get; set; }
-
- ///
- /// Gets or sets the play method.
- ///
- /// The play method.
- public PlayMethod? PlayMethod { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Session/SessionUserInfo.cs b/MediaBrowser.Model/Session/SessionUserInfo.cs
new file mode 100644
index 0000000000..39b96931a5
--- /dev/null
+++ b/MediaBrowser.Model/Session/SessionUserInfo.cs
@@ -0,0 +1,19 @@
+namespace MediaBrowser.Model.Session
+{
+ ///
+ /// Class SessionUserInfo.
+ ///
+ public class SessionUserInfo
+ {
+ ///
+ /// Gets or sets the user identifier.
+ ///
+ /// The user identifier.
+ public string UserId { get; set; }
+ ///
+ /// Gets or sets the name of the user.
+ ///
+ /// The name of the user.
+ public string UserName { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Themes/AppTheme.cs b/MediaBrowser.Model/Themes/AppTheme.cs
index a814fec336..40a729963a 100644
--- a/MediaBrowser.Model/Themes/AppTheme.cs
+++ b/MediaBrowser.Model/Themes/AppTheme.cs
@@ -20,11 +20,4 @@ namespace MediaBrowser.Model.Themes
Images = new List();
}
}
-
- public class AppThemeInfo
- {
- public string AppName { get; set; }
-
- public string Name { get; set; }
- }
}
diff --git a/MediaBrowser.Model/Themes/AppThemeInfo.cs b/MediaBrowser.Model/Themes/AppThemeInfo.cs
new file mode 100644
index 0000000000..bc359530ad
--- /dev/null
+++ b/MediaBrowser.Model/Themes/AppThemeInfo.cs
@@ -0,0 +1,9 @@
+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.Server.Implementations/Collections/CollectionsDynamicFolder.cs b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
index 834fbcd315..915a27c11a 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities;
using System.IO;
-using System.Linq;
namespace MediaBrowser.Server.Implementations.Collections
{
@@ -26,30 +25,4 @@ namespace MediaBrowser.Server.Implementations.Collections
};
}
}
-
- public class ManualCollectionsFolder : BasePluginFolder
- {
- public ManualCollectionsFolder()
- {
- Name = "Collections";
- }
-
- public override bool IsVisible(User user)
- {
- if (!GetChildren(user, true).Any())
- {
- return false;
- }
-
- return base.IsVisible(user);
- }
-
- public override bool IsHidden
- {
- get
- {
- return !ActualChildren.Any() || base.IsHidden;
- }
- }
- }
}
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
new file mode 100644
index 0000000000..e36c63b1cd
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -0,0 +1,31 @@
+using System.Linq;
+using MediaBrowser.Controller.Entities;
+
+namespace MediaBrowser.Server.Implementations.Collections
+{
+ public class ManualCollectionsFolder : BasePluginFolder
+ {
+ public ManualCollectionsFolder()
+ {
+ Name = "Collections";
+ }
+
+ public override bool IsVisible(User user)
+ {
+ if (!GetChildren(user, true).Any())
+ {
+ return false;
+ }
+
+ return base.IsVisible(user);
+ }
+
+ public override bool IsHidden
+ {
+ get
+ {
+ return !ActualChildren.Any() || base.IsHidden;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
similarity index 100%
rename from MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs
rename to MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
diff --git a/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs
new file mode 100644
index 0000000000..235910fed9
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs
@@ -0,0 +1,6 @@
+using System.Net;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+ public delegate void DelReceiveWebRequest(HttpListenerContext context);
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs b/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs
new file mode 100644
index 0000000000..36a257f632
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs
@@ -0,0 +1,17 @@
+using ServiceStack;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+ ///
+ /// Class GetDashboardResource
+ ///
+ [Route("/swagger-ui/{ResourceName*}", "GET")]
+ public class GetSwaggerResource
+ {
+ ///
+ /// Gets or sets the name.
+ ///
+ /// The name.
+ public string ResourceName { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index cfe5ef4f05..0fc9265f69 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -25,8 +25,6 @@ using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.HttpServer
{
- public delegate void DelReceiveWebRequest(HttpListenerContext context);
-
public class HttpListenerHost : ServiceStackHost, IHttpServer
{
private string ServerName { get; set; }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs
new file mode 100644
index 0000000000..40af3f3b05
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs
@@ -0,0 +1,46 @@
+using System;
+using MediaBrowser.Model.Logging;
+using ServiceStack.Logging;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+ ///
+ /// Class ServerLogFactory
+ ///
+ public class ServerLogFactory : ILogFactory
+ {
+ ///
+ /// The _log manager
+ ///
+ private readonly ILogManager _logManager;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The log manager.
+ public ServerLogFactory(ILogManager logManager)
+ {
+ _logManager = logManager;
+ }
+
+ ///
+ /// Gets the logger.
+ ///
+ /// Name of the type.
+ /// ILog.
+ public ILog GetLogger(string typeName)
+ {
+ return new ServerLogger(_logManager.GetLogger(typeName));
+ }
+
+ ///
+ /// Gets the logger.
+ ///
+ /// The type.
+ /// ILog.
+ public ILog GetLogger(Type type)
+ {
+ return GetLogger(type.Name);
+ }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
index 7a4f922eda..bf79247841 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs
@@ -4,46 +4,6 @@ using System;
namespace MediaBrowser.Server.Implementations.HttpServer
{
- ///
- /// Class ServerLogFactory
- ///
- public class ServerLogFactory : ILogFactory
- {
- ///
- /// The _log manager
- ///
- private readonly ILogManager _logManager;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The log manager.
- public ServerLogFactory(ILogManager logManager)
- {
- _logManager = logManager;
- }
-
- ///
- /// Gets the logger.
- ///
- /// Name of the type.
- /// ILog.
- public ILog GetLogger(string typeName)
- {
- return new ServerLogger(_logManager.GetLogger(typeName));
- }
-
- ///
- /// Gets the logger.
- ///
- /// The type.
- /// ILog.
- public ILog GetLogger(Type type)
- {
- return GetLogger(type.Name);
- }
- }
-
///
/// Class ServerLogger
///
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
index 8f85059336..3764697f1e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
@@ -1,24 +1,10 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Net;
-using ServiceStack;
using ServiceStack.Web;
using System.IO;
namespace MediaBrowser.Server.Implementations.HttpServer
{
- ///
- /// Class GetDashboardResource
- ///
- [Route("/swagger-ui/{ResourceName*}", "GET")]
- public class GetSwaggerResource
- {
- ///
- /// Gets or sets the name.
- ///
- /// The name.
- public string ResourceName { get; set; }
- }
-
public class SwaggerService : IHasResultFactory, IRestfulService
{
private readonly IApplicationPaths _appPaths;
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseItemResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/ItemResolver.cs
similarity index 100%
rename from MediaBrowser.Server.Implementations/Library/Resolvers/BaseItemResolver.cs
rename to MediaBrowser.Server.Implementations/Library/Resolvers/ItemResolver.cs
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs b/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs
deleted file mode 100644
index edb4e7382c..0000000000
--- a/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Model.Dto;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Server.Implementations.Library.Validators
-{
- ///
- /// Class CountHelpers
- ///
- internal static class CountHelpers
- {
- private static CountType? GetCountType(BaseItem item)
- {
- if (item is Movie)
- {
- return CountType.Movie;
- }
- if (item is Episode)
- {
- return CountType.Episode;
- }
- if (item is Game)
- {
- return CountType.Game;
- }
- if (item is Audio)
- {
- return CountType.Song;
- }
- if (item is Trailer)
- {
- return CountType.Trailer;
- }
- if (item is Series)
- {
- return CountType.Series;
- }
- if (item is MusicAlbum)
- {
- return CountType.MusicAlbum;
- }
- if (item is MusicVideo)
- {
- return CountType.MusicVideo;
- }
- if (item is AdultVideo)
- {
- return CountType.AdultVideo;
- }
-
- return null;
- }
-
- ///
- /// Increments the count.
- ///
- /// The counts.
- /// The key.
- internal static void IncrementCount(Dictionary counts, CountType key)
- {
- int count;
-
- if (counts.TryGetValue(key, out count))
- {
- count++;
- counts[key] = count;
- }
- else
- {
- counts.Add(key, 1);
- }
- }
-
- ///
- /// Gets the counts.
- ///
- /// The counts.
- /// ItemByNameCounts.
- internal static ItemByNameCounts GetCounts(Dictionary counts)
- {
- return new ItemByNameCounts
- {
- AdultVideoCount = GetCount(counts, CountType.AdultVideo),
- AlbumCount = GetCount(counts, CountType.MusicAlbum),
- EpisodeCount = GetCount(counts, CountType.Episode),
- GameCount = GetCount(counts, CountType.Game),
- MovieCount = GetCount(counts, CountType.Movie),
- MusicVideoCount = GetCount(counts, CountType.MusicVideo),
- SeriesCount = GetCount(counts, CountType.Series),
- SongCount = GetCount(counts, CountType.Song),
- TrailerCount = GetCount(counts, CountType.Trailer),
- TotalCount = GetCount(counts, CountType.Total)
- };
- }
-
- ///
- /// Gets the count.
- ///
- /// The counts.
- /// The key.
- /// System.Int32.
- internal static int GetCount(Dictionary counts, CountType key)
- {
- int count;
-
- if (counts.TryGetValue(key, out count))
- {
- return count;
- }
-
- return 0;
- }
-
- ///
- /// Sets the item counts.
- ///
- /// The user id.
- /// The media.
- /// The names.
- /// The master dictionary.
- internal static void SetItemCounts(Guid userId, BaseItem media, IEnumerable names, Dictionary>> masterDictionary)
- {
- var countType = GetCountType(media);
-
- foreach (var name in names)
- {
- Dictionary> libraryCounts;
-
- if (!masterDictionary.TryGetValue(name, out libraryCounts))
- {
- libraryCounts = new Dictionary>();
- masterDictionary.Add(name, libraryCounts);
- }
-
- var userLibId = userId/* ?? Guid.Empty*/;
- Dictionary userDictionary;
-
- if (!libraryCounts.TryGetValue(userLibId, out userDictionary))
- {
- userDictionary = new Dictionary();
- libraryCounts.Add(userLibId, userDictionary);
- }
-
- if (countType.HasValue)
- {
- IncrementCount(userDictionary, countType.Value);
- }
-
- IncrementCount(userDictionary, CountType.Total);
- }
- }
- }
-
- internal enum CountType
- {
- AdultVideo,
- MusicAlbum,
- Episode,
- Game,
- Movie,
- MusicVideo,
- Series,
- Song,
- Trailer,
- Total
- }
-}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 74b8bf2699..21fcd736f3 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -104,6 +104,7 @@
+
@@ -114,7 +115,7 @@
-
+
@@ -128,6 +129,8 @@
+
+
@@ -135,6 +138,7 @@
+
@@ -149,7 +153,7 @@
-
+
@@ -163,7 +167,6 @@
-
@@ -225,6 +228,7 @@
+
diff --git a/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs
new file mode 100644
index 0000000000..aebfbdb1c4
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs
@@ -0,0 +1,58 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+ public class IsPlayedComparer : IUserBaseItemComparer
+ {
+ ///
+ /// Gets or sets the user.
+ ///
+ /// The user.
+ public User User { get; set; }
+
+ ///
+ /// Compares the specified x.
+ ///
+ /// The x.
+ /// The y.
+ /// System.Int32.
+ public int Compare(BaseItem x, BaseItem y)
+ {
+ return GetValue(x).CompareTo(GetValue(y));
+ }
+
+ ///
+ /// Gets the date.
+ ///
+ /// The x.
+ /// DateTime.
+ private int GetValue(BaseItem x)
+ {
+ return x.IsPlayed(User) ? 0 : 1;
+ }
+
+ ///
+ /// Gets the name.
+ ///
+ /// The name.
+ public string Name
+ {
+ get { return ItemSortBy.IsUnplayed; }
+ }
+
+ ///
+ /// Gets or sets the user data repository.
+ ///
+ /// The user data repository.
+ public IUserDataManager UserDataRepository { get; set; }
+
+ ///
+ /// Gets or sets the user manager.
+ ///
+ /// The user manager.
+ public IUserManager UserManager { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs
index e3053155f5..f1c6a5a4eb 100644
--- a/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs
@@ -55,55 +55,4 @@ namespace MediaBrowser.Server.Implementations.Sorting
/// The user manager.
public IUserManager UserManager { get; set; }
}
-
- public class IsPlayedComparer : IUserBaseItemComparer
- {
- ///
- /// Gets or sets the user.
- ///
- /// The user.
- public User User { get; set; }
-
- ///
- /// Compares the specified x.
- ///
- /// The x.
- /// The y.
- /// System.Int32.
- public int Compare(BaseItem x, BaseItem y)
- {
- return GetValue(x).CompareTo(GetValue(y));
- }
-
- ///
- /// Gets the date.
- ///
- /// The x.
- /// DateTime.
- private int GetValue(BaseItem x)
- {
- return x.IsPlayed(User) ? 0 : 1;
- }
-
- ///
- /// Gets the name.
- ///
- /// The name.
- public string Name
- {
- get { return ItemSortBy.IsUnplayed; }
- }
-
- ///
- /// Gets or sets the user data repository.
- ///
- /// The user data repository.
- public IUserDataManager UserDataRepository { get; set; }
-
- ///
- /// Gets or sets the user manager.
- ///
- /// The user manager.
- public IUserManager UserManager { get; set; }
- }
}