aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-13 13:27:13 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-13 13:27:13 -0400
commit8df1ebe49967ed96b85076bf4dbfbf761fb5268d (patch)
treed13e5447fa0551a6f6ced8fb09ae6cad3786c0e9 /MediaBrowser.Model
parentb6ca79b73fdae969773935068c175ace43ac778d (diff)
add new mirror mode
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs10
-rw-r--r--MediaBrowser.Model/Dto/StreamOptions.cs15
-rw-r--r--MediaBrowser.Model/Entities/BaseItemInfo.cs54
-rw-r--r--MediaBrowser.Model/Session/GeneralCommand.cs3
-rw-r--r--MediaBrowser.Model/Session/SessionInfoDto.cs6
5 files changed, 79 insertions, 9 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index dc5e26be3..782ca0c17 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -62,11 +62,10 @@ namespace MediaBrowser.Model.ApiClient
/// <summary>
/// Reports the capabilities.
/// </summary>
- /// <param name="sessionId">The session identifier.</param>
/// <param name="capabilities">The capabilities.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
- Task ReportCapabilities(string sessionId, ClientCapabilities capabilities, CancellationToken cancellationToken);
+ Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken);
/// <summary>
/// Gets the index of the game players.
@@ -772,6 +771,13 @@ namespace MediaBrowser.Model.ApiClient
string GetImageUrl(ProgramInfoDto item, ImageOptions options);
/// <summary>
+ /// Gets the subtitle URL.
+ /// </summary>
+ /// <param name="options">The options.</param>
+ /// <returns>System.String.</returns>
+ string GetSubtitleUrl(SubtitleOptions options);
+
+ /// <summary>
/// Gets an image url that can be used to download an image from the api
/// </summary>
/// <param name="itemId">The Id of the item</param>
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index c38707e53..b1ead2ca3 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -158,4 +158,19 @@
/// <value>The device id.</value>
public string DeviceId { get; set; }
}
+
+ public class SubtitleOptions
+ {
+ /// <summary>
+ /// Gets or sets the item identifier.
+ /// </summary>
+ /// <value>The item identifier.</value>
+ public string ItemId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the index of the stream.
+ /// </summary>
+ /// <value>The index of the stream.</value>
+ public int StreamIndex { get; set; }
+ }
}
diff --git a/MediaBrowser.Model/Entities/BaseItemInfo.cs b/MediaBrowser.Model/Entities/BaseItemInfo.cs
index 824f8dc03..d1e897e36 100644
--- a/MediaBrowser.Model/Entities/BaseItemInfo.cs
+++ b/MediaBrowser.Model/Entities/BaseItemInfo.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.Serialization;
@@ -81,6 +82,54 @@ namespace MediaBrowser.Model.Entities
/// </summary>
/// <value>The media version identifier.</value>
public string MediaSourceId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the premiere date.
+ /// </summary>
+ /// <value>The premiere date.</value>
+ public DateTime? PremiereDate { get; set; }
+
+ /// <summary>
+ /// Gets or sets the production year.
+ /// </summary>
+ /// <value>The production year.</value>
+ public int? ProductionYear { get; set; }
+
+ /// <summary>
+ /// Gets or sets the index number.
+ /// </summary>
+ /// <value>The index number.</value>
+ public int? IndexNumber { get; set; }
+
+ /// <summary>
+ /// Gets or sets the index number end.
+ /// </summary>
+ /// <value>The index number end.</value>
+ public int? IndexNumberEnd { get; set; }
+
+ /// <summary>
+ /// Gets or sets the parent index number.
+ /// </summary>
+ /// <value>The parent index number.</value>
+ public int? ParentIndexNumber { get; set; }
+
+ /// <summary>
+ /// Gets or sets the name of the series.
+ /// </summary>
+ /// <value>The name of the series.</value>
+ public string SeriesName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the album.
+ /// </summary>
+ /// <value>The album.</value>
+ public string Album { get; set; }
+
+ /// <summary>
+ /// Gets or sets the artists.
+ /// </summary>
+ /// <value>The artists.</value>
+ public List<string> Artists { get; set; }
/// <summary>
/// Gets a value indicating whether this instance has primary image.
@@ -91,5 +140,10 @@ namespace MediaBrowser.Model.Entities
{
get { return PrimaryImageTag.HasValue; }
}
+
+ public BaseItemInfo()
+ {
+ Artists = new List<string>();
+ }
}
}
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 4202ec456..b75b49e92 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -47,6 +47,7 @@ namespace MediaBrowser.Model.Session
SetVolume = 22,
SetAudioStreamIndex = 23,
SetSubtitleStreamIndex = 24,
- ToggleFullscreen = 25
+ ToggleFullscreen = 25,
+ DisplayContent = 26
}
}
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 4c51070ee..f235cebb3 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -164,12 +164,6 @@ namespace MediaBrowser.Model.Session
/// </summary>
/// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value>
public bool SupportsRemoteControl { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether [supports navigation commands].
- /// </summary>
- /// <value><c>true</c> if [supports navigation commands]; otherwise, <c>false</c>.</value>
- public bool SupportsNavigationControl { get; set; }
public event PropertyChangedEventHandler PropertyChanged;