diff options
Diffstat (limited to 'MediaBrowser.Controller')
6 files changed, 7 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 76e0e1fc53..a6f5016896 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -37,11 +37,11 @@ namespace MediaBrowser.Controller.Entities } [IgnoreDataMember] - public int AlternateVersionCount + public int MediaSourceCount { get { - return LinkedAlternateVersions.Count + LocalAlternateVersionIds.Count; + return LinkedAlternateVersions.Count + LocalAlternateVersionIds.Count + 1; } } diff --git a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs index ca815c1141..61984c7957 100644 --- a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs +++ b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs @@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Library public List<User> Users { get; set; } public long? PlaybackPositionTicks { get; set; } public BaseItem Item { get; set; } - public string MediaVersionId { get; set; } + public string MediaSourceId { get; set; } public PlaybackProgressEventArgs() { diff --git a/MediaBrowser.Controller/Session/PlaybackInfo.cs b/MediaBrowser.Controller/Session/PlaybackInfo.cs index 5cb488ff1c..a97f9e0d03 100644 --- a/MediaBrowser.Controller/Session/PlaybackInfo.cs +++ b/MediaBrowser.Controller/Session/PlaybackInfo.cs @@ -39,6 +39,6 @@ namespace MediaBrowser.Controller.Session /// Gets or sets the media version identifier. /// </summary> /// <value>The media version identifier.</value> - public string MediaVersionId { get; set; } + public string MediaSourceId { get; set; } } } diff --git a/MediaBrowser.Controller/Session/PlaybackProgressInfo.cs b/MediaBrowser.Controller/Session/PlaybackProgressInfo.cs index 0c825932c8..3d402aa6ff 100644 --- a/MediaBrowser.Controller/Session/PlaybackProgressInfo.cs +++ b/MediaBrowser.Controller/Session/PlaybackProgressInfo.cs @@ -39,6 +39,6 @@ namespace MediaBrowser.Controller.Session /// Gets or sets the media version identifier. /// </summary> /// <value>The media version identifier.</value> - public string MediaVersionId { get; set; } + public string MediaSourceId { get; set; } } } diff --git a/MediaBrowser.Controller/Session/PlaybackStopInfo.cs b/MediaBrowser.Controller/Session/PlaybackStopInfo.cs index 3391c96cf7..063abf78c0 100644 --- a/MediaBrowser.Controller/Session/PlaybackStopInfo.cs +++ b/MediaBrowser.Controller/Session/PlaybackStopInfo.cs @@ -27,6 +27,6 @@ namespace MediaBrowser.Controller.Session /// Gets or sets the media version identifier. /// </summary> /// <value>The media version identifier.</value> - public string MediaVersionId { get; set; } + public string MediaSourceId { get; set; } } } diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index 953d186e84..9dd57d12a1 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Session /// Gets or sets the now playing media version identifier. /// </summary> /// <value>The now playing media version identifier.</value> - public string NowPlayingMediaVersionId { get; set; } + public string NowPlayingMediaSourceId { get; set; } /// <summary> |