Merge pull request #364 from MediaPortal/MP1-5236_Add_support_for_m3u…

…8_files MP1-5236: Add support for m3u8 files
MediaPortal · Feb 23, 2025 · fb34e55 · fb34e55
2 parents 1231f7d + c1ec37a
commit fb34e55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs b/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs
@@ -57,7 +57,7 @@ public bool Load(PlayList incomingPlaylist, string playlistFileName)
 
           string trimmedLine = line.Trim();
 
-          if (trimmedLine != M3U_START_MARKER)
+          if (!trimmedLine.StartsWith(M3U_START_MARKER))
           {
             string fileName = trimmedLine;
             if (!AddItem("", 0, fileName))
@@ -154,7 +154,7 @@ public void Save(PlayList playListParam, string fileName)
           }
         }
       }
-      catch (Exception) {}
+      catch (Exception) { }
     }
   }
 }
diff --git a/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs b/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs
@@ -282,7 +282,7 @@ private void AddServerTvCards(Servers servers, IList<Server> dbsServers, bool re
                 cardName = String.Format("{0} {1}", cardId, cardName);
                 InfoPage RadioWebStreamInfo = new InfoPage(cardName);
                 RadioWebStreamInfo.InfoText =
-                  "The RadioWebStream card does not have any options.\n\n\nYou can add your favourite radio webstreams under:\n\n --> 'Radio Channels', 'Add', 'Web-Stream' or by importing a playlist.";
+                  "The RadioWebStream card does not have any options.\n\nNote that this card doesn't support recording or previewing\n\nYou can add your favourite radio webstreams under:\n\n --> 'Radio Channels', 'Add', 'Web-Stream' or by importing a playlist.";
                 AddChildSection(cardPage, RadioWebStreamInfo, 1);
                 break;
               case CardType.Unknown:

diff --git a/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs b/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
@@ -259,6 +259,11 @@ public List<CardDetail> GetAvailableCardsForChannel(IDictionary<int, ITvCardHand
 
         foreach (IChannel tuningDetail in tuningDetails)
         {
+          if (tuningDetail == null)
+          {
+            Log.Error("GetAvailableCardsForChannel:   channel #{0} tuningdetails = null", number);
+            continue;
+          }
           cardsUnAvailable.Clear();
           number++;
           if (LogEnabled)