[SCM] kodi-pvr-hts/master: [API 5.0.0] Use PVR_CHANNEL_INVALID_UID

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

The following commit has been merged in the master branch:
commit 2c74fcd7825d61753e2b21934e7e7e1aa5fc9ab1
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Tue Feb 9 12:25:56 2016 +0100

    [API 5.0.0] Use PVR_CHANNEL_INVALID_UID

diff --git a/src/AutoRecordings.cpp b/src/AutoRecordings.cpp
index d9e5e1d..2a8b257 100644
--- a/src/AutoRecordings.cpp
+++ b/src/AutoRecordings.cpp
@@ -69,7 +69,7 @@ void AutoRecordings::GetAutorecTimers(std::vector<PVR_TIMER> &timers)
     memset(&tmr, 0, sizeof(tmr));
 
     tmr.iClientIndex       = tit->second.GetId();
-    tmr.iClientChannelUid  = (tit->second.GetChannel() > 0) ? tit->second.GetChannel() : -1;
+    tmr.iClientChannelUid  = (tit->second.GetChannel() > 0) ? tit->second.GetChannel() : PVR_TIMER_ANY_CHANNEL;
     tmr.startTime          = tit->second.GetStart();
     tmr.endTime            = tit->second.GetStop();
     if (tmr.startTime == 0)
diff --git a/src/TimeRecordings.cpp b/src/TimeRecordings.cpp
index 97aae09..225eaed 100644
--- a/src/TimeRecordings.cpp
+++ b/src/TimeRecordings.cpp
@@ -68,7 +68,7 @@ void TimeRecordings::GetTimerecTimers(std::vector<PVR_TIMER> &timers)
     memset(&tmr, 0, sizeof(tmr));
 
     tmr.iClientIndex       = tit->second.GetId();
-    tmr.iClientChannelUid  = (tit->second.GetChannel() > 0) ? tit->second.GetChannel() : -1;
+    tmr.iClientChannelUid  = (tit->second.GetChannel() > 0) ? tit->second.GetChannel() : PVR_TIMER_ANY_CHANNEL;
     tmr.startTime          = tit->second.GetStart();
     tmr.endTime            = tit->second.GetStop();
     strncpy(tmr.strTitle,
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 37a1a06..db4b28f 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -472,7 +472,7 @@ PVR_ERROR CTvheadend::GetRecordings ( ADDON_HANDLE handle )
       rec.iEpgEventId = recording.GetEventId();
 
       /* channel id */
-      rec.iChannelUid = recording.GetChannel();
+      rec.iChannelUid = recording.GetChannel() > 0 ? recording.GetChannel() : PVR_CHANNEL_INVALID_UID;
 
       recs.push_back(rec);
     }
@@ -868,7 +868,7 @@ bool CTvheadend::CreateTimer ( const Recording &tvhTmr, PVR_TIMER &tmr )
   memset(&tmr, 0, sizeof(tmr));
 
   tmr.iClientIndex       = tvhTmr.GetId();
-  tmr.iClientChannelUid  = (tvhTmr.GetChannel() > 0) ? tvhTmr.GetChannel() : -1;
+  tmr.iClientChannelUid  = (tvhTmr.GetChannel() > 0) ? tvhTmr.GetChannel() : PVR_CHANNEL_INVALID_UID;
   tmr.startTime          = static_cast<time_t>(tvhTmr.GetStart());
   tmr.endTime            = static_cast<time_t>(tvhTmr.GetStop());
   strncpy(tmr.strTitle,

-- 
kodi-pvr-hts packaging