pvr: use the client's unique channel id for timer entries instead of …

…the channel number on the client (which can change). fixes missing timer entries when using the tvheadend addon. other addons might have to be updated to use the client's unique channel id in timer entries instead of the channel number. don't call UpdateRecordingsCache() while updating timers but afterwards.
opdenkamp · Mar 6, 2011 · 2ec58a6 · 2ec58a6 · FernetMenta · Mar 10, 2011
1 parent 804de23
commit 2ec58a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -228,14 +228,14 @@ void CPVRChannelGroup::SortByChannelNumber(void)
 
 /********** getters **********/
 
-const CPVRChannel *CPVRChannelGroup::GetByClient(int iClientChannelNumber, int iClientID) const
+const CPVRChannel *CPVRChannelGroup::GetByClient(int iUniqueChannelId, int iClientID) const
 {
   CPVRChannel *channel = NULL;
 
   for (unsigned int ptr = 0; ptr < size(); ptr++)
   {
     PVRChannelGroupMember groupMember = at(ptr);
-    if (groupMember.channel->ClientChannelNumber() == iClientChannelNumber &&
+    if (groupMember.channel->UniqueID() == iUniqueChannelId &&
         groupMember.channel->ClientID() == iClientID)
     {
       channel = groupMember.channel;

diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h
@@ -270,11 +270,11 @@ class CPVRChannelGroup : private std::vector<PVRChannelGroupMember>
 
   /*!
    * @brief Get a channel given the channel number on the client.
-   * @param iClientChannelNumber The channel number on the client.
+   * @param iUniqueChannelId The unique channel id on the client.
    * @param iClientID The ID of the client.
    * @return The channel or NULL if it wasn't found.
    */
-  const CPVRChannel *GetByClient(int iClientChannelNumber, int iClientID) const;
+  const CPVRChannel *GetByClient(int iUniqueChannelId, int iClientID) const;
 
   /*!
    * @brief Get a channel given it's channel ID.

diff --git a/xbmc/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp
@@ -90,9 +90,6 @@ int CPVRTimers::Update()
     itr++;
   }
 
-  //XXX
-  CPVRManager::Get()->UpdateRecordingsCache();
-
   /* set channel timers */
   for (unsigned int ptr = 0; ptr < size(); ptr++)
   {