Compatibility update

jellyfin · Feb 18, 2018 · db8cd9a · db8cd9a
1 parent 4578ba8
commit db8cd9a
Show file tree

Hide file tree

Showing 6 changed files with 597 additions and 231 deletions.
diff --git a/TVHeadEnd/DataHelper/DvrDataHelper.cs b/TVHeadEnd/DataHelper/DvrDataHelper.cs
@@ -76,13 +76,13 @@ public void dvrEntryDelete(HTSMessage message)
             }
         }
 
-        public Task<IEnumerable<RecordingInfo>> buildDvrInfos(CancellationToken cancellationToken)
+        public Task<IEnumerable<MyRecordingInfo>> buildDvrInfos(CancellationToken cancellationToken)
         {
-            return Task.Factory.StartNew<IEnumerable<RecordingInfo>>(() =>
+            return Task.Factory.StartNew<IEnumerable<MyRecordingInfo>>(() =>
             {
                 lock (_data)
                 {
-                    List<RecordingInfo> result = new List<RecordingInfo>();
+                    List<MyRecordingInfo> result = new List<MyRecordingInfo>();
                     foreach (KeyValuePair<string, HTSMessage> entry in _data)
                     {
                         if (cancellationToken.IsCancellationRequested)
@@ -92,7 +92,7 @@ public Task<IEnumerable<RecordingInfo>> buildDvrInfos(CancellationToken cancella
                         }
 
                         HTSMessage m = entry.Value;
-                        RecordingInfo ri = new RecordingInfo();
+                        MyRecordingInfo ri = new MyRecordingInfo();
 
                         try
                         {

diff --git a/TVHeadEnd/HTSConnectionHandler.cs b/TVHeadEnd/HTSConnectionHandler.cs
@@ -268,6 +268,22 @@ public ImageStream GetChannelImage(string channelId, CancellationToken cancellat
             }
         }
 
+        public string GetChannelImageUrl(string channelId)
+        {
+            _logger.Info("[TVHclient] HTSConnectionHandler.GetChannelImage() channelId: " + channelId);
+
+            String channelIcon = _channelDataHelper.GetChannelIcon4ChannelId(channelId);
+
+            if (channelIcon.StartsWith("http"))
+            {
+                return _channelDataHelper.GetChannelIcon4ChannelId(channelId);
+            }
+            else
+            {
+                return "http://" + _tvhServerName + ":" + _httpPort + _webRoot + "/" + channelIcon; ;
+            }
+        }
+
         public Dictionary<string, string> GetHeaders()
         {
             return new Dictionary<string, string>(_headers);
@@ -372,7 +388,7 @@ public bool GetForceDeinterlace()
             return _forceDeinterlace;
         }
 
-        public Task<IEnumerable<RecordingInfo>> BuildDvrInfos(CancellationToken cancellationToken)
+        public Task<IEnumerable<MyRecordingInfo>> BuildDvrInfos(CancellationToken cancellationToken)
         {
             return _dvrDataHelper.buildDvrInfos(cancellationToken);
         }