diff options
36 files changed, 319 insertions, 239 deletions
diff --git a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs index e4abea4fc..7bb8d15fc 100644 --- a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs +++ b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs @@ -52,55 +52,4 @@ namespace MediaBrowser.Controller.Channels ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); } } - - public enum ChannelItemType - { - Media = 0, - - Category = 1 - } - - public enum ChannelMediaType - { - Audio = 0, - - Video = 1 - } - - public enum ChannelMediaContentType - { - Clip = 0, - - Podcast = 1, - - Trailer = 2, - - Movie = 3, - - Episode = 4, - - Song = 5 - } - - public class ChannelMediaInfo - { - public string Path { get; set; } - - public Dictionary<string, string> RequiredHttpHeaders { get; set; } - - public string Container { get; set; } - public string AudioCodec { get; set; } - public string VideoCodec { get; set; } - - public int? AudioBitrate { get; set; } - public int? VideoBitrate { get; set; } - public int? Width { get; set; } - public int? Height { get; set; } - public int? AudioChannels { get; set; } - - public ChannelMediaInfo() - { - RequiredHttpHeaders = new Dictionary<string, string>(); - } - } } diff --git a/MediaBrowser.Controller/Channels/ChannelItemResult.cs b/MediaBrowser.Controller/Channels/ChannelItemResult.cs new file mode 100644 index 000000000..c6d33996e --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelItemResult.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Channels +{ + public class ChannelItemResult + { + public List<ChannelItemInfo> Items { get; set; } + + public TimeSpan CacheLength { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/ChannelItemType.cs b/MediaBrowser.Controller/Channels/ChannelItemType.cs new file mode 100644 index 000000000..ba9d7f414 --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelItemType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Controller.Channels +{ + public enum ChannelItemType + { + Media = 0, + + Category = 1 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/ChannelMediaContentType.cs b/MediaBrowser.Controller/Channels/ChannelMediaContentType.cs new file mode 100644 index 000000000..2aad8e0d9 --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelMediaContentType.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Controller.Channels +{ + public enum ChannelMediaContentType + { + Clip = 0, + + Podcast = 1, + + Trailer = 2, + + Movie = 3, + + Episode = 4, + + Song = 5 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs new file mode 100644 index 000000000..8105bf43c --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Channels +{ + public class ChannelMediaInfo + { + public string Path { get; set; } + + public Dictionary<string, string> RequiredHttpHeaders { get; set; } + + public string Container { get; set; } + public string AudioCodec { get; set; } + public string VideoCodec { get; set; } + + public int? AudioBitrate { get; set; } + public int? VideoBitrate { get; set; } + public int? Width { get; set; } + public int? Height { get; set; } + public int? AudioChannels { get; set; } + + public ChannelMediaInfo() + { + RequiredHttpHeaders = new Dictionary<string, string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/ChannelMediaType.cs b/MediaBrowser.Controller/Channels/ChannelMediaType.cs new file mode 100644 index 000000000..a03e27498 --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelMediaType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Controller.Channels +{ + public enum ChannelMediaType + { + Audio = 0, + + Video = 1 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/ChannelSearchInfo.cs b/MediaBrowser.Controller/Channels/ChannelSearchInfo.cs new file mode 100644 index 000000000..bf7461327 --- /dev/null +++ b/MediaBrowser.Controller/Channels/ChannelSearchInfo.cs @@ -0,0 +1,7 @@ +namespace MediaBrowser.Controller.Channels +{ + public class ChannelSearchInfo + { + public string SearchTerm { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/IChannel.cs b/MediaBrowser.Controller/Channels/IChannel.cs index e19d083e2..bd0bd64ea 100644 --- a/MediaBrowser.Controller/Channels/IChannel.cs +++ b/MediaBrowser.Controller/Channels/IChannel.cs @@ -1,7 +1,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; -using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -60,28 +59,4 @@ namespace MediaBrowser.Controller.Channels /// <returns>IEnumerable{ImageType}.</returns> IEnumerable<ImageType> GetSupportedChannelImages(); } - - public interface IChannelFactory - { - IEnumerable<IChannel> GetChannels(); - } - - public class ChannelSearchInfo - { - public string SearchTerm { get; set; } - } - - public class InternalChannelItemQuery - { - public string CategoryId { get; set; } - - public User User { get; set; } - } - - public class ChannelItemResult - { - public List<ChannelItemInfo> Items { get; set; } - - public TimeSpan CacheLength { get; set; } - } } diff --git a/MediaBrowser.Controller/Channels/IChannelFactory.cs b/MediaBrowser.Controller/Channels/IChannelFactory.cs new file mode 100644 index 000000000..e275227ff --- /dev/null +++ b/MediaBrowser.Controller/Channels/IChannelFactory.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Channels +{ + public interface IChannelFactory + { + IEnumerable<IChannel> GetChannels(); + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/IChannelItem.cs b/MediaBrowser.Controller/Channels/IChannelItem.cs index b653cead0..fc088b888 100644 --- a/MediaBrowser.Controller/Channels/IChannelItem.cs +++ b/MediaBrowser.Controller/Channels/IChannelItem.cs @@ -12,11 +12,4 @@ namespace MediaBrowser.Controller.Channels string OriginalImageUrl { get; set; } } - - public interface IChannelMediaItem : IChannelItem - { - bool IsInfiniteStream { get; set; } - - ChannelMediaContentType ContentType { get; set; } - } } diff --git a/MediaBrowser.Controller/Channels/IChannelMediaItem.cs b/MediaBrowser.Controller/Channels/IChannelMediaItem.cs new file mode 100644 index 000000000..3a2c076e0 --- /dev/null +++ b/MediaBrowser.Controller/Channels/IChannelMediaItem.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Controller.Channels +{ + public interface IChannelMediaItem : IChannelItem + { + bool IsInfiniteStream { get; set; } + + ChannelMediaContentType ContentType { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Channels/InternalChannelItemQuery.cs b/MediaBrowser.Controller/Channels/InternalChannelItemQuery.cs new file mode 100644 index 000000000..21100ebdd --- /dev/null +++ b/MediaBrowser.Controller/Channels/InternalChannelItemQuery.cs @@ -0,0 +1,11 @@ +using MediaBrowser.Controller.Entities; + +namespace MediaBrowser.Controller.Channels +{ + public class InternalChannelItemQuery + { + public string CategoryId { get; set; } + + public User User { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Dlna/ControlRequest.cs b/MediaBrowser.Controller/Dlna/ControlRequest.cs index 1bb5ddf8a..7020cc0d9 100644 --- a/MediaBrowser.Controller/Dlna/ControlRequest.cs +++ b/MediaBrowser.Controller/Dlna/ControlRequest.cs @@ -17,18 +17,4 @@ namespace MediaBrowser.Controller.Dlna Headers = new Dictionary<string, string>(); } } - - public class ControlResponse - { - public IDictionary<string, string> Headers { get; set; } - - public string Xml { get; set; } - - public bool IsSuccessful { get; set; } - - public ControlResponse() - { - Headers = new Dictionary<string, string>(); - } - } } diff --git a/MediaBrowser.Controller/Dlna/ControlResponse.cs b/MediaBrowser.Controller/Dlna/ControlResponse.cs new file mode 100644 index 000000000..8d19a8109 --- /dev/null +++ b/MediaBrowser.Controller/Dlna/ControlResponse.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Dlna +{ + public class ControlResponse + { + public IDictionary<string, string> Headers { get; set; } + + public string Xml { get; set; } + + public bool IsSuccessful { get; set; } + + public ControlResponse() + { + Headers = new Dictionary<string, string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs index b0e44a200..9c42e0581 100644 --- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs @@ -86,24 +86,4 @@ namespace MediaBrowser.Controller.Drawing /// <returns>Task{System.String}.</returns> Task<string> GetEnhancedImage(IHasImages item, ImageType imageType, int imageIndex); } - - public static class ImageProcessorExtensions - { - public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType) - { - return processor.GetImageCacheTag(item, imageType, 0); - } - - public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType, int imageIndex) - { - var imageInfo = item.GetImageInfo(imageType, imageIndex); - - if (imageInfo == null) - { - return null; - } - - return processor.GetImageCacheTag(item, imageInfo); - } - } } diff --git a/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs b/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs new file mode 100644 index 000000000..c5601c49f --- /dev/null +++ b/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs @@ -0,0 +1,25 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Controller.Drawing +{ + public static class ImageProcessorExtensions + { + public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType) + { + return processor.GetImageCacheTag(item, imageType, 0); + } + + public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType, int imageIndex) + { + var imageInfo = item.GetImageInfo(imageType, imageIndex); + + if (imageInfo == null) + { + return null; + } + + return processor.GetImageCacheTag(item, imageInfo); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Library/IIntroProvider.cs b/MediaBrowser.Controller/Library/IIntroProvider.cs index 224ca2271..a83d3c5eb 100644 --- a/MediaBrowser.Controller/Library/IIntroProvider.cs +++ b/MediaBrowser.Controller/Library/IIntroProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller.Entities; -using System; using System.Collections.Generic; namespace MediaBrowser.Controller.Library @@ -23,19 +22,4 @@ namespace MediaBrowser.Controller.Library /// <returns>IEnumerable{System.String}.</returns> IEnumerable<string> GetAllIntroFiles(); } - - public class IntroInfo - { - /// <summary> - /// Gets or sets the path. - /// </summary> - /// <value>The path.</value> - public string Path { get; set; } - - /// <summary> - /// Gets or sets the item id. - /// </summary> - /// <value>The item id.</value> - public Guid? ItemId { get; set; } - } } diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index 7529f1e0d..69dea5e74 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -333,20 +333,4 @@ namespace MediaBrowser.Controller.Library /// <returns>IEnumerable{BaseItem}.</returns> IEnumerable<BaseItem> ReplaceVideosWithPrimaryVersions(IEnumerable<BaseItem> items); } - - public static class LibraryManagerExtensions - { - public static Task DeleteItem(this ILibraryManager manager, BaseItem item) - { - return manager.DeleteItem(item, new DeleteOptions - { - DeleteFileLocation = true - }); - } - - public static BaseItem GetItemById(this ILibraryManager manager, string id) - { - return manager.GetItemById(new Guid(id)); - } - } }
\ No newline at end of file diff --git a/MediaBrowser.Controller/Library/IMetadataFileSaver.cs b/MediaBrowser.Controller/Library/IMetadataFileSaver.cs new file mode 100644 index 000000000..0883da48f --- /dev/null +++ b/MediaBrowser.Controller/Library/IMetadataFileSaver.cs @@ -0,0 +1,14 @@ +using MediaBrowser.Controller.Entities; + +namespace MediaBrowser.Controller.Library +{ + public interface IMetadataFileSaver : IMetadataSaver + { + /// <summary> + /// Gets the save path. + /// </summary> + /// <param name="item">The item.</param> + /// <returns>System.String.</returns> + string GetSavePath(IHasMetadata item); + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Library/IMetadataSaver.cs b/MediaBrowser.Controller/Library/IMetadataSaver.cs index cfee9d206..ce8feb4c6 100644 --- a/MediaBrowser.Controller/Library/IMetadataSaver.cs +++ b/MediaBrowser.Controller/Library/IMetadataSaver.cs @@ -31,14 +31,4 @@ namespace MediaBrowser.Controller.Library /// <returns>Task.</returns> void Save(IHasMetadata item, CancellationToken cancellationToken); } - - public interface IMetadataFileSaver : IMetadataSaver - { - /// <summary> - /// Gets the save path. - /// </summary> - /// <param name="item">The item.</param> - /// <returns>System.String.</returns> - string GetSavePath(IHasMetadata item); - } } diff --git a/MediaBrowser.Controller/Library/IntroInfo.cs b/MediaBrowser.Controller/Library/IntroInfo.cs new file mode 100644 index 000000000..d0e61d0f0 --- /dev/null +++ b/MediaBrowser.Controller/Library/IntroInfo.cs @@ -0,0 +1,19 @@ +using System; + +namespace MediaBrowser.Controller.Library +{ + public class IntroInfo + { + /// <summary> + /// Gets or sets the path. + /// </summary> + /// <value>The path.</value> + public string Path { get; set; } + + /// <summary> + /// Gets or sets the item id. + /// </summary> + /// <value>The item id.</value> + public Guid? ItemId { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Library/LibraryManagerExtensions.cs b/MediaBrowser.Controller/Library/LibraryManagerExtensions.cs new file mode 100644 index 000000000..dd1c9c07a --- /dev/null +++ b/MediaBrowser.Controller/Library/LibraryManagerExtensions.cs @@ -0,0 +1,22 @@ +using System; +using System.Threading.Tasks; +using MediaBrowser.Controller.Entities; + +namespace MediaBrowser.Controller.Library +{ + public static class LibraryManagerExtensions + { + public static Task DeleteItem(this ILibraryManager manager, BaseItem item) + { + return manager.DeleteItem(item, new DeleteOptions + { + DeleteFileLocation = true + }); + } + + public static BaseItem GetItemById(this ILibraryManager manager, string id) + { + return manager.GetItemById(new Guid(id)); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs index 7482607ff..7b7b625bf 100644 --- a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs +++ b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs @@ -24,13 +24,4 @@ namespace MediaBrowser.Controller.Library Users = new List<User>(); } } - - public class PlaybackStopEventArgs : PlaybackProgressEventArgs - { - /// <summary> - /// Gets or sets a value indicating whether [played to completion]. - /// </summary> - /// <value><c>true</c> if [played to completion]; otherwise, <c>false</c>.</value> - public bool PlayedToCompletion { get; set; } - } } diff --git a/MediaBrowser.Controller/Library/PlaybackStopEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackStopEventArgs.cs new file mode 100644 index 000000000..b0f6799fc --- /dev/null +++ b/MediaBrowser.Controller/Library/PlaybackStopEventArgs.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Controller.Library +{ + public class PlaybackStopEventArgs : PlaybackProgressEventArgs + { + /// <summary> + /// Gets or sets a value indicating whether [played to completion]. + /// </summary> + /// <value><c>true</c> if [played to completion]; otherwise, <c>false</c>.</value> + public bool PlayedToCompletion { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs b/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs new file mode 100644 index 000000000..682150d35 --- /dev/null +++ b/MediaBrowser.Controller/LiveTv/LiveTvConflictException.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Controller.LiveTv +{ + /// <summary> + /// Class LiveTvConflictException. + /// </summary> + public class LiveTvConflictException : LiveTvException + { + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/LiveTv/LiveTvException.cs b/MediaBrowser.Controller/LiveTv/LiveTvException.cs index 0a68180ca..b0a6f75b1 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvException.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvException.cs @@ -8,11 +8,4 @@ namespace MediaBrowser.Controller.LiveTv public class LiveTvException : Exception { } - - /// <summary> - /// Class LiveTvConflictException. - /// </summary> - public class LiveTvConflictException : LiveTvException - { - } } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs index da6b8ab17..0cb064aba 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs @@ -40,60 +40,4 @@ namespace MediaBrowser.Controller.LiveTv Tuners = new List<LiveTvTunerInfo>(); } } - - public class LiveTvTunerInfo - { - /// <summary> - /// Gets or sets the type of the source. - /// </summary> - /// <value>The type of the source.</value> - public string SourceType { get; set; } - - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the identifier. - /// </summary> - /// <value>The identifier.</value> - public string Id { get; set; } - - /// <summary> - /// Gets or sets the status. - /// </summary> - /// <value>The status.</value> - public LiveTvTunerStatus Status { get; set; } - - /// <summary> - /// Gets or sets the channel identifier. - /// </summary> - /// <value>The channel identifier.</value> - public string ChannelId { get; set; } - - /// <summary> - /// Gets or sets the recording identifier. - /// </summary> - /// <value>The recording identifier.</value> - public string RecordingId { get; set; } - - /// <summary> - /// Gets or sets the name of the program. - /// </summary> - /// <value>The name of the program.</value> - public string ProgramName { get; set; } - - /// <summary> - /// Gets or sets the clients. - /// </summary> - /// <value>The clients.</value> - public List<string> Clients { get; set; } - - public LiveTvTunerInfo() - { - Clients = new List<string>(); - } - } } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs new file mode 100644 index 000000000..cdf2f0ef5 --- /dev/null +++ b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using MediaBrowser.Model.LiveTv; + +namespace MediaBrowser.Controller.LiveTv +{ + public class LiveTvTunerInfo + { + /// <summary> + /// Gets or sets the type of the source. + /// </summary> + /// <value>The type of the source.</value> + public string SourceType { get; set; } + + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the identifier. + /// </summary> + /// <value>The identifier.</value> + public string Id { get; set; } + + /// <summary> + /// Gets or sets the status. + /// </summary> + /// <value>The status.</value> + public LiveTvTunerStatus Status { get; set; } + + /// <summary> + /// Gets or sets the channel identifier. + /// </summary> + /// <value>The channel identifier.</value> + public string ChannelId { get; set; } + + /// <summary> + /// Gets or sets the recording identifier. + /// </summary> + /// <value>The recording identifier.</value> + public string RecordingId { get; set; } + + /// <summary> + /// Gets or sets the name of the program. + /// </summary> + /// <value>The name of the program.</value> + public string ProgramName { get; set; } + + /// <summary> + /// Gets or sets the clients. + /// </summary> + /// <value>The clients.</value> + public List<string> Clients { get; set; } + + public LiveTvTunerInfo() + { + Clients = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Controller/LiveTv/EventArgs.cs b/MediaBrowser.Controller/LiveTv/RecordingStatusChangedEventArgs.cs index 90ea329fe..90ea329fe 100644 --- a/MediaBrowser.Controller/LiveTv/EventArgs.cs +++ b/MediaBrowser.Controller/LiveTv/RecordingStatusChangedEventArgs.cs diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index c7c4c5b5f..97158c112 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -71,18 +71,28 @@ <Compile Include="Channels\ChannelCategoryItem.cs" /> <Compile Include="Channels\ChannelInfo.cs" /> <Compile Include="Channels\ChannelItemInfo.cs" /> + <Compile Include="Channels\ChannelItemResult.cs" /> + <Compile Include="Channels\ChannelItemType.cs" /> + <Compile Include="Channels\ChannelMediaContentType.cs" /> + <Compile Include="Channels\ChannelMediaInfo.cs" /> + <Compile Include="Channels\ChannelMediaType.cs" /> + <Compile Include="Channels\ChannelSearchInfo.cs" /> <Compile Include="Channels\IChannel.cs" /> + <Compile Include="Channels\IChannelFactory.cs" /> <Compile Include="Channels\IChannelManager.cs" /> <Compile Include="Channels\IChannelItem.cs" /> <Compile Include="Channels\ChannelAudioItem.cs" /> <Compile Include="Channels\ChannelVideoItem.cs" /> <Compile Include="Channels\Channel.cs" /> + <Compile Include="Channels\IChannelMediaItem.cs" /> + <Compile Include="Channels\InternalChannelItemQuery.cs" /> <Compile Include="Chapters\ChapterSearchRequest.cs" /> <Compile Include="Chapters\IChapterProvider.cs" /> <Compile Include="Chapters\ChapterResponse.cs" /> <Compile Include="Collections\CollectionCreationOptions.cs" /> <Compile Include="Collections\ICollectionManager.cs" /> <Compile Include="Dlna\ControlRequest.cs" /> + <Compile Include="Dlna\ControlResponse.cs" /> <Compile Include="Dlna\DlnaIconResponse.cs" /> <Compile Include="Dlna\EventSubscriptionResponse.cs" /> <Compile Include="Dlna\IContentDirectory.cs" /> @@ -91,6 +101,7 @@ <Compile Include="Drawing\IImageProcessor.cs" /> <Compile Include="Drawing\ImageFormat.cs" /> <Compile Include="Drawing\ImageProcessingOptions.cs" /> + <Compile Include="Drawing\ImageProcessorExtensions.cs" /> <Compile Include="Dto\IDtoService.cs" /> <Compile Include="Entities\AdultVideo.cs" /> <Compile Include="Entities\Audio\IHasAlbumArtist.cs" /> @@ -135,12 +146,16 @@ <Compile Include="FileOrganization\IFileOrganizationService.cs" /> <Compile Include="Library\DeleteOptions.cs" /> <Compile Include="Library\ILibraryPostScanTask.cs" /> + <Compile Include="Library\IMetadataFileSaver.cs" /> <Compile Include="Library\IMetadataSaver.cs" /> <Compile Include="Library\IMusicManager.cs" /> + <Compile Include="Library\IntroInfo.cs" /> <Compile Include="Library\ItemUpdateType.cs" /> <Compile Include="Library\IUserDataManager.cs" /> + <Compile Include="Library\LibraryManagerExtensions.cs" /> + <Compile Include="Library\PlaybackStopEventArgs.cs" /> <Compile Include="Library\UserDataSaveEventArgs.cs" /> - <Compile Include="LiveTv\EventArgs.cs" /> + <Compile Include="LiveTv\RecordingStatusChangedEventArgs.cs" /> <Compile Include="LiveTv\ILiveTvRecording.cs" /> <Compile Include="LiveTv\LiveStreamInfo.cs" /> <Compile Include="LiveTv\LiveTvAudioRecording.cs" /> @@ -148,8 +163,10 @@ <Compile Include="LiveTv\ChannelInfo.cs" /> <Compile Include="LiveTv\ILiveTvManager.cs" /> <Compile Include="LiveTv\ILiveTvService.cs" /> + <Compile Include="LiveTv\LiveTvConflictException.cs" /> <Compile Include="LiveTv\LiveTvException.cs" /> <Compile Include="LiveTv\LiveTvServiceStatusInfo.cs" /> + <Compile Include="LiveTv\LiveTvTunerInfo.cs" /> <Compile Include="LiveTv\StreamResponseInfo.cs" /> <Compile Include="LiveTv\LiveTvProgram.cs" /> <Compile Include="LiveTv\LiveTvVideoRecording.cs" /> diff --git a/MediaBrowser.Model/Chapters/RemoteChapterResult.cs b/MediaBrowser.Model/Chapters/RemoteChapterResult.cs index 5c58e5e7b..3f627c8df 100644 --- a/MediaBrowser.Model/Chapters/RemoteChapterResult.cs +++ b/MediaBrowser.Model/Chapters/RemoteChapterResult.cs @@ -32,5 +32,11 @@ namespace MediaBrowser.Model.Chapters /// </summary> /// <value>The chapter count.</value> public int? ChapterCount { get; set; } + + /// <summary> + /// Gets or sets the name of the three letter iso language. + /// </summary> + /// <value>The name of the three letter iso language.</value> + public string ThreeLetterISOLanguageName { get; set; } } } diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs index dab9a57a8..0a4a52cd5 100644 --- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs +++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs @@ -4,7 +4,7 @@ namespace MediaBrowser.Model.Providers { public class RemoteSubtitleInfo { - public string Language { get; set; } + public string ThreeLetterISOLanguageName { get; set; } public string Id { get; set; } public string ProviderName { get; set; } public string Name { get; set; } diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs index 5b951e0c2..297f05867 100644 --- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs @@ -259,7 +259,7 @@ namespace MediaBrowser.Providers.Subtitles DownloadCount = int.Parse(i.SubDownloadsCnt, _usCulture), Format = i.SubFormat, ProviderName = Name, - Language = i.SubLanguageID, + ThreeLetterISOLanguageName = i.SubLanguageID, Id = i.SubFormat + "-" + i.SubLanguageID + "-" + i.IDSubtitleFile, diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 8890d754f..1c90bdc87 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common.Internal</id> - <version>3.0.365</version> + <version>3.0.366</version> <title>MediaBrowser.Common.Internal</title> <authors>Luke</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.365" /> + <dependency id="MediaBrowser.Common" version="3.0.366" /> <dependency id="NLog" version="2.1.0" /> <dependency id="SimpleInjector" version="2.5.0" /> <dependency id="sharpcompress" version="0.10.2" /> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 4a3bac116..72bd0cbc0 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.365</version> + <version>3.0.366</version> <title>MediaBrowser.Common</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 6d35ea755..2fa54ab0d 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.365</version> + <version>3.0.366</version> <title>Media Browser.Server.Core</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Media Browser Server.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.365" /> + <dependency id="MediaBrowser.Common" version="3.0.366" /> </dependencies> </metadata> <files> |