diff --git a/HISTORY b/HISTORY index 2549762..7ae3442 100644 --- a/HISTORY +++ b/HISTORY @@ -64,3 +64,7 @@ VDR Plugin 'satip' Revision History - Added a validity check for the session member. - Added a session id quirk for Triax TSS 400. + +2014-xx-xx: Version 0.3.4 + +- Fixed the cable only device detection. diff --git a/po/ca_ES.po b/po/ca_ES.po index 521c59c..1d357ee 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 0.3.3\n" +"Project-Id-Version: vdr-satip 0.3.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-18 05:18+0200\n" "PO-Revision-Date: 2014-05-18 05:18+0200\n" diff --git a/po/de_DE.po b/po/de_DE.po index 30bc5a6..4f1b7ac 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 0.3.3\n" +"Project-Id-Version: vdr-satip 0.3.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-18 05:18+0200\n" "PO-Revision-Date: 2014-05-18 05:18+0200\n" diff --git a/po/es_ES.po b/po/es_ES.po index 06ca763..6f8e7ac 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 0.3.3\n" +"Project-Id-Version: vdr-satip 0.3.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-18 05:18+0200\n" "PO-Revision-Date: 2014-05-18 05:18+0200\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 9601116..b34554e 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 0.3.3\n" +"Project-Id-Version: vdr-satip 0.3.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-18 05:18+0200\n" "PO-Revision-Date: 2014-05-18 05:18+0200\n" diff --git a/satip.c b/satip.c index 8f4d110..6a484ec 100644 --- a/satip.c +++ b/satip.c @@ -25,7 +25,7 @@ #define GITVERSION "" #endif - const char VERSION[] = "0.3.3" GITVERSION; + const char VERSION[] = "0.3.4" GITVERSION; static const char DESCRIPTION[] = trNOOP("SAT>IP Devices"); class cPluginSatip : public cPlugin { diff --git a/server.c b/server.c index 6d852c6..e5dd525 100644 --- a/server.c +++ b/server.c @@ -51,8 +51,10 @@ cSatipServer::cSatipServer(const char *addressP, const char *descriptionP, const else modelCountM[eSatipModuleDVBT2] = 1; // Add model quirks here - if (!isempty(*descriptionM) && strstr(*descriptionM, "OctopusNet")) + if (!isempty(*descriptionM) && strstr(*descriptionM, "OctopusNet")) { modelTypeM |= cSatipServer::eSatipModelTypeDVBC; + modelCountM[eSatipModuleDVBC] = modelCountM[eSatipModuleDVBT2]; + } } if (strstr(r, "DVBT")) { modelTypeM |= cSatipServer::eSatipModelTypeDVBT; @@ -63,6 +65,14 @@ cSatipServer::cSatipServer(const char *addressP, const char *descriptionP, const // Add model quirks here if (!isempty(*descriptionM) && strstr(*descriptionM, "OctopusNet")) modelTypeM |= cSatipServer::eSatipModelTypeDVBC; + modelCountM[eSatipModuleDVBC] = modelCountM[eSatipModuleDVBT]; + } + if (strstr(r, "DVBC")) { + modelTypeM |= cSatipServer::eSatipModelTypeDVBC; + if (char *c = strstr(r, "-")) + modelCountM[eSatipModuleDVBC] = atoi(++c); + else + modelCountM[eSatipModuleDVBC] = 1; } r = strtok_r(NULL, ",", &s); } diff --git a/server.h b/server.h index 9af9985..d8d1db9 100644 --- a/server.h +++ b/server.h @@ -16,6 +16,7 @@ private: eSatipModuleDVBS2 = 0, eSatipModuleDVBT, eSatipModuleDVBT2, + eSatipModuleDVBC, eSatipModuleCount }; cString addressM; @@ -53,7 +54,7 @@ public: bool Quirk(int quirkP) { return ((quirkP & eSatipQuirkMask) & quirkM); } int ModelType(void) { return modelTypeM; } bool Match(int modelP) { return ((modelP & eSatipModelTypeMask) & modelTypeM); } - int Cable() { return Match(eSatipModelTypeDVBC) ? (Match(eSatipModelTypeDVBT2) ? modelCountM[eSatipModuleDVBT2] : modelCountM[eSatipModuleDVBT]) : 0; } // an ugly hack + int Cable() { return Match(eSatipModelTypeDVBC) ? modelCountM[eSatipModuleDVBC] : 0; } int Satellite() { return Match(eSatipModelTypeDVBS2) ? modelCountM[eSatipModuleDVBS2] : 0; } int Terrestrial() { return Match(eSatipModelTypeDVBT) ? modelCountM[eSatipModuleDVBT] : 0; } int Terrestrial2() { return Match(eSatipModelTypeDVBT2) ? modelCountM[eSatipModuleDVBT2] : 0; }