From 45db252552b15fbcc486dd93f7eee108592893aa Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 4 May 2023 20:50:32 +0200 Subject: [PATCH] bouquets: m3u8 added thx mohousch Signed-off-by: Thilo Graf --- src/gui/webchannels_setup.cpp | 2 ++ src/zapit/src/bouquets.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp index 56dd32f34..23aa266fa 100644 --- a/src/gui/webchannels_setup.cpp +++ b/src/gui/webchannels_setup.cpp @@ -118,6 +118,7 @@ int CWebChannelsSetup::exec(CMenuTarget *parent, const std::string &actionKey) fileFilter.addFilter("xml"); fileFilter.addFilter("tv"); fileFilter.addFilter("m3u"); + fileFilter.addFilter("m3u8"); fileBrowser.Filter = &fileFilter; dirname = dirname.substr(0, dirname.rfind('/')); @@ -140,6 +141,7 @@ int CWebChannelsSetup::exec(CMenuTarget *parent, const std::string &actionKey) fileFilter.addFilter("xml"); fileFilter.addFilter("tv"); fileFilter.addFilter("m3u"); + fileFilter.addFilter("m3u8"); fileBrowser.Filter = &fileFilter; if (fileBrowser.exec(webradio ? g_settings.last_webradio_dir.c_str() : g_settings.last_webtv_dir.c_str()) == true) { diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index e5328e735..fac4979d8 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -894,7 +894,7 @@ void CBouquetManager::loadWebchannels(int mode) if (strcasecmp("xml", extension.c_str()) == 0) xml = true; - if (strcasecmp("m3u", extension.c_str()) == 0) + if ((strcasecmp("m3u", extension.c_str()) == 0) || (strcasecmp("m3u8", extension.c_str()) == 0)) m3u = true; if (strcasecmp("tv", extension.c_str()) == 0) e2tv = true; @@ -1035,6 +1035,8 @@ void CBouquetManager::loadWebchannels(int mode) { epg_url = ""; epg_url = ReadMarkerValue(strLine, M3U_START_EPG_MARKER); + if (epg_url.empty()) + epg_url = ReadMarkerValue(strLine, "x-tvg-url"); //printf("tvg-url: %s\n", epg_url.c_str()); if (!epg_url.empty()) {