Skip to content
This repository
Browse code

Merge branch 'pvr.hts'. closes #135. closes #139

  • Loading branch information...
commit 425a3941e088fe1016b2e7422e3d210032b8bb2c 2 parents 3b13e4c + 71b43da
Lars Op den Kamp authored January 05, 2013
2  addons/pvr.hts/addon/addon.xml.in
... ...
@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <addon
3 3
   id="pvr.hts"
4  
-  version="1.6.12"
  4
+  version="1.6.13"
5 5
   name="Tvheadend HTSP Client"
6 6
   provider-name="Lars Op den Kamp, Team XBMC">
7 7
   <requires>
5  addons/pvr.hts/addon/changelog.txt
... ...
@@ -1,3 +1,8 @@
  1
+1.6.13
  2
+
  3
+- make channel.radio to not reset to false during update if tvheadend not provided channel services
  4
+- change handling of EPG events to not fail all events if only one/few events were broken/malformed
  5
+
1 6
 1.6.12
2 7
 
3 8
 - fix instant recordings when channel has no epg data
7  addons/pvr.hts/src/HTSPData.cpp
@@ -799,15 +799,16 @@ PVR_ERROR CHTSPData::GetEvents(ADDON_HANDLE handle, uint32_t cid, time_t stop)
799 799
     return PVR_ERROR_UNKNOWN;
800 800
   }
801 801
 
  802
+  retVal = PVR_ERROR_UNKNOWN;
802 803
   htsmsg_t *e;
803 804
   htsmsg_field_t *f;
804 805
   HTSMSG_FOREACH(f, msg)
805 806
   {
806 807
     if ((e = htsmsg_get_map_by_field(f)))
807 808
     {
808  
-      if (!ParseEvent(handle, e, NULL, stop))
  809
+      if (ParseEvent(handle, e, NULL, stop))
809 810
       {
810  
-        retVal = PVR_ERROR_UNKNOWN;
  811
+        retVal = PVR_ERROR_NO_ERROR;
811 812
       }
812 813
     }
813 814
   }
@@ -912,7 +913,7 @@ void CHTSPData::ParseChannelUpdate(htsmsg_t* msg)
912 913
   }
913 914
 
914 915
   htsmsg_t *services;
915  
-  bool bIsRadio(false);
  916
+  bool bIsRadio = channel.radio;
916 917
   if((services = htsmsg_get_list(msg, "services")))
917 918
   {
918 919
     htsmsg_field_t *f;

0 notes on commit 425a394

Please sign in to comment.
Something went wrong with that request. Please try again.