Merge pull request #67 from Glenn-1990/satpos

include satpos in mux description
kodi-pvr · Jul 22, 2015 · db494cd · db494cd
2 parents 229aa38 + 60a5b2e
commit db494cd
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
@@ -567,6 +567,22 @@ void CHTSPDemuxer::ParseSourceInfo ( htsmsg_t *m )
   if (!m) return;
 
   tvhtrace("demux sourceInfo:");
+
+  /* include position in mux name
+   * as users might receive multiple satellite positions */
+  m_sourceInfo.si_mux.clear();
+  if ((str = htsmsg_get_str(m, "satpos")) != NULL)
+  {
+    tvhtrace("  satpos : %s", str);
+    m_sourceInfo.si_mux.append(str);
+    m_sourceInfo.si_mux.append(": ");
+  }
+  if ((str = htsmsg_get_str(m, "mux")) != NULL)
+  {
+    tvhtrace("  mux     : %s", str);
+    m_sourceInfo.si_mux.append(str);
+  }
+
   if ((str = htsmsg_get_str(m, "adapter")) != NULL)
   {
     tvhtrace("  adapter : %s", str);
@@ -577,11 +593,6 @@ void CHTSPDemuxer::ParseSourceInfo ( htsmsg_t *m )
     tvhtrace("  network : %s", str);
     m_sourceInfo.si_network  = str;
   }
-  if ((str = htsmsg_get_str(m, "mux")) != NULL)
-  {
-    tvhtrace("  mux     : %s", str);
-    m_sourceInfo.si_mux      = str;
-  }
   if ((str = htsmsg_get_str(m, "provider")) != NULL)
   {
     tvhtrace("  provider : %s", str);