Merge pull request #105 from excorp/Krypton

Krypton
kodi-pvr · Feb 1, 2017 · 8f725fa · 8f725fa
2 parents ac82606 + bc29f62
commit 8f725fa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="2.4.9"
+  version="2.4.10"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v2.4.10
+- added Channel number tvg-chno to m3u 
+
 v2.4.9
 - Fix: Change the line lenght to 4k.
 

diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
@@ -38,6 +38,7 @@
 #define TVG_INFO_NAME_MARKER    "tvg-name="
 #define TVG_INFO_LOGO_MARKER    "tvg-logo="
 #define TVG_INFO_SHIFT_MARKER   "tvg-shift="
+#define TVG_INFO_CHNO_MARKER    "tvg-chno="
 #define GROUP_NAME_MARKER       "group-title="
 #define RADIO_MARKER            "radio="
 #define CHANNEL_LOGO_EXTENSION  ".png"
@@ -366,6 +367,7 @@ bool PVRIptvData::LoadPlayList(void)
     {
       bool        bRadio       = false;
       double      fTvgShift    = 0;
+      std::string strChnlNo    = "";
       std::string strChnlName  = "";
       std::string strTvgId     = "";
       std::string strTvgName   = "";
@@ -391,6 +393,7 @@ bool PVRIptvData::LoadPlayList(void)
         strTvgId      = ReadMarkerValue(strInfoLine, TVG_INFO_ID_MARKER);
         strTvgName    = ReadMarkerValue(strInfoLine, TVG_INFO_NAME_MARKER);
         strTvgLogo    = ReadMarkerValue(strInfoLine, TVG_INFO_LOGO_MARKER);
+        strChnlNo     = ReadMarkerValue(strInfoLine, TVG_INFO_CHNO_MARKER);
         strGroupName  = ReadMarkerValue(strInfoLine, GROUP_NAME_MARKER);
         strRadio      = ReadMarkerValue(strInfoLine, RADIO_MARKER);
         strTvgShift   = ReadMarkerValue(strInfoLine, TVG_INFO_SHIFT_MARKER);
@@ -407,6 +410,11 @@ bool PVRIptvData::LoadPlayList(void)
         }
         fTvgShift = atof(strTvgShift.c_str());
 
+        if (!strChnlNo.empty()) 
+        {
+          iChannelNum = atoi(strChnlNo.c_str());
+        }
+
         bRadio                = !StringUtils::CompareNoCase(strRadio, "true");
         tmpChannel.strTvgId   = strTvgId;
         tmpChannel.strTvgName = XBMC->UnknownToUTF8(strTvgName.c_str());
@@ -449,7 +457,7 @@ bool PVRIptvData::LoadPlayList(void)
 
       PVRIptvChannel channel;
       channel.iUniqueId         = GetChannelId(tmpChannel.strChannelName.c_str(), strLine.c_str());
-      channel.iChannelNumber    = iChannelNum++;
+      channel.iChannelNumber    = iChannelNum;
       channel.strTvgId          = tmpChannel.strTvgId;
       channel.strChannelName    = tmpChannel.strChannelName;
       channel.strTvgName        = tmpChannel.strTvgName;
@@ -459,7 +467,9 @@ bool PVRIptvData::LoadPlayList(void)
       channel.strStreamURL      = strLine;
       channel.iEncryptionSystem = 0;
 
-      if (iCurrentGroupId > 0)
+      iChannelNum++;
+
+      if (iCurrentGroupId > 0) 
       {
         channel.bRadio = m_groups.at(iCurrentGroupId - 1).bRadio;
         m_groups.at(iCurrentGroupId - 1).members.push_back(iChannelIndex);