Merge remote-tracking branch 'remotes/Mediaportal/MP1-5111-Parallel_D…

…VB_EPG' into MP_1.30_Pre_Release_Test3
MediaPortal · Apr 27, 2022 · 623f4a4 · 623f4a4
2 parents 3270705 + 8ed244c
commit 623f4a4
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 46 deletions.
diff --git a/TvEngine3/TVLibrary/SetupTv/Sections/Epg.Designer.cs b/TvEngine3/TVLibrary/SetupTv/Sections/Epg.Designer.cs
diff --git a/TvEngine3/TVLibrary/SetupTv/Sections/Epg.cs b/TvEngine3/TVLibrary/SetupTv/Sections/Epg.cs
@@ -20,6 +20,8 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Collections.Generic;
+using TvLibrary.Interfaces;
 using TvDatabase;
 using System.IO;
 using TvLibrary;
@@ -29,6 +31,7 @@ namespace SetupTv.Sections
   public partial class Epg : SectionSettings
   {
     private string crcSettingsFile = DebugSettings.SettingPath("DisableCRCCheck");
+    private readonly Dictionary<string, CardType> cardTypes = new Dictionary<string, CardType>();
 
     public Epg()
       : this("DVB EPG") {}
@@ -48,6 +51,33 @@ public override void OnSectionActivated()
       checkBoxAlwaysUpdate.Checked = (layer.GetSetting("generalEPGAlwaysReplace", "no").Value == "yes");
       checkboxSameTransponder.Checked = (layer.GetSetting("generalGrapOnlyForSameTransponder", "no").Value == "yes");
 
+      checkBoxUseAllAvailableTuners.Checked = (layer.GetSetting("UseAllAvailableTunersForEPG", "no").Value == "yes");
+      IList<Card> cards = Card.ListAllEnabled();
+      string cardType = "";
+      int nbAvailableCards = 0;
+      foreach (Card card in cards)
+      {
+        cardTypes[card.DevicePath] = TvControl.RemoteControl.Instance.Type(card.IdCard);
+        if (cardTypes.ContainsKey(card.DevicePath))
+        {
+          cardType = cardTypes[card.DevicePath].ToString();
+        }
+        // Don't take Analog, nor RadioWebStream nor DvbIP
+        if (cardType == "Atsc" || cardType == "DvbC" || cardType == "DvbS" || cardType == "DvbT")
+        {
+          nbAvailableCards++;
+        }
+      }
+      // At least 2 cards otherwise, AllAvailableTunersForEPG is useless 
+      if (nbAvailableCards < 2 )
+      {
+        checkBoxUseAllAvailableTuners.Visible = false;
+      }
+      else
+      {
+        checkBoxUseAllAvailableTuners.Visible = true;
+      }
+
       checkBoxEnableEPGWhileIdle.Checked = (layer.GetSetting("idleEPGGrabberEnabled", "yes").Value == "yes");
       checkBoxEnableCRCCheck.Checked = !DebugSettings.DisableCRCCheck;
       numericUpDownEpgTimeOut.Value = Convert.ToDecimal(layer.GetSetting("timeoutEPG", "10").Value);
@@ -77,6 +107,10 @@ public override void OnSectionDeActivated()
       s.Value = checkboxSameTransponder.Checked ? "yes" : "no";
       s.Persist();
 
+      s = layer.GetSetting("UseAllAvailableTunersForEPG", "no");
+      s.Value = checkBoxUseAllAvailableTuners.Checked ? "yes" : "no";
+      s.Persist();
+
       DebugSettings.DisableCRCCheck = !checkBoxEnableCRCCheck.Checked;
 
       s = layer.GetSetting("idleEPGGrabberEnabled", "yes");

diff --git a/TvEngine3/TVLibrary/SetupTv/Sections/Epg.resx b/TvEngine3/TVLibrary/SetupTv/Sections/Epg.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/TvEngine3/TVLibrary/TvService/Epg/EpgCard.cs b/TvEngine3/TVLibrary/TvService/Epg/EpgCard.cs
@@ -385,12 +385,12 @@ private bool GrabEpgForChannel(Channel channel, IChannel tuning, Card card)
         Log.Error("Epg: invalid user");
         return false;
       }
-      //remove following check to enable multi-card epg grabbing (still beta)
-      if (_tvController.AllCardsIdle == false)
-      {
-        Log.Epg("Epg: card:{0} cards are not idle", Card.IdCard);
-        return false;
-      }
+      // 5111: remove following check to enable multi-card epg grabbing (Parallel EPG)
+      // if (_tvController.AllCardsIdle == false)
+      // {
+      //   Log.Epg("Epg: card:{0} cards are not idle", Card.IdCard);
+      //   return false;
+      // }
 
       TvResult result = TvResult.UnknownError;
       //handle ATSC

diff --git a/TvEngine3/TVLibrary/TvService/Epg/EpgGrabber.cs b/TvEngine3/TVLibrary/TvService/Epg/EpgGrabber.cs
@@ -28,7 +28,7 @@
 
 namespace TvService
 {
-  public class EpgCardPriorityComparer : IComparer<EpgCard>
+  public class EpgCardPriorityComparerHighest : IComparer<EpgCard>
   {
     // Highest priority first
     public int Compare(EpgCard x, EpgCard y)
@@ -41,6 +41,19 @@ public int Compare(EpgCard x, EpgCard y)
     }
   }
 
+  public class EpgCardPriorityComparerLowest : IComparer<EpgCard>
+  {
+    // Lowest priority first
+    public int Compare(EpgCard x, EpgCard y)
+    {
+      if (x.Card.Priority < y.Card.Priority)
+        return -1;
+      if (x.Card.Priority == y.Card.Priority)
+        return 0;
+      return 1;
+    }
+  }
+
   /// <summary>
   /// Class which will continously grab the epg for all channels
   /// Epg is grabbed when:
@@ -58,6 +71,7 @@ public class EpgGrabber : IDisposable
     private bool _disposed;
     private bool _isRunning;
     private bool _reEntrant;
+    private bool _UseAllAvailableTunersForEPG;
     private readonly TVController _tvController;
     private List<EpgCard> _epgCards;
 
@@ -164,7 +178,18 @@ public void Start(double timerInterval)
         EpgCard epgCard = new EpgCard(_tvController, card);
         _epgCards.Add(epgCard);
       }
-      _epgCards.Sort(new EpgCardPriorityComparer());
+
+      if (layer.GetSetting("UseAllAvailableTunersForEPG", "yes").Value != "yes")
+      {
+        _epgCards.Sort(new EpgCardPriorityComparerHighest());
+        _UseAllAvailableTunersForEPG = false;
+      }
+      else
+      {
+        _epgCards.Sort(new EpgCardPriorityComparerLowest());
+        _UseAllAvailableTunersForEPG = true;
+      }
+
       _epgTimer.Interval = timerInterval;
       _epgTimer.Enabled = true;
     }
@@ -246,7 +271,8 @@ private void _epgTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         }
         catch (InvalidOperationException) {}
 
-        if (_tvController.AllCardsIdle == false)
+        // Grab when all cards idle only when grab on highest priority card
+        if (_tvController.AllCardsIdle == false && _UseAllAvailableTunersForEPG == false)
           return;
         foreach (EpgCard card in _epgCards)
         {
@@ -255,7 +281,8 @@ private void _epgTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
             return;
           if (card.IsGrabbing)
             continue;
-          if (_tvController.AllCardsIdle == false)
+          // Grab when all cards idle only when grab on highest priority card
+          if (_tvController.AllCardsIdle == false && _UseAllAvailableTunersForEPG == false)
             return;
           GrabEpgOnCard(card);
         }