Version 3.4.3: fix channel playback.

kodi-pvr · Jul 17, 2018 · f4aac8e · f4aac8e
1 parent c5ee627
commit f4aac8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/pvr.stalker/changelog.txt b/pvr.stalker/changelog.txt
@@ -1,5 +1,6 @@
 3.4.3
 - Code cleanup
+- Fix channel playback
 
 3.4.2
 - Updated language files from Transifex

diff --git a/src/SData.cpp b/src/SData.cpp
@@ -512,22 +512,14 @@ PVR_ERROR SData::GetChannels(ADDON_HANDLE handle, bool radio) {
 
 PVR_ERROR SData::GetChannelStreamProperties(const PVR_CHANNEL* channel, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount)
 {
-  if (*iPropertiesCount < 2)
+  if (!channel || !properties || *iPropertiesCount < 2)
      return PVR_ERROR_INVALID_PARAMETERS;
 
-  std::string strUrl;
-  std::vector<SC::Channel> channels;
-  channels = m_channelManager->GetChannels();
-  for (const auto& stalkerChannel : channels)
-  {
-    if (stalkerChannel.uniqueId == channel->iUniqueId)
-    {
-      strUrl = stalkerChannel.streamUrl;
-    }
-  }
-  if (strUrl.empty()) {
+  const std::string strUrl = GetChannelStreamURL(*channel);
+
+  if (strUrl.empty())
     return PVR_ERROR_FAILED;
-  }
+
   strncpy(properties[0].strName, PVR_STREAM_PROPERTY_STREAMURL, sizeof(properties[0].strName) - 1);
   strncpy(properties[0].strValue, strUrl.c_str(), sizeof(properties[0].strValue) - 1);
   strncpy(properties[1].strName, PVR_STREAM_PROPERTY_ISREALTIMESTREAM, sizeof(properties[1].strName) - 1);