From 0d025f7fb620bf2a24ca9aa4e5994f132e02e7c0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 6 May 2014 22:28:19 -0400
Subject: beginning remote subtitle downloading

---
 .../MediaBrowser.MediaEncoding.csproj              |  2 +-
 .../Subtitles/ISubtitleParser.cs                   |  2 +-
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs  |  4 ++--
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs  |  4 ++--
 .../Subtitles/SubtitleInfo.cs                      | 22 ----------------------
 .../Subtitles/SubtitleTrackInfo.cs                 | 22 ++++++++++++++++++++++
 6 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/SubtitleInfo.cs
 create mode 100644 MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index 291bb0222..19287b0cb 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -64,7 +64,7 @@
     <Compile Include="Subtitles\ISubtitleParser.cs" />
     <Compile Include="Subtitles\SrtParser.cs" />
     <Compile Include="Subtitles\SsaParser.cs" />
-    <Compile Include="Subtitles\SubtitleInfo.cs" />
+    <Compile Include="Subtitles\SubtitleTrackInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
index 5e7ad6699..b983bc5d4 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
@@ -4,6 +4,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 {
     public interface ISubtitleParser
     {
-        SubtitleInfo Parse(Stream stream);
+        SubtitleTrackInfo Parse(Stream stream);
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index af0009a82..410c0bbdd 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
-    public class SrtParser
+    public class SrtParser : ISubtitleParser
     {
-        public SubtitleInfo Parse(Stream stream)
+        public SubtitleTrackInfo Parse(Stream stream)
         {
             throw new NotImplementedException();
         }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index e134416b1..ca7e58371 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
-    public class SsaParser
+    public class SsaParser : ISubtitleParser
     {
-        public SubtitleInfo Parse(Stream stream)
+        public SubtitleTrackInfo Parse(Stream stream)
         {
             throw new NotImplementedException();
         }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleInfo.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleInfo.cs
deleted file mode 100644
index 812b0c7d4..000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    public class SubtitleInfo
-    {
-        public List<SubtitleTrackEvent> TrackEvents { get; set; }
-
-        public SubtitleInfo()
-        {
-            TrackEvents = new List<SubtitleTrackEvent>();
-        }
-    }
-
-    public class SubtitleTrackEvent
-    {
-        public string Id { get; set; }
-        public string Text { get; set; }
-        public long StartPositionTicks { get; set; }
-        public long EndPositionTicks { get; set; }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs
new file mode 100644
index 000000000..67d70ed6e
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.MediaEncoding.Subtitles
+{
+    public class SubtitleTrackInfo
+    {
+        public List<SubtitleTrackEvent> TrackEvents { get; set; }
+
+        public SubtitleTrackInfo()
+        {
+            TrackEvents = new List<SubtitleTrackEvent>();
+        }
+    }
+
+    public class SubtitleTrackEvent
+    {
+        public string Id { get; set; }
+        public string Text { get; set; }
+        public long StartPositionTicks { get; set; }
+        public long EndPositionTicks { get; set; }
+    }
+}
-- 
cgit v1.2.3