add option to load E2 & M3U iptv lists directly as webtv

Conflicts:
	src/zapit/src/bouquets.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

- fixed some line indentation errors
- line 967 contains possible error:
	operation on ‘iColon’ may be undefined [-Werror=sequence-point]
This commit is contained in:
TangoCash
2018-08-19 21:14:54 +02:00
committed by Thilo Graf
parent d958e1128d
commit f355a54b14
3 changed files with 244 additions and 52 deletions

View File

@@ -78,6 +78,8 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
CFileBrowser fileBrowser;
CFileFilter fileFilter;
fileFilter.addFilter("xml");
fileFilter.addFilter("tv");
fileFilter.addFilter("m3u");
fileBrowser.Filter = &fileFilter;
selected = m->getSelected();
CMenuItem* item = m->getItem(selected);
@@ -95,6 +97,8 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
CFileBrowser fileBrowser;
CFileFilter fileFilter;
fileFilter.addFilter("xml");
fileFilter.addFilter("tv");
fileFilter.addFilter("m3u");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(g_settings.last_webtv_dir.c_str()) == true) {
std::string s = fileBrowser.getSelectedFile()->Name;