4 files changed, 27 insertions, 1 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 13113c2b2..784e449a3 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -187,7 +187,7 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets active client sessions.
         /// </summary>
         /// <returns>Task{SessionInfoDto[]}.</returns>
-        Task<SessionInfoDto[]> GetClientSessionsAsync();
+        Task<SessionInfoDto[]> GetClientSessionsAsync(SessionQuery query);
 
         /// <summary>
         /// Gets the item counts async.
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index cee95639c..0cf59183d 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -89,6 +89,12 @@
         /// </summary>
         /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value>
         public bool AppendBaselineStream { get; set; }
+
+        /// <summary>
+        /// Gets or sets the time stamp offset ms. Only used with HLS.
+        /// </summary>
+        /// <value>The time stamp offset ms.</value>
+        public int? TimeStampOffsetMs { get; set; }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 0822bfbc3..6d8d454d9 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Querying\ItemsByNameQuery.cs" />
     <Compile Include="Entities\BaseItemInfo.cs" />
     <Compile Include="Querying\NextUpQuery.cs" />
+    <Compile Include="Querying\SessionQuery.cs" />
     <Compile Include="Querying\SimilarItemsQuery.cs" />
     <Compile Include="Querying\UserQuery.cs" />
     <Compile Include="Session\BrowseRequest.cs" />
diff --git a/MediaBrowser.Model/Querying/SessionQuery.cs b/MediaBrowser.Model/Querying/SessionQuery.cs
new file mode 100644
index 000000000..77bfef05f
--- /dev/null
+++ b/MediaBrowser.Model/Querying/SessionQuery.cs
@@ -0,0 +1,19 @@
+
+namespace MediaBrowser.Model.Querying
+{
+    /// <summary>
+    /// Class SessionQuery
+    /// </summary>
+    public class SessionQuery
+    {
+        /// <summary>
+        /// Filter by sessions that are allowed to be controlled by a given user
+        /// </summary>
+        public string ControllableByUserId { get; set; }
+
+        /// <summary>
+        /// Filter by sessions that either do or do not support remote control. Default returns all sessions.
+        /// </summary>
+        public bool? SupportsRemoteControl { get; set; }
+    }
+}