diff options
Diffstat (limited to 'MediaBrowser.Model/Entities')
| -rw-r--r-- | MediaBrowser.Model/Entities/BaseItemInfo.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/ChapterInfo.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/DisplayPreferences.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/ImageDownloadOptions.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 36 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/ParentalRating.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/PluginSecurityInfo.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/RequestResult.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/VirtualFolderInfo.cs | 6 |
9 files changed, 14 insertions, 87 deletions
diff --git a/MediaBrowser.Model/Entities/BaseItemInfo.cs b/MediaBrowser.Model/Entities/BaseItemInfo.cs index c7483f073..dc7b3bebe 100644 --- a/MediaBrowser.Model/Entities/BaseItemInfo.cs +++ b/MediaBrowser.Model/Entities/BaseItemInfo.cs @@ -1,5 +1,4 @@ -using ProtoBuf; -using System; +using System; using System.Runtime.Serialization; namespace MediaBrowser.Model.Entities @@ -7,56 +6,48 @@ namespace MediaBrowser.Model.Entities /// <summary> /// This is a stub class containing only basic information about an item /// </summary> - [ProtoContract] public class BaseItemInfo { /// <summary> /// Gets or sets the name. /// </summary> /// <value>The name.</value> - [ProtoMember(1)] public string Name { get; set; } /// <summary> /// Gets or sets the id. /// </summary> /// <value>The id.</value> - [ProtoMember(2)] public string Id { get; set; } /// <summary> /// Gets or sets the type. /// </summary> /// <value>The type.</value> - [ProtoMember(3)] public string Type { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is folder. /// </summary> /// <value><c>true</c> if this instance is folder; otherwise, <c>false</c>.</value> - [ProtoMember(4)] public bool IsFolder { get; set; } /// <summary> /// Gets or sets the run time ticks. /// </summary> /// <value>The run time ticks.</value> - [ProtoMember(5)] public long? RunTimeTicks { get; set; } /// <summary> /// Gets or sets the primary image tag. /// </summary> /// <value>The primary image tag.</value> - [ProtoMember(6)] public Guid? PrimaryImageTag { get; set; } /// <summary> /// Gets or sets the backdrop image tag. /// </summary> /// <value>The backdrop image tag.</value> - [ProtoMember(7)] public Guid? BackdropImageTag { get; set; } /// <summary> diff --git a/MediaBrowser.Model/Entities/ChapterInfo.cs b/MediaBrowser.Model/Entities/ChapterInfo.cs index 72e2fe1fd..9da7a9caa 100644 --- a/MediaBrowser.Model/Entities/ChapterInfo.cs +++ b/MediaBrowser.Model/Entities/ChapterInfo.cs @@ -1,32 +1,27 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { /// <summary> /// Class ChapterInfo /// </summary> - [ProtoContract] public class ChapterInfo { /// <summary> /// Gets or sets the start position ticks. /// </summary> /// <value>The start position ticks.</value> - [ProtoMember(1)] public long StartPositionTicks { get; set; } /// <summary> /// Gets or sets the name. /// </summary> /// <value>The name.</value> - [ProtoMember(2)] public string Name { get; set; } /// <summary> /// Gets or sets the image path. /// </summary> /// <value>The image path.</value> - [ProtoMember(3)] public string ImagePath { get; set; } } } diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs index 31edab621..009df2678 100644 --- a/MediaBrowser.Model/Entities/DisplayPreferences.cs +++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Drawing; -using ProtoBuf; using System; using System.Collections.Generic; @@ -8,7 +7,6 @@ namespace MediaBrowser.Model.Entities /// <summary> /// Defines the display preferences for any item that supports them (usually Folders) /// </summary> - [ProtoContract] public class DisplayPreferences { /// <summary> @@ -31,67 +29,56 @@ namespace MediaBrowser.Model.Entities /// Gets or sets the user id. /// </summary> /// <value>The user id.</value> - [ProtoMember(1)] public Guid Id { get; set; } /// <summary> /// Gets or sets the type of the view. /// </summary> /// <value>The type of the view.</value> - [ProtoMember(2)] public string ViewType { get; set; } /// <summary> /// Gets or sets the sort by. /// </summary> /// <value>The sort by.</value> - [ProtoMember(4)] public string SortBy { get; set; } /// <summary> /// Gets or sets the index by. /// </summary> /// <value>The index by.</value> - [ProtoMember(5)] public string IndexBy { get; set; } /// <summary> /// Gets or sets a value indicating whether [remember indexing]. /// </summary> /// <value><c>true</c> if [remember indexing]; otherwise, <c>false</c>.</value> - [ProtoMember(6)] public bool RememberIndexing { get; set; } /// <summary> /// Gets or sets the height of the primary image. /// </summary> /// <value>The height of the primary image.</value> - [ProtoMember(7)] public int PrimaryImageHeight { get; set; } /// <summary> /// Gets or sets the width of the primary image. /// </summary> /// <value>The width of the primary image.</value> - [ProtoMember(8)] public int PrimaryImageWidth { get; set; } /// <summary> /// Gets or sets the custom prefs. /// </summary> /// <value>The custom prefs.</value> - [ProtoMember(9)] public Dictionary<string, string> CustomPrefs { get; set; } /// <summary> /// Gets or sets the scroll direction. /// </summary> /// <value>The scroll direction.</value> - [ProtoMember(10)] public ScrollDirection ScrollDirection { get; set; } /// <summary> /// Gets or sets a value indicating whether [remember sorting]. /// </summary> /// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value> - [ProtoMember(11)] public bool RememberSorting { get; set; } /// <summary> /// Gets or sets the sort order. /// </summary> /// <value>The sort order.</value> - [ProtoMember(12)] public SortOrder SortOrder { get; set; } /// <summary> diff --git a/MediaBrowser.Model/Entities/ImageDownloadOptions.cs b/MediaBrowser.Model/Entities/ImageDownloadOptions.cs index b5c3ee392..c69c759ac 100644 --- a/MediaBrowser.Model/Entities/ImageDownloadOptions.cs +++ b/MediaBrowser.Model/Entities/ImageDownloadOptions.cs @@ -1,50 +1,41 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { - [ProtoContract] public class ImageDownloadOptions { /// <summary> /// Download Art Image /// </summary> - [ProtoMember(1)] public bool Art { get; set; } /// <summary> /// Download Logo Image /// </summary> - [ProtoMember(2)] public bool Logo { get; set; } /// <summary> /// Download Primary Image /// </summary> - [ProtoMember(3)] public bool Primary { get; set; } /// <summary> /// Download Backdrop Images /// </summary> - [ProtoMember(4)] public bool Backdrops { get; set; } /// <summary> /// Download Disc Image /// </summary> - [ProtoMember(5)] public bool Disc { get; set; } /// <summary> /// Download Thumb Image /// </summary> - [ProtoMember(6)] public bool Thumb { get; set; } /// <summary> /// Download Banner Image /// </summary> - [ProtoMember(7)] public bool Banner { get; set; } } diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index b68ffe118..657a20b8d 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -1,151 +1,129 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { /// <summary> /// Class MediaStream /// </summary> - [ProtoContract] public class MediaStream { /// <summary> /// Gets or sets the codec. /// </summary> /// <value>The codec.</value> - [ProtoMember(1)] public string Codec { get; set; } /// <summary> /// Gets or sets the language. /// </summary> /// <value>The language.</value> - [ProtoMember(2)] public string Language { get; set; } /// <summary> + /// Gets or sets the type of the scan. + /// </summary> + /// <value>The type of the scan.</value> + public string ScanType { get; set; } + + /// <summary> /// Gets or sets the bit rate. /// </summary> /// <value>The bit rate.</value> - [ProtoMember(3)] public int? BitRate { get; set; } /// <summary> /// Gets or sets the channels. /// </summary> /// <value>The channels.</value> - [ProtoMember(4)] public int? Channels { get; set; } /// <summary> /// Gets or sets the sample rate. /// </summary> /// <value>The sample rate.</value> - [ProtoMember(5)] public int? SampleRate { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is default. /// </summary> /// <value><c>true</c> if this instance is default; otherwise, <c>false</c>.</value> - [ProtoMember(6)] public bool IsDefault { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is forced. /// </summary> /// <value><c>true</c> if this instance is forced; otherwise, <c>false</c>.</value> - [ProtoMember(7)] public bool IsForced { get; set; } /// <summary> /// Gets or sets the height. /// </summary> /// <value>The height.</value> - [ProtoMember(8)] public int? Height { get; set; } /// <summary> /// Gets or sets the width. /// </summary> /// <value>The width.</value> - [ProtoMember(9)] public int? Width { get; set; } /// <summary> - /// Gets or sets the type of the scan. - /// </summary> - /// <value>The type of the scan.</value> - [ProtoMember(10)] - public string ScanType { get; set; } - - /// <summary> /// Gets or sets the average frame rate. /// </summary> /// <value>The average frame rate.</value> - [ProtoMember(11)] public float? AverageFrameRate { get; set; } /// <summary> /// Gets or sets the real frame rate. /// </summary> /// <value>The real frame rate.</value> - [ProtoMember(12)] public float? RealFrameRate { get; set; } /// <summary> /// Gets or sets the profile. /// </summary> /// <value>The profile.</value> - [ProtoMember(13)] public string Profile { get; set; } /// <summary> /// Gets or sets the type. /// </summary> /// <value>The type.</value> - [ProtoMember(14)] public MediaStreamType Type { get; set; } /// <summary> /// Gets or sets the aspect ratio. /// </summary> /// <value>The aspect ratio.</value> - [ProtoMember(15)] public string AspectRatio { get; set; } /// <summary> /// Gets or sets the index. /// </summary> /// <value>The index.</value> - [ProtoMember(16)] public int Index { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is external. /// </summary> /// <value><c>true</c> if this instance is external; otherwise, <c>false</c>.</value> - [ProtoMember(17)] public bool IsExternal { get; set; } /// <summary> /// Gets or sets the filename. /// </summary> /// <value>The filename.</value> - [ProtoMember(18)] public string Path { get; set; } /// <summary> /// Gets or sets the level. /// </summary> /// <value>The level.</value> - [ProtoMember(19)] public double? Level { get; set; } /// <summary> /// Gets or sets the pixel format. /// </summary> /// <value>The pixel format.</value> - [ProtoMember(20)] public string PixelFormat { get; set; } } diff --git a/MediaBrowser.Model/Entities/ParentalRating.cs b/MediaBrowser.Model/Entities/ParentalRating.cs index bc3c43c2a..e2d1c6574 100644 --- a/MediaBrowser.Model/Entities/ParentalRating.cs +++ b/MediaBrowser.Model/Entities/ParentalRating.cs @@ -1,25 +1,21 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { /// <summary> /// Class ParentalRating /// </summary> - [ProtoContract] public class ParentalRating { /// <summary> /// Gets or sets the name. /// </summary> /// <value>The name.</value> - [ProtoMember(1)] public string Name { get; set; } /// <summary> /// Gets or sets the value. /// </summary> /// <value>The value.</value> - [ProtoMember(2)] public int Value { get; set; } } } diff --git a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs b/MediaBrowser.Model/Entities/PluginSecurityInfo.cs index 53cbbdbfa..e338e43f8 100644 --- a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs +++ b/MediaBrowser.Model/Entities/PluginSecurityInfo.cs @@ -1,32 +1,27 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { /// <summary> /// Class PluginSecurityInfo /// </summary> - [ProtoContract] public class PluginSecurityInfo { /// <summary> /// Gets or sets the supporter key. /// </summary> /// <value>The supporter key.</value> - [ProtoMember(1)] public string SupporterKey { get; set; } /// <summary> /// Gets or sets the legacy supporter key. /// </summary> /// <value><c>The legacy supporter key</value> - [ProtoMember(2)] public string LegacyKey { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is MB supporter. /// </summary> /// <value><c>true</c> if this instance is MB supporter; otherwise, <c>false</c>.</value> - [ProtoMember(3)] public bool IsMBSupporter { get; set; } } } diff --git a/MediaBrowser.Model/Entities/RequestResult.cs b/MediaBrowser.Model/Entities/RequestResult.cs index 88bd6e2ec..5c9a725fd 100644 --- a/MediaBrowser.Model/Entities/RequestResult.cs +++ b/MediaBrowser.Model/Entities/RequestResult.cs @@ -1,8 +1,6 @@ -using ProtoBuf; - + namespace MediaBrowser.Model.Entities { - [ProtoContract] public class EmptyRequestResult { } diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs index 390e51d42..be584e40e 100644 --- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs +++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs @@ -1,26 +1,22 @@ -using ProtoBuf; -using System.Collections.Generic; +using System.Collections.Generic; namespace MediaBrowser.Model.Entities { /// <summary> /// Used to hold information about a user's list of configured virtual folders /// </summary> - [ProtoContract] public class VirtualFolderInfo { /// <summary> /// Gets or sets the name. /// </summary> /// <value>The name.</value> - [ProtoMember(1)] public string Name { get; set; } /// <summary> /// Gets or sets the locations. /// </summary> /// <value>The locations.</value> - [ProtoMember(2)] public List<string> Locations { get; set; } } } |