switch to subtitle filter

3 files changed, 19 insertions, 31 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs b/MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs
index d1e40e3f0..8683a6af4 100644
--- a/MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs
@@ -6,23 +6,6 @@ namespace MediaBrowser.Controller.MediaEncoding
     public interface IEncodingManager
     {
         /// <summary>
-        /// Gets the subtitle cache path.
-        /// </summary>
-        /// <param name="originalSubtitlePath">The original subtitle path.</param>
-        /// <param name="outputSubtitleExtension">The output subtitle extension.</param>
-        /// <returns>System.String.</returns>
-        string GetSubtitleCachePath(string originalSubtitlePath, string outputSubtitleExtension);
-
-        /// <summary>
-        /// Gets the subtitle cache path.
-        /// </summary>
-        /// <param name="mediaPath">The media path.</param>
-        /// <param name="subtitleStreamIndex">Index of the subtitle stream.</param>
-        /// <param name="outputSubtitleExtension">The output subtitle extension.</param>
-        /// <returns>System.String.</returns>
-        string GetSubtitleCachePath(string mediaPath, int subtitleStreamIndex, string outputSubtitleExtension);
-
-        /// <summary>
         /// Refreshes the chapter images.
         /// </summary>
         /// <param name="options">The options.</param>
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index e9081fe8a..9895d9a60 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -55,14 +55,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         Task ExtractTextSubtitle(string[] inputFiles, InputType type, int subtitleStreamIndex, bool copySubtitleStream, string outputPath, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Converts the text subtitle to ass.
+        /// Gets the subtitle language encoding parameter.
         /// </summary>
-        /// <param name="inputPath">The input path.</param>
-        /// <param name="outputPath">The output path.</param>
+        /// <param name="path">The path.</param>
         /// <param name="language">The language.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task ConvertTextSubtitleToAss(string inputPath, string outputPath, string language, CancellationToken cancellationToken);
+        /// <returns>System.String.</returns>
+        string GetSubtitleLanguageEncodingParam(string path, string language);
 
         /// <summary>
         /// Gets the media info.
@@ -88,14 +86,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="type">The type.</param>
         /// <returns>System.String.</returns>
         string GetInputArgument(string[] inputFiles, InputType type);
-
-        /// <summary>
-        /// Encodes the image.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        Task<Stream> EncodeImage(ImageEncodingOptions options, CancellationToken cancellationToken);
     }
 
     /// <summary>
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
new file mode 100644
index 000000000..f171d6f77
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -0,0 +1,15 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public interface ISubtitleEncoder
+    {
+        Task<Stream> ConvertTextSubtitle(String stream, 
+            string inputFormat, 
+            string outputFormat,
+            CancellationToken cancellationToken);
+    }
+}