bouquets: m3u8 added (thx mohousch)

Origin commit data
------------------
Branch: ni/coolstream
Commit: 96e25ca738
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-05-04 (Thu, 04 May 2023)

Origin message was:
------------------
- bouquets: m3u8 added (thx mohousch)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2023-05-04 20:50:32 +02:00
committed by vanhofen
parent 7e78f2196d
commit 1e4609f115
2 changed files with 5 additions and 1 deletions

View File

@@ -117,6 +117,7 @@ int CWebChannelsSetup::exec(CMenuTarget *parent, const std::string &actionKey)
fileFilter.addFilter("xml"); fileFilter.addFilter("xml");
fileFilter.addFilter("tv"); fileFilter.addFilter("tv");
fileFilter.addFilter("m3u"); fileFilter.addFilter("m3u");
fileFilter.addFilter("m3u8");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
dirname = dirname.substr(0, dirname.rfind('/')); dirname = dirname.substr(0, dirname.rfind('/'));
@@ -139,6 +140,7 @@ int CWebChannelsSetup::exec(CMenuTarget *parent, const std::string &actionKey)
fileFilter.addFilter("xml"); fileFilter.addFilter("xml");
fileFilter.addFilter("tv"); fileFilter.addFilter("tv");
fileFilter.addFilter("m3u"); fileFilter.addFilter("m3u");
fileFilter.addFilter("m3u8");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(webradio ? g_settings.last_webradio_dir.c_str() : g_settings.last_webtv_dir.c_str()) == true) if (fileBrowser.exec(webradio ? g_settings.last_webradio_dir.c_str() : g_settings.last_webtv_dir.c_str()) == true)
{ {

View File

@@ -894,7 +894,7 @@ void CBouquetManager::loadWebchannels(int mode)
if (strcasecmp("xml", extension.c_str()) == 0) if (strcasecmp("xml", extension.c_str()) == 0)
xml = true; xml = true;
if (strcasecmp("m3u", extension.c_str()) == 0) if ((strcasecmp("m3u", extension.c_str()) == 0) || (strcasecmp("m3u8", extension.c_str()) == 0))
m3u = true; m3u = true;
if (strcasecmp("tv", extension.c_str()) == 0) if (strcasecmp("tv", extension.c_str()) == 0)
e2tv = true; e2tv = true;
@@ -1035,6 +1035,8 @@ void CBouquetManager::loadWebchannels(int mode)
{ {
epg_url = ""; epg_url = "";
epg_url = ReadMarkerValue(strLine, M3U_START_EPG_MARKER); 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()); //printf("tvg-url: %s\n", epg_url.c_str());
if (!epg_url.empty()) if (!epg_url.empty())
{ {