[SCM] kodi-pvr-hts/master: Fixes for issues that went wrong during the last rebase

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ce037c3ff686eff698547efa62b50af309b08b0
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date:   Fri Oct 9 12:49:16 2015 +0300

    Fixes for issues that went wrong during the last rebase

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 17cca59..2ad40f9 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -380,7 +380,7 @@ PVR_ERROR CTvheadend::GetRecordings ( ADDON_HANDLE handle )
       strncpy(rec.strTitle, recording.GetTitle().c_str(), sizeof(rec.strTitle) - 1);
 
       /* Subtitle */
-      strncpy(rec.strEpisodeName, rit->second.subtitle.c_str(), sizeof(rec.strEpisodeName) - 1);
+      strncpy(rec.strEpisodeName, recording.GetSubtitle().c_str(), sizeof(rec.strEpisodeName) - 1);
 
       /* Description */
       strncpy(rec.strPlot, recording.GetDescription().c_str(), sizeof(rec.strPlot) - 1);
diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index 746cd48..d3a3030 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -142,17 +142,20 @@ namespace tvheadend
       const std::string& GetTitle() const { return m_title; }
       void SetTitle(const std::string &title) { m_title = title; }
 
+      const std::string& GetSubtitle() const { return m_subtitle; }
+      void SetSubtitle(const std::string &subtitle) { m_subtitle = subtitle; }
+
       const std::string& GetPath() const { return m_path; }
       void SetPath(const std::string &path) { m_path = path; }
 
       const std::string& GetDescription() const { return m_description; }
       void SetDescription(const std::string &description) { m_description = description; }
 
-      const std::string& GetTimerecId() const { return m_autorecId; }
-      void SetTimerecId(const std::string &autorecId) { m_autorecId = autorecId; }
+      const std::string& GetTimerecId() const { return m_timerecId; }
+      void SetTimerecId(const std::string &autorecId) { m_timerecId = autorecId; }
 
-      const std::string& GetAutorecId() const { return m_title; }
-      void SetAutorecId(const std::string &title) { m_title = title; }
+      const std::string& GetAutorecId() const { return m_autorecId; }
+      void SetAutorecId(const std::string &title) { m_autorecId = title; }
 
       PVR_TIMER_STATE GetState() const { return m_state; }
       void SetState(const PVR_TIMER_STATE &state) { m_state = state; }
@@ -174,6 +177,7 @@ namespace tvheadend
       int64_t          m_startExtra;
       int64_t          m_stopExtra;
       std::string      m_title;
+      std::string      m_subtitle;
       std::string      m_path;
       std::string      m_description;
       std::string      m_timerecId;

-- 
kodi-pvr-hts packaging