From c02e917f5657db4bd76fc6ca17c535fc441c641c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 7 Jul 2014 21:41:03 -0400
Subject: completed auth database

---
 MediaBrowser.Model/ApiClient/IApiClient.cs            | 19 +++++++++++++++++--
 .../Configuration/ServerConfiguration.cs              |  2 ++
 MediaBrowser.Model/Users/AuthenticationResult.cs      |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 33c6f980c..74a3314b7 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -246,7 +246,7 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets the client session asynchronous.
         /// </summary>
         /// <returns>Task{SessionInfoDto}.</returns>
-        Task<SessionInfoDto> GetCurrentSessionAsync();
+        Task<SessionInfoDto> GetCurrentSessionAsync(CancellationToken cancellationToken);
         
         /// <summary>
         /// Gets the item counts async.
@@ -644,6 +644,13 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task.</returns>
         Task SetVolume(string sessionId, int volume);
 
+        /// <summary>
+        /// Stops the transcoding processes.
+        /// </summary>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns>Task.</returns>
+        Task StopTranscodingProcesses(string deviceId);
+
         /// <summary>
         /// Sets the index of the audio stream.
         /// </summary>
@@ -984,7 +991,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{LiveTvInfo}.</returns>
-        Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(ChannelQuery query, CancellationToken cancellationToken);
+        Task<QueryResult<ChannelInfoDto>> GetLiveTvChannelsAsync(LiveTvChannelQuery query, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the live tv channel asynchronous.
@@ -1187,5 +1194,13 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
         Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the latest channel items.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
+        Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 49b731341..d9404ce29 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -210,6 +210,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool DefaultMetadataSettingsApplied { get; set; }
 
+        public bool EnableTokenAuthentication { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Users/AuthenticationResult.cs b/MediaBrowser.Model/Users/AuthenticationResult.cs
index 8046e83c7..97fe2ea99 100644
--- a/MediaBrowser.Model/Users/AuthenticationResult.cs
+++ b/MediaBrowser.Model/Users/AuthenticationResult.cs
@@ -21,6 +21,6 @@ namespace MediaBrowser.Model.Users
         /// Gets or sets the authentication token.
         /// </summary>
         /// <value>The authentication token.</value>
-        public string AuthenticationToken { get; set; }
+        public string AccessToken { get; set; }
     }
 }
-- 
cgit v1.2.3