diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
index 562e455259..b8ca70ba5e 100644
--- a/MediaBrowser.Api/SessionsService.cs
+++ b/MediaBrowser.Api/SessionsService.cs
@@ -46,14 +46,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; }
- ///
- /// Gets or sets the UserId.
- ///
- /// The id.
- [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
- //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use
-
///
/// Artist, Genre, Studio, Person, or any kind of BaseItem
///
@@ -96,14 +88,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; }
- ///
- /// Gets or sets the UserId.
- ///
- /// The id.
- [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
- //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use
-
///
/// Artist, Genre, Studio, Person, or any kind of BaseItem
///
@@ -137,14 +121,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; }
- ///
- /// Gets or sets the UserId.
- ///
- /// The id.
- [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
- //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use
-
///
/// Gets or sets the position to seek to
///
@@ -170,14 +146,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; }
- ///
- /// Gets or sets the UserId.
- ///
- /// The id.
- [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
- //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use
-
///
/// Gets or sets the command.
///
@@ -197,14 +165,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; }
- ///
- /// Gets or sets the UserId.
- ///
- /// The id.
- [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
- //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use
-
[ApiMember(Name = "Text", Description = "The message text.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Text { get; set; }
@@ -251,7 +211,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "PlayableMediaTypes", Description = "A list of playable media types, comma delimited. Audio, Video, Book, Game, Photo.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
public string PlayableMediaTypes { get; set; }
}
-
+
///
/// Class SessionsService
///
@@ -310,10 +270,9 @@ namespace MediaBrowser.Api
}
public void Post(SendPlaystateCommand request)
- {
+ {
var command = new PlaystateRequest
{
- UserId = request.UserId,
Command = request.Command,
SeekPositionTicks = request.SeekPositionTicks
};
@@ -331,7 +290,6 @@ namespace MediaBrowser.Api
{
var command = new BrowseRequest
{
- UserId = request.UserId,
Context = request.Context,
ItemId = request.ItemId,
ItemName = request.ItemName,
@@ -363,7 +321,6 @@ namespace MediaBrowser.Api
var command = new MessageCommand
{
Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header,
- UserId = request.UserId,
TimeoutMs = request.TimeoutMs,
Text = request.Text
};
@@ -382,7 +339,7 @@ namespace MediaBrowser.Api
var command = new PlayRequest
{
ItemIds = request.ItemIds.Split(',').ToArray(),
- UserId = request.UserId,
+
PlayCommand = request.PlayCommand,
StartPositionTicks = request.StartPositionTicks
};
@@ -411,4 +368,4 @@ namespace MediaBrowser.Api
.ToList();
}
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 6c05f8ee53..c8df3931d9 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -11,17 +11,12 @@
MediaBrowser.Model
MediaBrowser.Model
v4.0
- Profile158
+ Profile104
512
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
..\
true
..\packages\Fody.1.19.1.0
-
-
-
-
- 4.0
true
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 2924898693..46d3dcc3f5 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -244,7 +244,7 @@ namespace MediaBrowser.Model.ApiClient
/// The query.
/// Task{ItemsResult}.
Task GetSeasonsAsync(SeasonQuery query);
-
+
///
/// Queries for items
///
@@ -354,7 +354,7 @@ namespace MediaBrowser.Model.ApiClient
/// The query.
/// Task{ItemsResult}.
Task GetUpcomingEpisodesAsync(NextUpQuery query);
-
+
///
/// Gets a genre
///
@@ -572,18 +572,17 @@ namespace MediaBrowser.Model.ApiClient
/// Instructs antoher client to browse to a library item.
///
/// The session id.
- /// The controlling user id.
/// The id of the item to browse to.
/// The name of the item to browse to.
/// The type of the item to browse to.
/// Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.
/// Task.
- Task SendBrowseCommandAsync(string sessionId, string userId, string itemId, string itemName, string itemType, string context);
+ Task SendBrowseCommandAsync(string sessionId, string itemId, string itemName, string itemType, string context);
///
/// Sends the playstate command async.
///
- /// The session id.
+ /// The session id.
/// The request.
/// Task.
Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request);
@@ -780,7 +779,7 @@ namespace MediaBrowser.Model.ApiClient
/// The options.
/// System.String.
string GetImageUrl(ProgramInfoDto item, ImageOptions options);
-
+
///
/// Gets an image url that can be used to download an image from the api
///
@@ -910,7 +909,7 @@ namespace MediaBrowser.Model.ApiClient
/// The options.
/// System.String.
string GetThumbImageUrl(BaseItemDto item, ImageOptions options);
-
+
///
/// Gets the url needed to stream an audio file
///
@@ -966,7 +965,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task{ChannelInfoDto}.
Task GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken);
-
+
///
/// Gets the live tv recordings asynchronous.
///
@@ -983,7 +982,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task{RecordingInfoDto}.
Task GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken);
-
+
///
/// Gets the live tv recording groups asynchronous.
///
@@ -1000,7 +999,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task{RecordingGroupDto}.
Task GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken);
-
+
///
/// Gets the live tv timers asynchronous.
///
@@ -1065,7 +1064,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task.
Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken);
-
+
///
/// Gets the live tv timer asynchronous.
///
@@ -1073,7 +1072,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task{TimerInfoDto}.
Task GetLiveTvTimerAsync(string id, CancellationToken cancellationToken);
-
+
///
/// Gets the live tv series timers asynchronous.
///
@@ -1105,7 +1104,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task.
Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken);
-
+
///
/// Deletes the live tv recording asynchronous.
///
@@ -1127,7 +1126,7 @@ namespace MediaBrowser.Model.ApiClient
/// The cancellation token.
/// Task{GuideInfo}.
Task GetLiveTvGuideInfo(CancellationToken cancellationToken);
-
+
///
/// Gets the default timer information.
///
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index 03241860c8..e2cdcc1b28 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/MediaBrowser.Model/Session/BrowseRequest.cs
@@ -1,6 +1,4 @@
-using System;
-
namespace MediaBrowser.Model.Session
{
///
@@ -14,8 +12,6 @@ namespace MediaBrowser.Model.Session
/// The type of the item.
public string ItemType { get; set; }
- public Guid UserId { get; set; }
-
///
/// Gets or sets the item id.
///
@@ -27,7 +23,7 @@ namespace MediaBrowser.Model.Session
///
/// The name of the item.
public string ItemName { get; set; }
-
+
///
/// Gets or sets the context (Movies, Music, Tv, etc)
/// Applicable to genres, studios and persons only because the context of items and artists can be inferred.
@@ -44,4 +40,4 @@ namespace MediaBrowser.Model.Session
public const string TvShows = "TvShows";
public const string Games = "Games";
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs
index 754c057faa..b028765ed2 100644
--- a/MediaBrowser.Model/Session/MessageCommand.cs
+++ b/MediaBrowser.Model/Session/MessageCommand.cs
@@ -1,15 +1,12 @@
-using System;
namespace MediaBrowser.Model.Session
{
public class MessageCommand
- {
- public Guid UserId { get; set; }
-
+ {
public string Header { get; set; }
-
+
public string Text { get; set; }
public long? TimeoutMs { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index 239fb65729..57f6c37f57 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -1,5 +1,4 @@
-using System;
namespace MediaBrowser.Model.Session
{
///
@@ -7,11 +6,6 @@ namespace MediaBrowser.Model.Session
///
public class PlayRequest
{
- public PlayRequest()
- {
-
- }
-
///
/// Gets or sets the item ids.
///
@@ -29,12 +23,6 @@ namespace MediaBrowser.Model.Session
///
/// The play command.
public PlayCommand PlayCommand { get; set; }
-
- ///
- /// Gets or sets the play command.
- ///
- /// The play command.
- public Guid UserId { get; set; }
}
///
@@ -55,4 +43,4 @@ namespace MediaBrowser.Model.Session
///
PlayLast
}
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 68e80c4521..918f4f70f4 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -1,5 +1,4 @@
-using System;
namespace MediaBrowser.Model.Session
{
///
@@ -35,10 +34,8 @@ namespace MediaBrowser.Model.Session
public class PlaystateRequest
{
- public Guid UserId { get; set; }
-
public PlaystateCommand Command { get; set; }
public long? SeekPositionTicks { get; set; }
}
-}
+}
\ No newline at end of file