From dd7825f6c8cdd1eb30d4034d03fdaf6ff3f545be Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 11 Jun 2014 15:31:33 -0400
Subject: Support subtitle offset

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  2 --
 .../Entities/IHasMediaStreams.cs                   | 10 ------
 MediaBrowser.Controller/Entities/Video.cs          |  1 -
 MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs |  2 +-
 .../MediaBrowser.Controller.csproj                 |  1 -
 .../MediaEncoding/IMediaEncoder.cs                 | 20 ------------
 .../MediaEncoding/ISubtitleEncoder.cs              | 36 ++++++++++++++++++++--
 7 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Entities/IHasMediaStreams.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 43de1f5b0..e14563ea4 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Threading;
 
 namespace MediaBrowser.Controller.Entities.Audio
 {
@@ -15,7 +14,6 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// Class Audio
     /// </summary>
     public class Audio : BaseItem, 
-        IHasMediaStreams, 
         IHasAlbumArtist, 
         IHasArtist, 
         IHasMusicGenres, 
diff --git a/MediaBrowser.Controller/Entities/IHasMediaStreams.cs b/MediaBrowser.Controller/Entities/IHasMediaStreams.cs
deleted file mode 100644
index b700ef628..000000000
--- a/MediaBrowser.Controller/Entities/IHasMediaStreams.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace MediaBrowser.Controller.Entities
-{
-    /// <summary>
-    /// This is essentially a marker interface
-    /// </summary>
-    public interface IHasMediaStreams
-    {
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 3bc08506e..ef12d46d6 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -20,7 +20,6 @@ namespace MediaBrowser.Controller.Entities
     /// Class Video
     /// </summary>
     public class Video : BaseItem, 
-        IHasMediaStreams, 
         IHasAspectRatio, 
         IHasTags, 
         ISupportsPlaceHolders,
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
index 700fe1f41..23610351e 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.LiveTv
 {
-    public interface ILiveTvRecording : IHasImages, IHasMediaStreams
+    public interface ILiveTvRecording : IHasImages, IHasMediaSources
     {
         string ServiceName { get; set; }
 
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 83155fe8c..7bc82f76d 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -128,7 +128,6 @@
     <Compile Include="Entities\IHasImages.cs" />
     <Compile Include="Entities\IHasKeywords.cs" />
     <Compile Include="Entities\IHasMediaSources.cs" />
-    <Compile Include="Entities\IHasMediaStreams.cs" />
     <Compile Include="Entities\IHasMetascore.cs" />
     <Compile Include="Entities\IHasPreferredMetadataLanguage.cs" />
     <Compile Include="Entities\IHasProductionLocations.cs" />
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index 9895d9a60..0de119ae5 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -41,26 +41,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
         Task<Stream> ExtractVideoImage(string[] inputFiles, InputType type, Video3DFormat? threedFormat, TimeSpan? offset, CancellationToken cancellationToken);
-        
-        /// <summary>
-        /// Extracts the text subtitle.
-        /// </summary>
-        /// <param name="inputFiles">The input files.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="subtitleStreamIndex">Index of the subtitle stream.</param>
-        /// <param name="copySubtitleStream">if set to true, copy stream instead of converting.</param>
-        /// <param name="outputPath">The output path.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task ExtractTextSubtitle(string[] inputFiles, InputType type, int subtitleStreamIndex, bool copySubtitleStream, string outputPath, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the subtitle language encoding parameter.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>System.String.</returns>
-        string GetSubtitleLanguageEncodingParam(string path, string language);
 
         /// <summary>
         /// Gets the media info.
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index 8f85895f0..6e9bcef2e 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -6,16 +6,46 @@ namespace MediaBrowser.Controller.MediaEncoding
 {
     public interface ISubtitleEncoder
     {
+        /// <summary>
+        /// Converts the subtitles.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="inputFormat">The input format.</param>
+        /// <param name="outputFormat">The output format.</param>
+        /// <param name="startTimeTicks">The start time ticks.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{Stream}.</returns>
         Task<Stream> ConvertSubtitles(
-            Stream stream, 
-            string inputFormat, 
+            Stream stream,
+            string inputFormat,
             string outputFormat,
+            long startTimeTicks,
             CancellationToken cancellationToken);
 
-        Task<Stream> GetSubtitles(string itemId, 
+        /// <summary>
+        /// Gets the subtitles.
+        /// </summary>
+        /// <param name="itemId">The item identifier.</param>
+        /// <param name="mediaSourceId">The media source identifier.</param>
+        /// <param name="subtitleStreamIndex">Index of the subtitle stream.</param>
+        /// <param name="outputFormat">The output format.</param>
+        /// <param name="startTimeTicks">The start time ticks.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{Stream}.</returns>
+        Task<Stream> GetSubtitles(string itemId,
             string mediaSourceId,
             int subtitleStreamIndex,
             string outputFormat,
+            long startTimeTicks,
             CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the subtitle language encoding parameter.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="language">The language.</param>
+        /// <returns>System.String.</returns>
+        string GetSubtitleFileCharacterSet(string path, string language);
+
     }
 }
-- 
cgit v1.2.3