aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-31 12:24:16 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-31 12:24:16 -0400
commita025f4eefaf43c27f33521239d99c47d292728f5 (patch)
treeff6cbf4d0eba8b58c3acdadbbc5fe0b895ff4a6a /MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
parenteaf70589ae9469616596ee951e50e83941495b9e (diff)
sync updates
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index 37c2bf4d2..e4a2cd007 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using MediaBrowser.Model.MediaInfo;
+using System.IO;
using System.Threading;
using System.Threading.Tasks;
@@ -47,8 +48,9 @@ namespace MediaBrowser.Controller.MediaEncoding
/// Gets the subtitle language encoding parameter.
/// </summary>
/// <param name="path">The path.</param>
+ /// <param name="protocol">The protocol.</param>
+ /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>System.String.</returns>
- string GetSubtitleFileCharacterSet(string path);
-
+ Task<string> GetSubtitleFileCharacterSet(string path, MediaProtocol protocol, CancellationToken cancellationToken);
}
}