Skip to content

Commit 61dbec6

Browse files
ZabrimusZabrimus
committed
new setup parameter: EnableEpgScan to allow or prevent that this device can be used for an EPG scan.
1 parent a12b410 commit 61dbec6

17 files changed

+88
-15
lines changed

‎HISTORY

+3-3
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ VDR Plugin 'iptv' Revision History
316316
- add new SVDRP commands LXML, LIPT, CHPA, ADDM, ADDS, ADDR
317317
- some fixes
318318

319-
2024-xx-xx: Version 2.6.5
319+
2024-11-27: Version 2.6.5
320320
- improved error handling
321321
- show errors as VDR message
322322
- copied RadioImage from Radio plugin (will be only activated if radio plugin is not found)
323-
- (currently disabled, because of an unknown deadlock)
324-
mark channels which cannot be reached with '- 404'
323+
- enable EPG scan via Setup
324+

‎config.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cIptvConfig::cIptvConfig()
1717
sectionFilteringM(1),
1818
threadQueueSize(32),
1919
stillPicture(0),
20+
enableEpgScan(0),
2021
ytdlpPath("/usr/local/bin/yt-dlp") {
2122

2223
for (unsigned int i = 0; i < ARRAY_SIZE(disabledFiltersM); ++i) {

‎config.h

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class cIptvConfig {
1717
unsigned int useBytesM;
1818
unsigned int sectionFilteringM;
1919
unsigned int threadQueueSize;
20+
int enableEpgScan;
2021
int stillPicture;
2122
int disabledFiltersM[SECTION_FILTER_TABLE_SIZE];
2223
char configDirectoryM[PATH_MAX];
@@ -61,6 +62,7 @@ class cIptvConfig {
6162
const char *GetM3uCfgPath() { return m3uCfgPath; };
6263
int GetDisabledFilters(unsigned int indexP) const;
6364
int GetStillPicture() const { return stillPicture; };
65+
int GetEnableEpgScan() const { return enableEpgScan; };
6466

6567
void SetTraceMode(unsigned int modeP) { traceModeM = (modeP & eTraceModeMask); };
6668
void SetThreadQueueSize(unsigned int tqs) { threadQueueSize = tqs; };
@@ -73,6 +75,7 @@ class cIptvConfig {
7375
void SetYtdlpPath(const char* path);
7476
void SetM3uCfgPath(const char* directoryP);
7577
void SetStillPicture(int s) { stillPicture = s; };
78+
void SetEnableEpgScan(int s) { enableEpgScan = s; };
7679
};
7780

7881
extern cIptvConfig IptvConfig;

‎device.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ bool cIptvDevice::ProvidesChannel(const cChannel *channelP, int priorityP, bool
262262
}
263263

264264
bool cIptvDevice::ProvidesEIT() const {
265-
return true;
265+
return IptvConfig.GetEnableEpgScan() == 1;
266266
}
267267

268268
int cIptvDevice::NumProvidedSystems() const {

‎iptv.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define GITVERSION ""
2424
#endif
2525

26-
const char VERSION[] = "2.4.0" GITVERSION;
26+
const char VERSION[] = "2.6.5" GITVERSION;
2727
static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
2828

2929
const char *cPluginIptv::Description() { return tr(DESCRIPTION); }
@@ -222,6 +222,8 @@ bool cPluginIptv::SetupParse(const char *nameP, const char *valueP) {
222222
}
223223
} else if (!strcasecmp(nameP, "StillPicture")) {
224224
IptvConfig.SetStillPicture(atoi(valueP));
225+
} else if (!strcasecmp(nameP, "EnableEpgScan")) {
226+
IptvConfig.SetEnableEpgScan(atoi(valueP));
225227
} else {
226228
return false;
227229
}

‎po/ca_ES.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Gabriel Bonich <[email protected]>\n"
1313
"Language-Team: Catalan <[email protected]>\n"
@@ -115,6 +115,12 @@ msgstr ""
115115
msgid "Define the type of the picture to show, if a radio plugin is not found."
116116
msgstr ""
117117

118+
msgid "Enable EPG scan"
119+
msgstr ""
120+
121+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
122+
msgstr ""
123+
118124
msgid "Help"
119125
msgstr "Ajuda"
120126

‎po/de_DE.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: vdr-iptv 2.4.0\n"
1010
"Report-Msgid-Bugs-To: <see README>\n"
11-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
11+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1212
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1313
"Last-Translator: Frank Neumann <[email protected]>\n"
1414
"Language-Team: German <[email protected]>\n"
@@ -116,6 +116,12 @@ msgstr ""
116116
msgid "Define the type of the picture to show, if a radio plugin is not found."
117117
msgstr ""
118118

119+
msgid "Enable EPG scan"
120+
msgstr "EPG Scan erlauben"
121+
122+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
123+
msgstr "Definiert, ob das IpTV Plugin einen EPG Scan ermöglichen soll."
124+
119125
msgid "Help"
120126
msgstr "Hilfe"
121127

‎po/es_ES.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Gabriel Bonich <[email protected]>\n"
1313
"Language-Team: Spanish <[email protected]>\n"
@@ -115,6 +115,12 @@ msgstr ""
115115
msgid "Define the type of the picture to show, if a radio plugin is not found."
116116
msgstr ""
117117

118+
msgid "Enable EPG scan"
119+
msgstr ""
120+
121+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
122+
msgstr ""
123+
118124
msgid "Help"
119125
msgstr "Ayuda"
120126

‎po/fi_FI.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Rolf Ahrenberg\n"
1313
"Language-Team: Finnish <[email protected]>\n"
@@ -114,6 +114,12 @@ msgstr ""
114114
msgid "Define the type of the picture to show, if a radio plugin is not found."
115115
msgstr ""
116116

117+
msgid "Enable EPG scan"
118+
msgstr ""
119+
120+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
121+
msgstr ""
122+
117123
msgid "Help"
118124
msgstr "Opaste"
119125

‎po/fr_FR.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: vdr-iptv 2.4.0\n"
1010
"Report-Msgid-Bugs-To: <see README>\n"
11-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
11+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1212
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1313
"Last-Translator: NIVAL Michaël <[email protected]>\n"
1414
"Language-Team: French <[email protected]>\n"
@@ -116,6 +116,12 @@ msgstr ""
116116
msgid "Define the type of the picture to show, if a radio plugin is not found."
117117
msgstr ""
118118

119+
msgid "Enable EPG scan"
120+
msgstr ""
121+
122+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
123+
msgstr ""
124+
119125
msgid "Help"
120126
msgstr "Aide"
121127

‎po/it_IT.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Diego Pierotto <[email protected]>\n"
1313
"Language-Team: Italian <[email protected]>\n"
@@ -115,6 +115,12 @@ msgstr ""
115115
msgid "Define the type of the picture to show, if a radio plugin is not found."
116116
msgstr ""
117117

118+
msgid "Enable EPG scan"
119+
msgstr ""
120+
121+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
122+
msgstr ""
123+
118124
msgid "Help"
119125
msgstr "Aiuto"
120126

‎po/lt_LT.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Valdemaras Pipiras\n"
1313
"Language-Team: Lithuanian <[email protected]>\n"
@@ -114,6 +114,12 @@ msgstr ""
114114
msgid "Define the type of the picture to show, if a radio plugin is not found."
115115
msgstr ""
116116

117+
msgid "Enable EPG scan"
118+
msgstr ""
119+
120+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
121+
msgstr ""
122+
117123
msgid "Help"
118124
msgstr "Pagalba"
119125

‎po/nl_NL.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Carel\n"
1313
"Language-Team: Dutch <[email protected]>\n"
@@ -114,6 +114,12 @@ msgstr ""
114114
msgid "Define the type of the picture to show, if a radio plugin is not found."
115115
msgstr ""
116116

117+
msgid "Enable EPG scan"
118+
msgstr ""
119+
120+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
121+
msgstr ""
122+
117123
msgid "Help"
118124
msgstr "Help"
119125

‎po/pl_PL.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Tomasz Maciej Nowak <[email protected]>\n"
1313
"Language-Team: Polish <[email protected]>\n"
@@ -115,6 +115,12 @@ msgstr ""
115115
msgid "Define the type of the picture to show, if a radio plugin is not found."
116116
msgstr ""
117117

118+
msgid "Enable EPG scan"
119+
msgstr ""
120+
121+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
122+
msgstr ""
123+
118124
msgid "Help"
119125
msgstr "Pomoc"
120126

‎po/ru_RU.po

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: vdr-iptv 2.4.0\n"
99
"Report-Msgid-Bugs-To: <see README>\n"
10-
"POT-Creation-Date: 2024-09-01 16:31+0200\n"
10+
"POT-Creation-Date: 2024-11-27 19:44+0100\n"
1111
"PO-Revision-Date: 2018-04-15 04:15+0300\n"
1212
"Last-Translator: Alexander Gross <[email protected]>\n"
1313
"Language-Team: Russian <[email protected]>\n"
@@ -106,6 +106,12 @@ msgstr ""
106106
msgid "Define the type of the picture to show, if a radio plugin is not found."
107107
msgstr ""
108108

109+
msgid "Enable EPG scan"
110+
msgstr ""
111+
112+
msgid "Defines if EPG scan for the IpTV devices shall be enabled"
113+
msgstr ""
114+
109115
msgid "Help"
110116
msgstr "Справка"
111117

‎setup.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ cIptvPluginSetup::cIptvPluginSetup() {
124124

125125
protocolBasePortM = IptvConfig.GetProtocolBasePort();
126126
sectionFilteringM = IptvConfig.GetSectionFiltering();
127+
enableEpgScanM = IptvConfig.GetEnableEpgScan();
127128
numDisabledFiltersM = IptvConfig.GetDisabledFiltersCount();
128129
stillPicture = IptvConfig.GetStillPicture();
129130

@@ -175,6 +176,9 @@ void cIptvPluginSetup::Setup() {
175176
Add(new cMenuEditStraItem(tr("StillPicture"), &stillPicture, 3, stillPicType));
176177
helpM.Append(tr("Define the type of the picture to show, if a radio plugin is not found."));
177178

179+
Add(new cMenuEditBoolItem(tr("Enable EPG scan"), &enableEpgScanM));
180+
helpM.Append(tr("Defines if EPG scan for the IpTV devices shall be enabled"));
181+
178182
SetCurrent(Get(current));
179183
Display();
180184
}
@@ -253,11 +257,13 @@ void cIptvPluginSetup::Store() {
253257
SetupStore("SectionFiltering", sectionFilteringM);
254258
StoreFilters("DisabledFilters", disabledFilterIndexesM);
255259
SetupStore("StillPicture", stillPicture);
260+
SetupStore("EnableEpgScan", enableEpgScanM);
256261

257262
// Update global config
258263
IptvConfig.SetProtocolBasePort(protocolBasePortM);
259264
IptvConfig.SetSectionFiltering(sectionFilteringM);
260265
IptvConfig.SetStillPicture(stillPicture);
266+
IptvConfig.SetEnableEpgScan(enableEpgScanM);
261267

262268
for (int i = 0; i < SECTION_FILTER_TABLE_SIZE; ++i) {
263269
IptvConfig.SetDisabledFilters(i, disabledFilterIndexesM[i]);

‎setup.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class cIptvPluginSetup : public cMenuSetupPage {
1616
int protocolBasePortM;
1717
int sectionFilteringM;
1818
int numDisabledFiltersM;
19+
int enableEpgScanM;
1920
int disabledFilterIndexesM[SECTION_FILTER_TABLE_SIZE];
2021
const char *disabledFilterNamesM[SECTION_FILTER_TABLE_SIZE];
2122
int stillPicture;

0 commit comments

Comments
 (0)