From c85f2957d9b68bf99dbd23efb2b8421845efd157 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 6 Mar 2014 00:23:06 -0500
Subject: updated nuget

---
 MediaBrowser.Model/ApiClient/IApiClient.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Model/ApiClient/IApiClient.cs')

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index d4d2a81240..2a965114bf 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -346,8 +346,15 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
-        Task<ItemsResult> GetNextUpAsync(NextUpQuery query);
+        Task<ItemsResult> GetNextUpEpisodesAsync(NextUpQuery query);
 
+        /// <summary>
+        /// Gets the upcoming episodes asynchronous.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>Task{ItemsResult}.</returns>
+        Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query);
+        
         /// <summary>
         /// Gets a genre
         /// </summary>
-- 
cgit v1.2.3


From 1ead63b0d1a532cf828a4ed7c5310eef9c255740 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 8 Mar 2014 13:17:05 -0500
Subject: add column sorting to reports

---
 MediaBrowser.Model/ApiClient/IApiClient.cs         | 63 ++++++++++++++++++++++
 MediaBrowser.Model/Querying/ItemSortBy.cs          |  3 ++
 .../MediaBrowser.Server.Implementations.csproj     |  7 ++-
 .../Sorting/GameSystemComparer.cs                  | 54 +++++++++++++++++++
 .../Sorting/PlayersComparer.cs                     | 46 ++++++++++++++++
 .../Sorting/StudioComparer.cs                      | 30 +++++++++++
 Nuget/MediaBrowser.Common.Internal.nuspec          |  4 +-
 Nuget/MediaBrowser.Common.nuspec                   |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |  4 +-
 9 files changed, 206 insertions(+), 7 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/Sorting/GameSystemComparer.cs
 create mode 100644 MediaBrowser.Server.Implementations/Sorting/PlayersComparer.cs
 create mode 100644 MediaBrowser.Server.Implementations/Sorting/StudioComparer.cs

(limited to 'MediaBrowser.Model/ApiClient/IApiClient.cs')

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 2a965114bf..a0e527a99d 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1016,6 +1016,15 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task{QueryResult{ProgramInfoDto}}.</returns>
         Task<QueryResult<ProgramInfoDto>> GetLiveTvProgramsAsync(ProgramQuery query, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Gets the live tv program asynchronous.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{ProgramInfoDto}.</returns>
+        Task<ProgramInfoDto> GetLiveTvProgramAsync(string id, string userId, CancellationToken cancellationToken);
+
         /// <summary>
         /// Gets the recommended live tv programs asynchronous.
         /// </summary>
@@ -1023,6 +1032,38 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{ProgramInfoDto}}.</returns>
         Task<QueryResult<ProgramInfoDto>> GetRecommendedLiveTvProgramsAsync(RecommendedProgramQuery query, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Creates the live tv timer asynchronous.
+        /// </summary>
+        /// <param name="timer">The timer.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task CreateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Updates the live tv timer asynchronous.
+        /// </summary>
+        /// <param name="timer">The timer.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task UpdateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Creates the live tv series timer asynchronous.
+        /// </summary>
+        /// <param name="timer">The timer.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task CreateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Updates the live tv series timer asynchronous.
+        /// </summary>
+        /// <param name="timer">The timer.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken);
         
         /// <summary>
         /// Gets the live tv timer asynchronous.
@@ -1071,5 +1112,27 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task DeleteLiveTvRecordingAsync(string id, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the default timer information.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{SeriesTimerInfoDto}.</returns>
+        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the live tv guide information.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{GuideInfo}.</returns>
+        Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken);
+        
+        /// <summary>
+        /// Gets the default timer information.
+        /// </summary>
+        /// <param name="programId">The program identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{SeriesTimerInfoDto}.</returns>
+        Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 09b8f0e18f..b07db396a0 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -86,5 +86,8 @@ namespace MediaBrowser.Model.Querying
         public const string VideoBitRate = "VideoBitRate";
         public const string AirTime = "AirTime";
         public const string Metascore = "Metascore";
+        public const string Studio = "Studio";
+        public const string Players = "Players";
+        public const string GameSystem = "GameSystem";
     }
 }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a0df2c23ac..78902f0dcc 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -225,6 +225,7 @@
     <Compile Include="Sorting\DateCreatedComparer.cs" />
     <Compile Include="Sorting\DatePlayedComparer.cs" />
     <Compile Include="Sorting\EpisodeCountComparer.cs" />
+    <Compile Include="Sorting\GameSystemComparer.cs" />
     <Compile Include="Sorting\IsFolderComparer.cs" />
     <Compile Include="Sorting\IsUnplayedComparer.cs" />
     <Compile Include="Sorting\MetascoreComparer.cs" />
@@ -233,6 +234,7 @@
     <Compile Include="Sorting\NameComparer.cs" />
     <Compile Include="Sorting\OfficialRatingComparer.cs" />
     <Compile Include="Sorting\PlayCountComparer.cs" />
+    <Compile Include="Sorting\PlayersComparer.cs" />
     <Compile Include="Sorting\PremiereDateComparer.cs" />
     <Compile Include="Sorting\ProductionYearComparer.cs" />
     <Compile Include="Sorting\RandomComparer.cs" />
@@ -246,6 +248,7 @@
     <Compile Include="Persistence\SqliteItemRepository.cs" />
     <Compile Include="Persistence\SqliteUserDataRepository.cs" />
     <Compile Include="Persistence\SqliteUserRepository.cs" />
+    <Compile Include="Sorting\StudioComparer.cs" />
     <Compile Include="Sorting\TrailerCountComparer.cs" />
     <Compile Include="Sorting\VideoBitRateComparer.cs" />
     <Compile Include="Themes\AppThemeManager.cs" />
@@ -376,10 +379,10 @@
       <Link>swagger-ui\swagger-ui.min.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="x64\SQLite.Interop.dll">
+    <Content Include="x64\SQLite.Interop.dll" Condition=" '$(ConfigurationName)' != 'Release Mono' ">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="x86\SQLite.Interop.dll">
+    <Content Include="x86\SQLite.Interop.dll" Condition=" '$(ConfigurationName)' != 'Release Mono' ">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
diff --git a/MediaBrowser.Server.Implementations/Sorting/GameSystemComparer.cs b/MediaBrowser.Server.Implementations/Sorting/GameSystemComparer.cs
new file mode 100644
index 0000000000..eb83b98e97
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/GameSystemComparer.cs
@@ -0,0 +1,54 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+using System;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+    public class GameSystemComparer : IBaseItemComparer
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return string.Compare(GetValue(x), GetValue(y), StringComparison.CurrentCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private string GetValue(BaseItem x)
+        {
+            var game = x as Game;
+
+            if (game != null)
+            {
+                return game.GameSystem;
+            }
+
+            var system = x as GameSystem;
+
+            if (system != null)
+            {
+                return system.GameSystemName;
+            }
+
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return ItemSortBy.GameSystem; }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Sorting/PlayersComparer.cs b/MediaBrowser.Server.Implementations/Sorting/PlayersComparer.cs
new file mode 100644
index 0000000000..5bcd080d7b
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/PlayersComparer.cs
@@ -0,0 +1,46 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+    public class PlayersComparer : IBaseItemComparer
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return GetValue(x).CompareTo(GetValue(y));
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns>System.String.</returns>
+        private int GetValue(BaseItem x)
+        {
+            var game = x as Game;
+
+            if (game != null)
+            {
+                return game.PlayersSupported ?? 0;
+            }
+
+            return 0;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return ItemSortBy.Players; }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Sorting/StudioComparer.cs b/MediaBrowser.Server.Implementations/Sorting/StudioComparer.cs
new file mode 100644
index 0000000000..83ab4dfc26
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/StudioComparer.cs
@@ -0,0 +1,30 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+    public class StudioComparer : IBaseItemComparer
+    {
+        /// <summary>
+        /// Compares the specified x.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <param name="y">The y.</param>
+        /// <returns>System.Int32.</returns>
+        public int Compare(BaseItem x, BaseItem y)
+        {
+            return AlphanumComparator.CompareValues(x.Studios.FirstOrDefault() ?? string.Empty, y.Studios.FirstOrDefault() ?? string.Empty);
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return ItemSortBy.Studio; }
+        }
+    }
+}
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 7bd20e7d4d..3e548e6252 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.336</version>
+        <version>3.0.339</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.336" />
+            <dependency id="MediaBrowser.Common" version="3.0.339" />
             <dependency id="NLog" version="2.1.0" />
             <dependency id="SimpleInjector" version="2.4.1" />
             <dependency id="sharpcompress" version="0.10.2" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index f68a427414..5b81a046e5 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.336</version>
+        <version>3.0.339</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 97f4c90a03..bf8bfd1575 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.336</version>
+        <version>3.0.339</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.336" />
+            <dependency id="MediaBrowser.Common" version="3.0.339" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3


From 1c90611cf3c08829831f2ff8e071b884fc44acff Mon Sep 17 00:00:00 2001
From: 7illusions <z@7illusions.com>
Date: Sun, 9 Mar 2014 08:33:48 +0100
Subject: Updated IApicClient With UserId

---
 MediaBrowser.Model/ApiClient/IApiClient.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Model/ApiClient/IApiClient.cs')

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index a0e527a99d..2924898693 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -572,17 +572,18 @@ namespace MediaBrowser.Model.ApiClient
         /// Instructs antoher client to browse to a library item.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
+        /// <param name="userId">The controlling user id.</param>
         /// <param name="itemId">The id of the item to browse to.</param>
         /// <param name="itemName">The name of the item to browse to.</param>
         /// <param name="itemType">The type of the item to browse to.</param>
         /// <param name="context">Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.</param>
         /// <returns>Task.</returns>
-        Task SendBrowseCommandAsync(string sessionId, string itemId, string itemName, string itemType, string context);
+        Task SendBrowseCommandAsync(string sessionId, string userId, string itemId, string itemName, string itemType, string context);
 
         /// <summary>
         /// Sends the playstate command async.
         /// </summary>
-        /// <param name="sessionId">The session id.</param>
+        /// <param name="sessionId">The session id.</param>        
         /// <param name="request">The request.</param>
         /// <returns>Task.</returns>
         Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request);
-- 
cgit v1.2.3


From b7bcc2450694105de9f9fc8cc07d2cfc4d9d7c96 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Mar 2014 05:18:32 -0400
Subject: Undoing changes

---
 MediaBrowser.Api/SessionsService.cs                | 51 ++--------------------
 .../MediaBrowser.Model.Portable.csproj             |  7 +--
 MediaBrowser.Model/ApiClient/IApiClient.cs         | 27 ++++++------
 MediaBrowser.Model/Session/BrowseRequest.cs        |  8 +---
 MediaBrowser.Model/Session/MessageCommand.cs       |  9 ++--
 MediaBrowser.Model/Session/PlayRequest.cs          | 14 +-----
 MediaBrowser.Model/Session/PlaystateCommand.cs     |  5 +--
 7 files changed, 25 insertions(+), 96 deletions(-)

(limited to 'MediaBrowser.Model/ApiClient/IApiClient.cs')

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; }
 
-        /// <summary>
-        /// Gets or sets the UserId.
-        /// </summary>
-        /// <value>The id.</value>
-        [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
-
         /// <summary>
         /// Artist, Genre, Studio, Person, or any kind of BaseItem
         /// </summary>
@@ -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; }
 
-        /// <summary>
-        /// Gets or sets the UserId.
-        /// </summary>
-        /// <value>The id.</value>
-        [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
-
         /// <summary>
         /// Artist, Genre, Studio, Person, or any kind of BaseItem
         /// </summary>
@@ -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; }
 
-        /// <summary>
-        /// Gets or sets the UserId.
-        /// </summary>
-        /// <value>The id.</value>
-        [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
-
         /// <summary>
         /// Gets or sets the position to seek to
         /// </summary>
@@ -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; }
 
-        /// <summary>
-        /// Gets or sets the UserId.
-        /// </summary>
-        /// <value>The id.</value>
-        [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
-
         /// <summary>
         /// Gets or sets the command.
         /// </summary>
@@ -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; }
 
-        /// <summary>
-        /// Gets or sets the UserId.
-        /// </summary>
-        /// <value>The id.</value>
-        [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; }
     }
-    
+
     /// <summary>
     /// Class SessionsService
     /// </summary>
@@ -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 @@
     <RootNamespace>MediaBrowser.Model</RootNamespace>
     <AssemblyName>MediaBrowser.Model</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile104</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <FodyPath>..\packages\Fody.1.19.1.0</FodyPath>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
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
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
         Task<ItemsResult> GetSeasonsAsync(SeasonQuery query);
-        
+
         /// <summary>
         /// Queries for items
         /// </summary>
@@ -354,7 +354,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="query">The query.</param>
         /// <returns>Task{ItemsResult}.</returns>
         Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query);
-        
+
         /// <summary>
         /// Gets a genre
         /// </summary>
@@ -572,18 +572,17 @@ namespace MediaBrowser.Model.ApiClient
         /// Instructs antoher client to browse to a library item.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
-        /// <param name="userId">The controlling user id.</param>
         /// <param name="itemId">The id of the item to browse to.</param>
         /// <param name="itemName">The name of the item to browse to.</param>
         /// <param name="itemType">The type of the item to browse to.</param>
         /// <param name="context">Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.</param>
         /// <returns>Task.</returns>
-        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);
 
         /// <summary>
         /// Sends the playstate command async.
         /// </summary>
-        /// <param name="sessionId">The session id.</param>        
+        /// <param name="sessionId">The session id.</param>
         /// <param name="request">The request.</param>
         /// <returns>Task.</returns>
         Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request);
@@ -780,7 +779,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         string GetImageUrl(ProgramInfoDto item, ImageOptions options);
-        
+
         /// <summary>
         /// Gets an image url that can be used to download an image from the api
         /// </summary>
@@ -910,7 +909,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="options">The options.</param>
         /// <returns>System.String.</returns>
         string GetThumbImageUrl(BaseItemDto item, ImageOptions options);
-        
+
         /// <summary>
         /// Gets the url needed to stream an audio file
         /// </summary>
@@ -966,7 +965,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{ChannelInfoDto}.</returns>
         Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the live tv recordings asynchronous.
         /// </summary>
@@ -983,7 +982,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{RecordingInfoDto}.</returns>
         Task<RecordingInfoDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the live tv recording groups asynchronous.
         /// </summary>
@@ -1000,7 +999,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{RecordingGroupDto}.</returns>
         Task<RecordingGroupDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the live tv timers asynchronous.
         /// </summary>
@@ -1065,7 +1064,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the live tv timer asynchronous.
         /// </summary>
@@ -1073,7 +1072,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{TimerInfoDto}.</returns>
         Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the live tv series timers asynchronous.
         /// </summary>
@@ -1105,7 +1104,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Deletes the live tv recording asynchronous.
         /// </summary>
@@ -1127,7 +1126,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{GuideInfo}.</returns>
         Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Gets the default timer information.
         /// </summary>
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
 {
     /// <summary>
@@ -14,8 +12,6 @@ namespace MediaBrowser.Model.Session
         /// <value>The type of the item.</value>
         public string ItemType { get; set; }
 
-        public Guid UserId { get; set; }
-
         /// <summary>
         /// Gets or sets the item id.
         /// </summary>
@@ -27,7 +23,7 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The name of the item.</value>
         public string ItemName { get; set; }
-        
+
         /// <summary>
         /// 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
 {
     /// <summary>
@@ -7,11 +6,6 @@ namespace MediaBrowser.Model.Session
     /// </summary>
     public class PlayRequest
     {
-        public PlayRequest()
-        {
-
-        }
-
         /// <summary>
         /// Gets or sets the item ids.
         /// </summary>
@@ -29,12 +23,6 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The play command.</value>
         public PlayCommand PlayCommand { get; set; }
-
-        /// <summary>
-        /// Gets or sets the play command.
-        /// </summary>
-        /// <value>The play command.</value>
-        public Guid UserId { get; set; }
     }
 
     /// <summary>
@@ -55,4 +43,4 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         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
 {
     /// <summary>
@@ -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
-- 
cgit v1.2.3