diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/README xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/README
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/README	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/README	2013-03-12 10:51:22.000000000 +0000
@@ -39,9 +39,10 @@
 Prepare:
 1) Install Visual C++ Express 2010 (follow the instructions on the wiki for XBMC itself)
 Compile:
-2) Open this solution from project\VS2010Express\xbmc-pvr-addons.sln
-3) Select the wanted configuration "Debug" or "Release"
-4) Press F7 to build the solution
+2) Run project\BuildDependencies\DownloadBuildDeps.bat
+3) Open this solution from project\VS2010Express\xbmc-pvr-addons.sln
+4) Select the wanted configuration "Debug" or "Release"
+5) Press F7 to build the solution
 Install:
 Still a TODO. The buildsystem does not yet generate .zip archives
 Workaround: copy the wanted pvr addons to your XBMC installation by hand.
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/addon.xml.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/addon/addon.xml.in	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/addon.xml.in	2013-03-12 10:51:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.argustv"
-  version="1.6.164"
+  version="1.6.165"
   name="ARGUS TV client"
   provider-name="Fred Hoogduin, Marcel Groothuis">
   <requires>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/addon/changelog.txt xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/changelog.txt
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/addon/changelog.txt	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/addon/changelog.txt	2013-03-12 10:51:22.000000000 +0000
@@ -1,3 +1,5 @@
+v1.6.165 (19-01-2013)
+- Do not disable the add-on when it can not connect to the ARGUS-TV server.
 v1.6.164 (18-01-2013)
 - EPG genre will contain the ARGUS TV "Category" string.
 v1.6.163 (01-01-2013)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/src/client.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/src/client.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/src/client.cpp	2012-11-27 01:00:30.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/src/client.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -160,7 +160,7 @@
     SAFE_DELETE(g_client);
     SAFE_DELETE(PVR);
     SAFE_DELETE(XBMC);
-    m_CurStatus = ADDON_STATUS_PERMANENT_FAILURE;
+    m_CurStatus = ADDON_STATUS_LOST_CONNECTION;
   }
   else
   {
@@ -186,14 +186,8 @@
     g_bCreated = false;
   }
 
-  if (PVR)
-  {
-    SAFE_DELETE(PVR);
-  }
-  if (XBMC)
-  {
-    SAFE_DELETE(XBMC);
-  }
+  SAFE_DELETE(PVR);
+  SAFE_DELETE(XBMC);
 
   m_CurStatus = ADDON_STATUS_UNKNOWN;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/src/pvrclient-argustv.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/src/pvrclient-argustv.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.argustv/src/pvrclient-argustv.cpp	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.argustv/src/pvrclient-argustv.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -116,9 +116,9 @@
       default:
          XBMC->Log(LOG_ERROR, "Ping failed... No connection to Argus TV.\n");
          usleep(1000000);
-         if (attemps > 30)
+         if (attemps > 3)
          {
-           XBMC->QueueNotification(QUEUE_ERROR, "No connection to Argus TV");
+           XBMC->QueueNotification(QUEUE_ERROR, "No connection to Argus TV server");
            return false;
          }
     }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/addon.xml.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/addon/addon.xml.in	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/addon.xml.in	2013-03-12 10:51:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="1.6.18"
+  version="1.6.19"
   name="Tvheadend HTSP Client"
   provider-name="Lars Op den Kamp, Team XBMC">
   <requires>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/addon/changelog.txt xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/changelog.txt
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/addon/changelog.txt	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/addon/changelog.txt	2013-03-12 10:51:22.000000000 +0000
@@ -1,3 +1,8 @@
+1.6.19
+
+- add timeshift skip support (FF/RW still not working)
+- fix bug in tvh webroot processing
+
 1.6.18
 
 - ensure channel count is not cleared after succesful sub
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPConnection.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPConnection.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPConnection.cpp	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPConnection.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -495,9 +495,10 @@
       if (f->hmf_type == HMF_STR)
       {
         if (!strcmp("timeshift", f->hmf_str))
+        {
           m_bTimeshiftSupport = true;
-        else if (!strcmp("timeshiftseek", f->hmf_str))
           m_bTimeshiftSeekSupport = true;
+        }
         else if (!strcmp("transcoding", f->hmf_str))
           m_bTranscodingSupport = true;
       }
@@ -507,7 +508,7 @@
   m_strServerName = server;
   m_strVersion    = version;
   m_iProtocol     = proto;
-  m_strWebroot    = webroot ? webroot : "/";
+  m_strWebroot    = webroot ? webroot : "";
 
   if(chall && chall_len)
   {
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPData.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPData.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPData.cpp	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPData.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -324,7 +324,7 @@
 
       /* HTSPv6- - use HTTP */
       else
-        strStreamURL = m_session->GetWebURL("dvrfile/%i", recording.id);
+        strStreamURL = m_session->GetWebURL("/dvrfile/%i", recording.id);
     }
 
     strRecordingId.Format("%i", recording.id);
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPDemux.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPDemux.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPDemux.cpp	2013-01-19 10:06:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPDemux.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -27,6 +27,7 @@
 #define READ_TIMEOUT 20000
 
 using namespace ADDON;
+using namespace PLATFORM;
 
 CHTSPDemux::CHTSPDemux(CHTSPConnection* connection) :
     m_session(connection),
@@ -36,6 +37,8 @@
     m_tag(0),
     m_bIsOpen(false)
 {
+  m_seekEvent = new CEvent;
+  m_seekTime  = -1;
   for (unsigned int i = 0; i < PVR_STREAM_MAX_STREAMS; i++)
     m_Streams.stream[i].iCodecType = AVMEDIA_TYPE_UNKNOWN;
   m_Streams.iStreamCount = 0;
@@ -148,10 +151,16 @@
     ParseSubscriptionStop(msg);
   else if(strcmp("subscriptionStatus", method) == 0)
     ParseSubscriptionStatus(msg);
+  else if(strcmp("subscriptionSkip"  , method) == 0)
+    ParseSubscriptionSkip(msg);
+  else if(strcmp("subscriptionSpeed" , method) == 0)
+    ParseSubscriptionSpeed(msg);
   else if(strcmp("queueStatus"       , method) == 0)
     ParseQueueStatus(msg);
   else if(strcmp("signalStatus"      , method) == 0)
     ParseSignalStatus(msg);
+  else if(strcmp("timeshiftStatus"   , method) == 0)
+    ParseTimeshiftStatus(msg);
   else if(strcmp("muxpkt"            , method) == 0)
     ParseMuxPacket(msg);
   else
@@ -576,6 +585,30 @@
   }
 }
 
+void CHTSPDemux::ParseSubscriptionSkip(htsmsg_t *m)
+{
+  int64_t s64;
+  uint32_t u32;
+  if (!htsmsg_get_u32(m, "error", &u32)   ||
+       htsmsg_get_u32(m, "absolute", &u32) ||
+       htsmsg_get_s64(m, "time", &s64)) {
+    m_seekTime = -1;
+  } else {
+    m_seekTime = (double)s64;
+  }
+  XBMC->Log(LOG_DEBUG, "HTSP::ParseSubscriptionSkip - skip = %lf\n", m_seekTime);
+  m_seekEvent->Broadcast();
+}
+
+void CHTSPDemux::ParseSubscriptionSpeed(htsmsg_t *m)
+{
+  uint32_t u32;
+  if (!htsmsg_get_u32(m, "speed", &u32)) {
+    XBMC->Log(LOG_INFO, "%s - speed = %u", __FUNCTION__, u32);
+    // TODO: need a way to pass this to player core
+  }
+}
+
 bool CHTSPDemux::SendUnsubscribe(int subscription)
 {
   XBMC->Log(LOG_INFO, "%s - unsubscribe from subscription %d", __FUNCTION__, subscription);
@@ -680,15 +713,31 @@
 
 bool CHTSPDemux::SendSeek(int subscription, int time, bool backward, double *startpts)
 {
-  XBMC->Log(LOG_DEBUG, "%s(%d, %d, %d)", __FUNCTION__, subscription, time, backward ? 1:0);
   htsmsg_t *m = htsmsg_create_map();
-  htsmsg_add_str(m, "method"        , "subscriptionSeek");
+  int64_t seek;
+
+  // Note: time is in MSEC not DVD_TIME_BASE, TVH requires 1MHz (us) input
+  seek = time * 1000;
+  XBMC->Log(LOG_DEBUG, "%s(time=%d, seek=%ld)", __FUNCTION__, time, seek);
+
+  htsmsg_add_str(m, "method"        , "subscriptionSkip");
   htsmsg_add_s32(m, "subscriptionId", subscription);
-  htsmsg_add_s32(m, "time"          , time);
-  htsmsg_add_u32(m, "backward"      , backward);
-  htsmsg_add_float(m, "startpts"    , *startpts);
+  htsmsg_add_s64(m, "time"          , seek);
+  htsmsg_add_u32(m, "absolute"      , 1);
+
+  if (!m_session->ReadSuccess(m, "seek subscription"))
+    return false;
 
-  return m_session->ReadSuccess(m, "seek subscription");
+  if (!m_seekEvent->Wait(g_iResponseTimeout * 1000))
+    return false;
+
+  if (m_seekTime < 0)
+    return false;
+
+  // Note: return value is in DVD_TIME_BASE not MSEC
+  *startpts = m_seekTime * DVD_TIME_BASE / 1000000;
+  XBMC->Log(LOG_DEBUG, "%s(%ld) = %lf", __FUNCTION__, seek, *startpts);
+  return true;
 }
 
 bool CHTSPDemux::ParseQueueStatus(htsmsg_t* msg)
@@ -734,6 +783,16 @@
   return true;
 }
 
+bool CHTSPDemux::ParseTimeshiftStatus(htsmsg_t *msg)
+{
+  // TODO: placeholder for processing timeshiftStatus message when
+  //       we're ready to use the information.
+  //
+  //       For now this just ensures we don't spam logs with unecessary
+  //       info about unhandled messages.
+  return true;
+}
+
 bool CHTSPDemux::ParseSourceInfo(htsmsg_t* msg)
 {
   htsmsg_t       *sourceinfo;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPDemux.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPDemux.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.hts/src/HTSPDemux.h	2012-12-30 01:00:27.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.hts/src/HTSPDemux.h	2013-03-12 10:51:22.000000000 +0000
@@ -24,6 +24,7 @@
 #include "client.h"
 #include "HTSPConnection.h"
 #include "platform/util/buffer.h"
+#include "platform/threads/mutex.h"
 
 class CHTSPDemux : public CHTSPConnectionCallback
 {
@@ -49,6 +50,8 @@
   void ParseSubscriptionStart (htsmsg_t *m);
   void ParseSubscriptionStop  (htsmsg_t *m);
   void ParseSubscriptionStatus(htsmsg_t *m);
+  void ParseSubscriptionSkip  (htsmsg_t *m);
+  void ParseSubscriptionSpeed (htsmsg_t *m);
   bool SendSubscribe  (int subscription, int channel);
   bool SendUnsubscribe(int subscription);
   bool SendSpeed      (int subscription, int speed);
@@ -56,6 +59,7 @@
   void ParseMuxPacket(htsmsg_t *m);
   bool ParseQueueStatus(htsmsg_t* msg);
   bool ParseSignalStatus(htsmsg_t* msg);
+  bool ParseTimeshiftStatus(htsmsg_t* msg);
   bool ParseSourceInfo(htsmsg_t* msg);
 
   CHTSPConnection*                     m_session;
@@ -72,4 +76,6 @@
   std::map<int, unsigned int>          m_StreamIndex;
   PLATFORM::SyncedBuffer<DemuxPacket*> m_demuxPacketBuffer;
   bool                                 m_bIsOpen;
+  PLATFORM::CEvent*                    m_seekEvent;
+  double                               m_seekTime;
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/addon.xml.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/addon/addon.xml.in	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/addon.xml.in	2013-03-12 10:51:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mediaportal.tvserver"
-  version="1.6.7"
+  version="1.6.8"
   name="MediaPortal PVR Client"
   provider-name="Marcel Groothuis">
   <requires>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/addon/changelog.txt xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/changelog.txt
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/addon/changelog.txt	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/addon/changelog.txt	2013-03-12 10:51:22.000000000 +0000
@@ -1,3 +1,9 @@
+v1.6.8
+- Channels: Use MediaPortal VisibleInGuide property as inverted IsHidden flag in XBMC. (requires TVServerXBMC build 120)
+- Channelgroups: Don't import other channel groups when the user selected to import channels from a single group.
+- TSReader: non-Windows: start playback as soon as the buffer file has a non-zero length
+- Genre translation: seach also for the genre_translation.xml file in the profile folder.
+
 v1.6.7
 - Updated language files from Transifex
 
@@ -12,7 +18,6 @@
 - Updated language files from Transifex
 
 v1.6.4
-
 -New version number by Team XBMC
 
 v1.2.3.117
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/channels.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/channels.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/channels.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/channels.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -29,6 +29,7 @@
   external_id = 0;
   iswebstream = false;
   encrypted = false;
+  visibleinguide = true;
 }
 
 cChannel::~cChannel()
@@ -52,6 +53,7 @@
     // ListRadioChannels only: (TVServerXBMC >= v1.1.0.100)
     // 4 = iswebstream
     // 5 = webstream url
+    // 6 = visibleinguide (TVServerXBMC >= v1.2.3.120)
 
     uid = atoi(fields[0].c_str());
     external_id = atoi(fields[1].c_str());
@@ -62,6 +64,11 @@
     {
       iswebstream = (strncmp(fields[4].c_str(), "1", 1) == 0);
       url = fields[5].c_str();
+
+      if (fields.size() >= 7)
+      {
+        visibleinguide = (strncmp(fields[6].c_str(), "1", 1) == 0);
+      }
     }
 
     return true;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/channels.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/channels.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/channels.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/channels.h	2013-03-12 10:51:22.000000000 +0000
@@ -31,6 +31,7 @@
   int external_id;
   bool encrypted;
   bool iswebstream;
+  bool visibleinguide;
   std::string url;
 
 public:
@@ -43,6 +44,7 @@
   int ExternalID(void) const { return external_id; }
   bool Encrypted(void) const { return encrypted; }
   bool IsWebstream(void) const { return iswebstream; }
+  bool VisibleInGuide(void) const { return visibleinguide; }
   const char* URL(void) const { return url.c_str(); }
 };
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/client.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/client.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/client.cpp	2012-12-29 04:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/client.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -450,7 +450,7 @@
   pCapabilities->bHandlesInputStream         = true;
   pCapabilities->bHandlesDemuxing            = false;
   pCapabilities->bSupportsChannelScan        = false;
-  pCapabilities->bSupportsRecordingPlayCount = true;
+  pCapabilities->bSupportsRecordingPlayCount = (g_iTVServerXBMCBuild < 117) ? false : true;
   pCapabilities->bSupportsLastPlayedPosition = false;
   pCapabilities->bSupportsRecordingFolders   = false; // Don't show the timer directory field. This does not influence the displaying directories in the recordings list.
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/lib/tsreader/MultiFileReader.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/lib/tsreader/MultiFileReader.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/lib/tsreader/MultiFileReader.cpp	2012-12-29 04:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/lib/tsreader/MultiFileReader.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -86,21 +86,17 @@
   XBMC->Log(LOG_DEBUG, "MultiFileReader: buffer file opened return code %d.", hr);
   m_lastZapPosition = 0;
 
-  int64_t fileLength = m_TSBufferFile.GetFileSize();
   int retryCount = 0;
 
-  if (fileLength == 0) do
+  while ((m_TSBufferFile.GetFileSize() == 0) && (retryCount < 50))
   {
     retryCount++;
-    XBMC->Log(LOG_DEBUG, "MultiFileReader: buffer file has zero length, closing, waiting 100 ms and re-opening. Try %d.", retryCount);
-    (void) m_TSBufferFile.CloseFile();
+    XBMC->Log(LOG_DEBUG, "MultiFileReader: buffer file has zero length, closing, waiting 100 ms and re-opening. Attempt: %d.", retryCount);
+    m_TSBufferFile.CloseFile();
     usleep(100000);
     hr = m_TSBufferFile.OpenFile();
     XBMC->Log(LOG_DEBUG, "MultiFileReader: buffer file opened return code %d.", hr);
-
-    fileLength = m_TSBufferFile.GetFileSize();
-  } while (retryCount < 50);
-
+  }
 
   if (RefreshTSBufferFile() == S_FALSE)
   {
@@ -324,7 +320,7 @@
     int64_t fileLength = m_TSBufferFile.GetFileSize();
 
     // Min file length is Header ( int64_t + int32_t + int32_t ) + filelist ( > 0 ) + Footer ( int32_t + int32_t )
-    int64_t minimumlength = (int64_t)(sizeof(currentPosition) + sizeof(filesAdded) + sizeof(filesRemoved) + sizeof(wchar_t) + sizeof(filesAdded2) + sizeof(filesRemoved2));
+    int64_t minimumlength = (int64_t)(sizeof(currentPosition) + sizeof(filesAdded) + sizeof(filesRemoved) + sizeof(Wchar_t) + sizeof(filesAdded2) + sizeof(filesRemoved2));
     if (fileLength <= minimumlength)
     {
       if (m_bDebugOutput)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.cpp	2012-12-29 04:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2011 Team XBMC
+ *      Copyright (C) 2005-2012 Team XBMC
  *      http://www.xbmc.org
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -42,13 +42,13 @@
 int g_iTVServerXBMCBuild = 0;
 
 /* PVR client version (don't forget to update also the addon.xml and the Changelog.txt files) */
-#define PVRCLIENT_MEDIAPORTAL_VERSION_STRING    "1.2.3.118"
+#define PVRCLIENT_MEDIAPORTAL_VERSION_STRING    "1.6.8"
 
 /* TVServerXBMC plugin supported versions */
 #define TVSERVERXBMC_MIN_VERSION_STRING         "1.1.0.90"
 #define TVSERVERXBMC_MIN_VERSION_BUILD          90
-#define TVSERVERXBMC_RECOMMENDED_VERSION_STRING "1.2.3.118"
-#define TVSERVERXBMC_RECOMMENDED_VERSION_BUILD  118
+#define TVSERVERXBMC_RECOMMENDED_VERSION_STRING "1.2.3.120"
+#define TVSERVERXBMC_RECOMMENDED_VERSION_BUILD  120
 
 /************************************************************/
 /** Class interface */
@@ -63,10 +63,6 @@
   m_bTimeShiftStarted      = false;
   m_BackendUTCoffset       = 0;
   m_BackendTime            = 0;
-  m_noSignalStreamSize     = 0;
-  m_noSignalStreamData[0]  = '\0';
-  m_noSignalStreamReadPos  = 0;
-  m_bPlayingNoSignal       = false;
   m_tsreader               = NULL;
   m_genretable             = NULL;
   m_iLastRecordingUpdate   = 0;
@@ -135,7 +131,7 @@
 
   if (!m_tcpclient->ReadResponse(code, lines))
   {
-    XBMC->Log(LOG_ERROR, "SendCommand - Failed with code: %d (%s)", code, lines[lines.size()-1].c_str());
+    XBMC->Log(LOG_ERROR, "SendCommand2 - Failed with code: %d (%s)", code, lines[lines.size()-1].c_str());
     return false;
   }
   else
@@ -164,7 +160,7 @@
 
   if (!m_tcpclient->connect(g_szHostname, (unsigned short) g_iPort))
   {
-    XBMC->Log(LOG_ERROR, "Could not connect to MPTV backend");
+    XBMC->Log(LOG_ERROR, "Could not connect to MediaPortal TV Server backend");
     return false;
   }
 
@@ -229,26 +225,11 @@
   snprintf(buffer, 512, "%s:%i", g_szHostname.c_str(), g_iPort);
   m_ConnectionString = buffer;
 
-  /* Retrieve card settings (needed for Live TV and recordings folders) */
-  if ( g_iTVServerXBMCBuild >= 106 )
-  {
-    int code;
-    vector<string> lines;
-
-    if ( SendCommand2("GetCardSettings\n", code, lines) )
-    {
-      m_cCards.ParseLines(lines);
-    }
-  }
-
   m_bConnected = true;
 
-  // Read the genre string to type/subtype translation file:
-  if(g_bReadGenre)
-  {
-    string sGenreFile = g_szClientPath + PATH_SEPARATOR_CHAR + "resources" + PATH_SEPARATOR_CHAR + "genre_translation.xml";
-    m_genretable = new CGenreTable(sGenreFile);
-  }
+  /* Load additional settings */
+  LoadGenreTable();
+  LoadCardSettings();
 
   return true;
 }
@@ -292,6 +273,7 @@
   {
     if(!Connect())
     {
+      XBMC->Log(LOG_DEBUG, "Backend not connected!");
       return false;
     }
   }
@@ -311,7 +293,7 @@
 // Used among others for the server name string in the "Recordings" view
 const char* cPVRClientMediaPortal::GetBackendName(void)
 {
-  if (!m_tcpclient->is_valid())
+  if (!IsUp())
   {
     return g_szHostname.c_str();
   }
@@ -579,28 +561,28 @@
       return PVR_ERROR_NO_ERROR;
     }
 
-    if (g_szRadioGroup.length() > 0)
+    if (g_szRadioGroup.empty())
     {
-      XBMC->Log(LOG_DEBUG, "GetChannels(radio) for radio group: '%s'", g_szRadioGroup.c_str());
-      command.Format("ListRadioChannels:%s\n", uri::encode(uri::PATH_TRAITS, g_szRadioGroup).c_str());
+      XBMC->Log(LOG_DEBUG, "GetChannels(radio) all channels");
+      command = "ListRadioChannels\n";
     }
     else
     {
-      XBMC->Log(LOG_DEBUG, "GetChannels(radio) all channels");
-      command = "ListRadioChannels\n";
+      XBMC->Log(LOG_DEBUG, "GetChannels(radio) for radio group: '%s'", g_szRadioGroup.c_str());
+      command.Format("ListRadioChannels:%s\n", uri::encode(uri::PATH_TRAITS, g_szRadioGroup).c_str());
     }
   }
   else
   {
-    if (g_szTVGroup.length() > 0)
+    if (g_szTVGroup.empty())
     {
-      XBMC->Log(LOG_DEBUG, "GetChannels(tv) for TV group: '%s'", g_szTVGroup.c_str());
-      command.Format("ListTVChannels:%s\n", uri::encode(uri::PATH_TRAITS, g_szTVGroup).c_str());
+      XBMC->Log(LOG_DEBUG, "GetChannels(tv) all channels");
+      command = "ListTVChannels\n";
     }
     else
     {
-      XBMC->Log(LOG_DEBUG, "GetChannels(tv) all channels");
-      command = "ListTVChannels\n";
+      XBMC->Log(LOG_DEBUG, "GetChannels(tv) for TV group: '%s'", g_szTVGroup.c_str());
+      command.Format("ListTVChannels:%s\n", uri::encode(uri::PATH_TRAITS, g_szTVGroup).c_str());
     }
   }
 
@@ -611,7 +593,6 @@
   bool            bCheckForThumbs = false;
 
   /* Check if we can find the MediaPortal channel logo folders on this machine */
-  std::string strIconName;
   std::string strThumbPath;
   std::string strProgramData;
 
@@ -665,25 +646,31 @@
       tag.iUniqueId = channel.UID();
       tag.iChannelNumber = g_iTVServerXBMCBuild >= 102 ? channel.ExternalID() : channel.UID();
       PVR_STRCPY(tag.strChannelName, channel.Name());
+      PVR_STRCLR(tag.strIconPath);
 #ifdef TARGET_WINDOWS
       if (bCheckForThumbs)
       {
-        strIconName = strThumbPath + ToThumbFileName(channel.Name()) + ".png";
-        if ( OS::CFile::Exists(strIconName) )
-        {
-          PVR_STRCPY(tag.strIconPath, strIconName.c_str());
-        }
-        else
+        const int ciExtCount = 5;
+        string strIconExt [ciExtCount] = { ".png", ".jpg", ".jpeg", ".bmp", ".gif" };
+        string strIconName;
+        string strIconBaseName;
+
+        strIconBaseName = strThumbPath + ToThumbFileName(channel.Name());
+
+        for (int i=0; i < ciExtCount; i++)
         {
-          PVR_STRCLR(tag.strIconPath);
+          strIconName = strIconBaseName + strIconExt[i];
+          if ( OS::CFile::Exists(strIconName) )
+          {
+            PVR_STRCPY(tag.strIconPath, strIconName.c_str());
+            break;
+          }
         }
       }
-#else
-      PVR_STRCLR(tag.strIconPath);
 #endif
       tag.iEncryptionSystem = channel.Encrypted();
       tag.bIsRadio = bRadio;
-      tag.bIsHidden = false;
+      tag.bIsHidden = !channel.VisibleInGuide();
 
       if(channel.IsWebstream())
       {
@@ -762,9 +749,21 @@
       XBMC->Log(LOG_DEBUG, "Skipping GetChannelGroups for radio. Radio support is disabled.");
       return PVR_ERROR_NO_ERROR;
     }
+
+    if (!g_szRadioGroup.empty())
+    {
+      XBMC->Log(LOG_DEBUG, "Skipping GetChannelGroups for radio due to setting: Import only Radio channels from group '%s'.", g_szRadioGroup.c_str());
+      return PVR_ERROR_NO_ERROR;
+    }
   }
   else
   {
+    if (!g_szTVGroup.empty())
+    {
+      XBMC->Log(LOG_DEBUG, "Skipping GetChannelGroups for TV due to setting: Import only TV channels from group '%s'.", g_szTVGroup.c_str());
+      return PVR_ERROR_NO_ERROR;
+    }
+
     XBMC->Log(LOG_DEBUG, "GetChannelGroups for TV");
     if (!SendCommand2("ListGroups\n", code, lines))
       return PVR_ERROR_SERVER_ERROR;
@@ -1012,8 +1011,10 @@
 
   if(result.find("True") ==  string::npos)
   {
+    XBMC->Log(LOG_ERROR, "Deleting recording %s [failed]", recording.strRecordingId);
     return PVR_ERROR_FAILED;
   }
+  XBMC->Log(LOG_DEBUG, "Deleting recording %s [done]", recording.strRecordingId);
 
   // Although XBMC initiates the deletion of this recording, we still have to trigger XBMC to update its
   // recordings list to remove the recording at the XBMC side
@@ -1038,7 +1039,7 @@
 
   if(result.find("True") == string::npos)
   {
-    XBMC->Log(LOG_DEBUG, "RenameRecording(%s) to %s [failed]", recording.strRecordingId, recording.strTitle);
+    XBMC->Log(LOG_ERROR, "RenameRecording(%s) to %s [failed]", recording.strRecordingId, recording.strTitle);
     return PVR_ERROR_FAILED;
   }
   XBMC->Log(LOG_DEBUG, "RenameRecording(%s) to %s [done]", recording.strRecordingId, recording.strTitle);
@@ -1067,7 +1068,7 @@
 
   if(result.find("True") == string::npos)
   {
-    XBMC->Log(LOG_DEBUG, "%s: id=%s to %i [failed]", __FUNCTION__, recording.strRecordingId, count);
+    XBMC->Log(LOG_ERROR, "%s: id=%s to %i [failed]", __FUNCTION__, recording.strRecordingId, count);
     return PVR_ERROR_FAILED;
   }
 
@@ -1485,7 +1486,7 @@
     {
       usleep(400000);
       read_timeouts++;
-      return read_wanted; //writeNoSignalStream(buf, (buf_size - read_done));
+      return read_wanted;
     }
     read_done += read_wanted;
 
@@ -1495,8 +1496,7 @@
       {
         XBMC->Log(LOG_INFO, "No data in 2 seconds");
         read_timeouts = 0;
-        m_bPlayingNoSignal = true;
-        return read_done; //writeNoSignalStream(bufptr, read_wanted);
+        return read_done;
       }
       bufptr += read_wanted;
       read_timeouts++;
@@ -1504,8 +1504,8 @@
     }
   }
   read_timeouts = 0;
-  m_bPlayingNoSignal = false;
-  return read_done;//TSReadDone*TS_SIZE;
+
+  return read_done;
 }
 
 void cPVRClientMediaPortal::CloseLiveStream(void)
@@ -1638,8 +1638,14 @@
 bool cPVRClientMediaPortal::OpenRecordedStream(const PVR_RECORDING &recording)
 {
   XBMC->Log(LOG_DEBUG, "->OpenRecordedStream(index=%s)", recording.strRecordingId);
-  if (!IsUp() || g_eStreamingMethod == ffmpeg)
-     return false;
+  if (!IsUp())
+    return false;
+
+  if (g_eStreamingMethod == ffmpeg)
+  {
+    XBMC->Log(LOG_ERROR, "Addon is in 'ffmpeg' mode. XBMC should play the RTSP url directly. Please reset your XBMC PVR database!");
+    return false;
+  }
 
   std::string recfile = "";
 
@@ -1671,6 +1677,10 @@
       }
     }
   }
+  else
+  {
+    XBMC->Log(LOG_ERROR, "Backend command '%s' returned a zero-length answer", command);
+  }
 
   if (recfile.length() > 0)
   {
@@ -1725,7 +1735,7 @@
     if (m_tsreader->Read(bufptr, read_wanted, &read_wanted) > 0)
     {
       usleep(20000);
-      return read_wanted; //writeNoSignalStream(buf, (buf_size - read_done));
+      return read_wanted;
     }
     read_done += read_wanted;
 
@@ -1735,9 +1745,8 @@
       usleep(20000);
     }
   }
-  //read_timeouts = 0;
-  m_bPlayingNoSignal = false;
-  return read_done;//TSReadDone*TS_SIZE;
+
+  return read_done;
 }
 
 long long cPVRClientMediaPortal::SeekRecordedStream(long long iPosition, int iWhence)
@@ -1803,3 +1812,38 @@
   else
     return false;
 }
+
+void cPVRClientMediaPortal::LoadGenreTable()
+{
+  // Read the genre string to type/subtype translation file:
+  if(g_bReadGenre)
+  {
+    string sGenreFile = g_szUserPath + PATH_SEPARATOR_CHAR + "resources" + PATH_SEPARATOR_CHAR + "genre_translation.xml";
+
+    if (!XBMC->FileExists(sGenreFile.c_str(), false))
+    {
+      sGenreFile = g_szUserPath + PATH_SEPARATOR_CHAR + "genre_translation.xml";
+      if (!XBMC->FileExists(sGenreFile.c_str(), false))
+      {
+        sGenreFile = g_szClientPath + PATH_SEPARATOR_CHAR + "resources" + PATH_SEPARATOR_CHAR + "genre_translation.xml";
+      }
+    }
+
+    m_genretable = new CGenreTable(sGenreFile);
+  }
+}
+
+void cPVRClientMediaPortal::LoadCardSettings()
+{
+  /* Retrieve card settings (needed for Live TV and recordings folders) */
+  if ( g_iTVServerXBMCBuild >= 106 )
+  {
+    int code;
+    vector<string> lines;
+
+    if ( SendCommand2("GetCardSettings\n", code, lines) )
+    {
+      m_cCards.ParseLines(lines);
+    }
+  }
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.h	2012-12-29 04:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mediaportal.tvserver/src/pvrclient-mediaportal.h	2013-03-12 10:51:22.000000000 +0000
@@ -32,7 +32,7 @@
 /* Use a forward declaration here. Including RTSPClient.h via TSReader.h at this point gives compile errors */
 class CTsReader;
 
-class cPVRClientMediaPortal
+class cPVRClientMediaPortal: public PLATFORM::PreventCopy
 {
 public:
   /* Class interface */
@@ -108,7 +108,8 @@
 
 private:
   bool GetChannel(unsigned int number, PVR_CHANNEL &channeldata);
-  bool LoadGenreXML(const std::string &filename);
+  void LoadGenreTable(void);
+  void LoadCardSettings(void);
 
   int                     m_iCurrentChannel;
   int                     m_iCurrentCard;
@@ -127,11 +128,6 @@
   int64_t                 m_iLastRecordingUpdate;
   CTsReader*              m_tsreader;
 
-  char                    m_noSignalStreamData[ 6 + 0xffff ];
-  long                    m_noSignalStreamSize;
-  long                    m_noSignalStreamReadPos;
-  bool                    m_bPlayingNoSignal;
-
   void Close();
 
   //Used for TV Server communication:
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/Makefile.am
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/Makefile.am	2012-12-01 01:00:27.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/Makefile.am	2013-03-12 10:51:22.000000000 +0000
@@ -30,6 +30,6 @@
                                   src/cppmyth/MythRecorder.cpp \
                                   src/cppmyth/MythStorageGroupFile.cpp \
                                   src/cppmyth/MythSignal.cpp \
-                                  src/cppmyth/MythTimer.cpp \
+                                  src/cppmyth/MythRecordingRule.cpp \
                                   src/cppmyth/MythTimestamp.cpp
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/addon.xml.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/addon.xml.in	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/addon.xml.in	2013-03-12 10:51:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mythtv.cmyth"
-  version="1.6.7"
+  version="1.6.9"
   name="MythTV cmyth PVR Client"
   provider-name="Christian Fetzer, Jean-Luc Barrière, Tonny Petersen">
   <requires>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/changelog.txt xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/changelog.txt
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/changelog.txt	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/changelog.txt	2013-03-12 10:51:22.000000000 +0000
@@ -1,3 +1,33 @@
+v1.6.9
+- Added Live TV vs. recording conflict handling
+- Fixed recovering from backend connection loss on Windows
+- Fixed error when trying to set watched flag for recordings that already have been marked as watched
+
+v1.6.8
+- Performance improvements
+    - Reduced startup time (Faster loading of EPG, channels, recordings and images)
+    - Reduced resource usage for image caching
+    - Cache recording data (event triggered updates from backend)
+    - Fixed lock when stopping recording playback
+    - Improved general response time
+- Live TV improvements
+    - Better handling of connection problems
+    - Playback does not stop anymore between program breaks
+    - Fixed seek problems
+- Timer improvements
+    - Add optional internal recording rule template
+    - Correctly apply backend recording rule settings
+    - Properly add title and subtitle
+    - Fixed Timer deletion
+- Added advanced option for specifying database host/port
+- Fixed crash when loading invisibile recordings
+- Improved Art-work loading
+- Combine channels with same channum and callsign
+- Fixed IPv6 support
+- Fixed Windows XP support
+- Improved logging, notifications and system labels
+- Refactored & cleaned up libcmyth (inttypes, names, docs)
+
 v1.6.7
 - Updated language files from Transifex
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/resources/language/English/strings.po xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/resources/language/English/strings.po
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/resources/language/English/strings.po	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/resources/language/English/strings.po	2013-03-12 10:51:22.000000000 +0000
@@ -49,3 +49,121 @@
 msgctxt "#30007"
 msgid "Allow Live TV to move scheduled shows"
 msgstr ""
+
+msgctxt "#30008"
+msgid "Conflict handling"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Prefer Live TV when recording has later slot"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Prefer recording and stop Live TV"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Prefer Live TV and cancel conflicting recording"
+msgstr ""
+
+msgctxt "#30019"
+msgid "General"
+msgstr ""
+
+msgctxt "#30020"
+msgid "Template provider"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Internal"
+msgstr ""
+
+msgctxt "#30022"
+msgid "MythTV"
+msgstr ""
+
+msgctxt "#30025"
+msgid "Internal template"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Automatically Look Up Metadata"
+msgstr ""
+
+msgctxt "#30027"
+msgid "Commercial Flag new recordings"
+msgstr ""
+
+msgctxt "#30028"
+msgid "Transcode new recordings"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Run User Job #1"
+msgstr ""
+
+msgctxt "#30030"
+msgid "Run User Job #2"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Run User Job #3"
+msgstr ""
+
+msgctxt "#30032"
+msgid "Run User Job #4"
+msgstr ""
+
+msgctxt "#30033"
+msgid "Transcoder"
+msgstr ""
+
+msgctxt "#30034"
+msgid "Allow recordings to expire?"
+msgstr ""
+
+msgctxt "#30049"
+msgid "Recording template"
+msgstr ""
+
+# Systeminformation labels
+msgctxt "#30100"
+msgid "Protocol version: %i - Database version: %i"
+msgstr ""
+
+# Notifications
+msgctxt "#30300"
+msgid "Failed to connect to MythTV backend"
+msgstr ""
+
+msgctxt "#30301"
+msgid "Failed to connect to MythTV database"
+msgstr ""
+
+msgctxt "#30302"
+msgid "Connection to MythTV backend lost"
+msgstr ""
+
+msgctxt "#30303"
+msgid "Connection to MythTV restored"
+msgstr ""
+
+msgctxt "#30304"
+msgid "No response from MythTV backend"
+msgstr ""
+
+msgctxt "#30305"
+msgid "Channel unavailable"
+msgstr ""
+
+msgctxt "#30306"
+msgid "Recorder unavailable"
+msgstr ""
+
+msgctxt "#30307"
+msgid "Canceling conflicting recording: %s"
+msgstr ""
+
+msgctxt "#30308"
+msgid "Stopping Live TV due to conflicting recording: %s"
+msgstr ""
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/resources/settings.xml xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/resources/settings.xml
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/addon/resources/settings.xml	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/addon/resources/settings.xml	2013-03-12 10:51:22.000000000 +0000
@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-  <setting id="host" type="text" label="30000" default="127.0.0.1" />
-  <setting id="port" type="number" label="30001" default="6543" />
-  <setting id="db_user" type="text" label="30002" default="mythtv" />
-  <setting id="db_password" type="text" label="30003" default="mythtv" />
-  <setting id="db_name" type="text" label="30004" default="mythconverg" />
-  <setting id="extradebug" type="bool" label="30005" default="false" />
-  <setting id="livetv" type="bool" label="30006" default="true" />
-  <setting id="livetv_priority" type="bool" label="30007" default="false" />
+  <category label="30019">
+    <setting id="host" type="text" label="30000" default="127.0.0.1" />
+    <setting id="port" type="number" label="30001" default="6543" />
+    <setting id="db_user" type="text" label="30002" default="mythtv" />
+    <setting id="db_password" type="text" label="30003" default="mythtv" />
+    <setting id="db_name" type="text" label="30004" default="mythconverg" />
+    <setting id="db_host" type="text" visible="false" />
+    <setting id="db_port" type="number" visible="false" default="3306" />
+    <setting id="extradebug" type="bool" label="30005" default="false" />
+    <setting id="livetv" type="bool" label="30006" default="true" />
+    <setting id="livetv_priority" type="bool" label="30007" default="true" />
+    <setting id="livetv_conflict_strategy" type="enum" label="30008" lvalues="30009|30010|30011" default="30009" />
+  </category>
+  <category label="30049">
+    <setting id="rec_template_provider" type="enum" label="30020" lvalues="30021|30022" default="1" />
+    <setting id="rec_separator1" label="30025" type="lsep" />
+    <setting id="rec_autometadata" type="bool" label="30026" enable="eq(-2,0)" default="true" />
+    <setting id="rec_autocommflag" type="bool" label="30027" enable="eq(-3,0)" default="true" />
+    <setting id="rec_autoexpire" type="bool" label="30034" enable="eq(-4,0)" default="true" />
+    <setting id="rec_autotranscode" type="bool" label="30028" enable="eq(-5,0)" default="false" />
+    <setting id="rec_transcoder" type="number" label="30033" enable="eq(-6,0)" default="0" />
+    <setting id="rec_autorunjob1" type="bool" label="30029" enable="eq(-7,0)" default="false" />
+    <setting id="rec_autorunjob2" type="bool" label="30030" enable="eq(-8,0)" default="false" />
+    <setting id="rec_autorunjob3" type="bool" label="30031" enable="eq(-9,0)" default="false" />
+    <setting id="rec_autorunjob4" type="bool" label="30032" enable="eq(-10,0)" default="false" />
+  </category>
 </settings>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj	2012-12-01 08:34:33.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj	2013-03-12 10:51:22.000000000 +0000
@@ -20,9 +20,9 @@
     <ClCompile Include="..\..\src\cppmyth\MythFile.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythProgramInfo.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythRecorder.cpp" />
+    <ClCompile Include="..\..\src\cppmyth\MythRecordingRule.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythStorageGroupFile.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythSignal.cpp" />
-    <ClCompile Include="..\..\src\cppmyth\MythTimer.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythTimestamp.cpp" />
     <ClCompile Include="..\..\src\fileOps.cpp" />
     <ClCompile Include="..\..\src\pvrclient-mythtv.cpp" />
@@ -39,9 +39,9 @@
     <ClInclude Include="..\..\src\cppmyth\MythPointer.h" />
     <ClInclude Include="..\..\src\cppmyth\MythProgramInfo.h" />
     <ClInclude Include="..\..\src\cppmyth\MythRecorder.h" />
+    <ClInclude Include="..\..\src\cppmyth\MythRecordingRule.h" />
     <ClInclude Include="..\..\src\cppmyth\MythStorageGroupFile.h" />
     <ClInclude Include="..\..\src\cppmyth\MythSignal.h" />
-    <ClInclude Include="..\..\src\cppmyth\MythTimer.h" />
     <ClInclude Include="..\..\src\cppmyth\MythTimestamp.h" />
     <ClInclude Include="..\..\src\fileOps.h" />
     <ClInclude Include="..\..\src\pvrclient-mythtv.h" />
@@ -56,8 +56,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\addon\addon.xml" />
+    <None Include="..\..\addon\addon.xml.in" />
     <None Include="..\..\addon\changelog.txt" />
+    <None Include="..\..\addon\resources\language\English\strings.po" />
+    <None Include="..\..\addon\resources\settings.xml" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A55ACC6B-837D-4784-8E41-66947B1D9B8C}</ProjectGuid>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj.filters xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj.filters
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj.filters	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj.filters	2013-03-12 10:51:22.000000000 +0000
@@ -28,9 +28,6 @@
     <ClCompile Include="..\..\src\cppmyth\MythSignal.cpp">
       <Filter>cppmyth</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cppmyth\MythTimer.cpp">
-      <Filter>cppmyth</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cppmyth\MythTimestamp.cpp">
       <Filter>cppmyth</Filter>
     </ClCompile>
@@ -38,6 +35,9 @@
       <Filter>cppmyth</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\categories.cpp" />
+    <ClCompile Include="..\..\src\cppmyth\MythRecordingRule.cpp">
+      <Filter>cppmyth</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\client.h" />
@@ -75,13 +75,13 @@
     <ClInclude Include="..\..\src\cppmyth\MythSignal.h">
       <Filter>cppmyth</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cppmyth\MythTimer.h">
-      <Filter>cppmyth</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cppmyth\MythStorageGroupFile.h">
       <Filter>cppmyth</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\categories.h" />
+    <ClInclude Include="..\..\src\cppmyth\MythRecordingRule.h">
+      <Filter>cppmyth</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cppmyth">
@@ -90,13 +90,28 @@
     <Filter Include="addon">
       <UniqueIdentifier>{a9c2652d-c1dd-4836-a42d-bc5e6db7b5a0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addon\resources">
+      <UniqueIdentifier>{e4b481fe-5c99-4cea-a4f4-5301e96a480a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addon\resources\language">
+      <UniqueIdentifier>{f0aada70-0bcb-4b23-b953-1ca297413a9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addon\resources\language\English">
+      <UniqueIdentifier>{3ba85d2f-45bc-4080-8895-55949f7f52a7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\addon\addon.xml">
+    <None Include="..\..\addon\changelog.txt">
       <Filter>addon</Filter>
     </None>
-    <None Include="..\..\addon\changelog.txt">
+    <None Include="..\..\addon\addon.xml.in">
       <Filter>addon</Filter>
     </None>
+    <None Include="..\..\addon\resources\settings.xml">
+      <Filter>addon\resources</Filter>
+    </None>
+    <None Include="..\..\addon\resources\language\English\strings.po">
+      <Filter>addon\resources\language\English</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/client.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/client.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/client.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/client.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -27,28 +27,33 @@
 using namespace std;
 using namespace ADDON;
 
-#define SEEK_POSSIBLE 0x10 // Flag used to check if protocol allows seeks
-
 /* User adjustable settings are saved here.
  * Default values are defined inside client.h
  * and exported to the other source files.
  */
-CStdString   g_szHostname             = DEFAULT_HOST;             ///< The Host name or IP of the mythtv server
-int          g_iMythPort              = DEFAULT_PORT;             ///< The mythtv Port (default is 6543)
-CStdString   g_szMythDBuser           = DEFAULT_DB_USER;          ///< The mythtv sql username (default is mythtv)
-CStdString   g_szMythDBpassword       = DEFAULT_DB_PASSWORD;      ///< The mythtv sql password (default is mythtv)
-CStdString   g_szMythDBname           = DEFAULT_DB_NAME;          ///< The mythtv sql database name (default is mythconverg)
-bool         g_bExtraDebug            = DEFAULT_EXTRA_DEBUG;      ///< Output extensive debug information to the log
-bool         g_bLiveTV                = DEFAULT_LIVETV;           ///< LiveTV support (or recordings only)
-bool         g_bLiveTVPriority        = DEFAULT_LIVETV_PRIORITY;  ///< MythTV Backend setting to allow live TV to move scheduled shows
+CStdString   g_szMythHostname          = DEFAULT_HOST;                     ///< The Host name or IP of the mythtv server
+int          g_iMythPort               = DEFAULT_PORT;                     ///< The mythtv Port (default is 6543)
+CStdString   g_szDBUser                = DEFAULT_DB_USER;                  ///< The mythtv sql username (default is mythtv)
+CStdString   g_szDBPassword            = DEFAULT_DB_PASSWORD;              ///< The mythtv sql password (default is mythtv)
+CStdString   g_szDBName                = DEFAULT_DB_NAME;                  ///< The mythtv sql database name (default is mythconverg)
+CStdString   g_szDBHostname            = DEFAULT_HOST;                     ///< The mythtv sql database host name or IP of the database server (default is same as mythtv backend hostname)
+int          g_iDBPort                 = DEFAULT_DB_PORT;                  ///< The mythtv sql database port (default is 3306)
+bool         g_bExtraDebug             = DEFAULT_EXTRA_DEBUG;              ///< Output extensive debug information to the log
+bool         g_bLiveTV                 = DEFAULT_LIVETV;                   ///< LiveTV support (or recordings only)
+bool         g_bLiveTVPriority         = DEFAULT_LIVETV_PRIORITY;          ///< MythTV Backend setting to allow live TV to move scheduled shows
+int          g_iLiveTVConflictStrategy = DEFAULT_LIVETV_CONFLICT_STRATEGY; ///< Conflict resolving strategy (0=
+int          g_iRecTemplateType        = DEFAULT_RECORD_TEMPLATE;          ///< Template type for new record (0=Internal, 1=MythTV)
+bool         g_bRecAutoMetadata        = true;
+bool         g_bRecAutoCommFlag        = false;
+bool         g_bRecAutoTranscode       = false;
+bool         g_bRecAutoRunJob1         = false;
+bool         g_bRecAutoRunJob2         = false;
+bool         g_bRecAutoRunJob3         = false;
+bool         g_bRecAutoRunJob4         = false;
+bool         g_bRecAutoExpire          = false;
+int          g_iRecTranscoder          = 0;
 
 ///* Client member variables */
-bool         m_recordingFirstRead;
-char         m_noSignalStreamData[6 + 0xffff];
-long         m_noSignalStreamSize     = 0;
-long         m_noSignalStreamReadPos  = 0;
-bool         m_bPlayingNoSignal       = false;
-int          m_iCurrentChannel        = 1;
 ADDON_STATUS m_CurStatus              = ADDON_STATUS_UNKNOWN;
 bool         g_bCreated               = false;
 int          g_iClientID              = -1;
@@ -80,8 +85,10 @@
 
   XBMC->Log(LOG_DEBUG, "Creating MythTV cmyth PVR-Client");
 
+  XBMC->Log(LOG_DEBUG, "Addon compiled with XBMC_PVR_API_VERSION: %s and XBMC_PVR_MIN_API_VERSION: %s", GetPVRAPIVersion(), GetMininumPVRAPIVersion());
+
   XBMC->Log(LOG_DEBUG, "Register handle @ libXBMC_addon...done");
-  
+
   XBMC->Log(LOG_DEBUG, "Checking props...");
   if (!props)
   {
@@ -121,12 +128,12 @@
 
   /* Read setting "host" from settings.xml */
   if (XBMC->GetSetting("host", buffer))
-    g_szHostname = buffer;
+    g_szMythHostname = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'host' setting, falling back to '%s' as default", DEFAULT_HOST);
-    g_szHostname = DEFAULT_HOST;
+    g_szMythHostname = DEFAULT_HOST;
   }
   buffer[0] = 0;
 
@@ -134,7 +141,7 @@
   if (!XBMC->GetSetting("port", &g_iMythPort))
   {
     /* If setting is unknown fallback to defaults */
-    XBMC->Log(LOG_ERROR, "Couldn't get 'port' setting, falling back to '%i' as default", DEFAULT_PORT);
+    XBMC->Log(LOG_ERROR, "Couldn't get 'port' setting, falling back to '%d' as default", DEFAULT_PORT);
     g_iMythPort = DEFAULT_PORT;
   }
 
@@ -148,37 +155,58 @@
 
   /* Read setting "db_username" from settings.xml */
   if (XBMC->GetSetting("db_user", buffer))
-    g_szMythDBuser = buffer;
+    g_szDBUser = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_user' setting, falling back to '%s' as default", DEFAULT_DB_USER);
-    g_szMythDBuser = DEFAULT_DB_USER;
+    g_szDBUser = DEFAULT_DB_USER;
   }
   buffer[0] = 0;
 
   /* Read setting "db_password" from settings.xml */
   if (XBMC->GetSetting("db_password", buffer))
-    g_szMythDBpassword = buffer;
+    g_szDBPassword = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_password' setting, falling back to '%s' as default", DEFAULT_DB_PASSWORD);
-    g_szMythDBpassword = DEFAULT_DB_PASSWORD;
+    g_szDBPassword = DEFAULT_DB_PASSWORD;
   }
   buffer[0] = 0;
-  
+
   /* Read setting "db_name" from settings.xml */
   if (XBMC->GetSetting("db_name", buffer))
-    g_szMythDBname = buffer;
+    g_szDBName = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_name' setting, falling back to '%s' as default", DEFAULT_DB_NAME);
-    g_szMythDBname = DEFAULT_DB_NAME;
+    g_szDBName = DEFAULT_DB_NAME;
+  }
+  buffer[0] = 0;
+
+  /* Read hidden setting "db_host" from settings.xml */
+  if (XBMC->GetSetting("db_host", buffer))
+    if (strlen(buffer) > 0)
+      g_szDBHostname = buffer;
+    else
+      g_szDBHostname = g_szMythHostname;
+  else
+  {
+    /* If setting is unknown fallback to defaults */
+    XBMC->Log(LOG_ERROR, "Couldn't get 'db_host' setting, falling back to '%s' as default", g_szMythHostname.c_str());
+    g_szDBHostname = g_szMythHostname;
   }
   buffer[0] = 0;
 
+  /* Read hidden setting "db_port" from settings.xml */
+  if (!XBMC->GetSetting("db_port", &g_iDBPort) || g_iDBPort == 0)
+  {
+    /* If setting is unknown fallback to defaults */
+    g_iDBPort = DEFAULT_DB_PORT;
+  }
+
   /* Read setting "LiveTV" from settings.xml */
   if (!XBMC->GetSetting("livetv", &g_bLiveTV))
   {
@@ -187,6 +215,44 @@
     g_bLiveTV = DEFAULT_LIVETV;
   }
 
+  /* Read settings "Record livetv_conflict_method" from settings.xml */
+  if (!XBMC->GetSetting("livetv_conflict_strategy", &g_iLiveTVConflictStrategy))
+  {
+    /* If setting is unknown fallback to defaults */
+    XBMC->Log(LOG_ERROR, "Couldn't get 'livetv_conflict_method' setting, falling back to '%i' as default", DEFAULT_RECORD_TEMPLATE);
+    g_iLiveTVConflictStrategy = DEFAULT_LIVETV_CONFLICT_STRATEGY;
+  }
+
+  /* Read settings "Record template" from settings.xml */
+  if (!XBMC->GetSetting("rec_template_provider", &g_iRecTemplateType))
+  {
+    /* If setting is unknown fallback to defaults */
+    XBMC->Log(LOG_ERROR, "Couldn't get 'rec_template_provider' setting, falling back to '%i' as default", DEFAULT_RECORD_TEMPLATE);
+    g_iRecTemplateType = DEFAULT_RECORD_TEMPLATE;
+  }
+  /* Get internal template settings when selected (0) */
+  if (g_iRecTemplateType == 0)
+  {
+    if (!XBMC->GetSetting("rec_autometadata", &g_bRecAutoMetadata))
+      g_bRecAutoMetadata = true;
+    if (!XBMC->GetSetting("rec_autocommflag", &g_bRecAutoCommFlag))
+      g_bRecAutoCommFlag = false;
+    if (!XBMC->GetSetting("rec_autotranscode", &g_bRecAutoTranscode))
+      g_bRecAutoTranscode = false;
+    if (!XBMC->GetSetting("rec_autorunjob1", &g_bRecAutoRunJob1))
+      g_bRecAutoRunJob1 = false;
+    if (!XBMC->GetSetting("rec_autorunjob2", &g_bRecAutoRunJob2))
+      g_bRecAutoRunJob2 = false;
+    if (!XBMC->GetSetting("rec_autorunjob3", &g_bRecAutoRunJob3))
+      g_bRecAutoRunJob3 = false;
+    if (!XBMC->GetSetting("rec_autorunjob4", &g_bRecAutoRunJob4))
+      g_bRecAutoRunJob4 = false;
+    if (!XBMC->GetSetting("rec_autoexpire", &g_bRecAutoExpire))
+      g_bRecAutoExpire = false;
+    if (!XBMC->GetSetting("rec_transcoder", &g_iRecTranscoder))
+      g_iRecTranscoder = 0;
+  }
+
   free (buffer);
 
   // Create our addon
@@ -271,14 +337,14 @@
   string str = settingName;
   if (!g_bCreated)
     return ADDON_STATUS_OK;
-  
+
   if (str == "host")
   {
     string tmp_sHostname;
-    XBMC->Log(LOG_INFO, "Changed Setting 'host' from %s to %s", g_szHostname.c_str(), (const char*)settingValue);
-    tmp_sHostname = g_szHostname;
-    g_szHostname = (const char*)settingValue;
-    if (tmp_sHostname != g_szHostname)
+    XBMC->Log(LOG_INFO, "Changed Setting 'host' from %s to %s", g_szMythHostname.c_str(), (const char*)settingValue);
+    tmp_sHostname = g_szMythHostname;
+    g_szMythHostname = (const char*)settingValue;
+    if (tmp_sHostname != g_szMythHostname)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "port")
@@ -292,29 +358,29 @@
   }
   else if (str == "db_user")
   {
-    string tmp_sMythDBuser;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_user' from %s to %s", g_szMythDBuser.c_str(), (const char*)settingValue);
-    tmp_sMythDBuser = g_szMythDBuser;
-    g_szMythDBuser = (const char*)settingValue;
-    if (tmp_sMythDBuser != g_szMythDBuser)
+    string tmp_sDBUser;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_user' from %s to %s", g_szDBUser.c_str(), (const char*)settingValue);
+    tmp_sDBUser = g_szDBUser;
+    g_szDBUser = (const char*)settingValue;
+    if (tmp_sDBUser != g_szDBUser)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "db_password")
   {
-    string tmp_sMythDBpassword;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_password' from %s to %s", g_szMythDBpassword.c_str(), (const char*)settingValue);
-    tmp_sMythDBpassword = g_szMythDBpassword;
-    g_szMythDBpassword = (const char*)settingValue;
-    if (tmp_sMythDBpassword != g_szMythDBpassword)
+    string tmp_sDBPassword;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_password' from %s to %s", g_szDBPassword.c_str(), (const char*)settingValue);
+    tmp_sDBPassword = g_szDBPassword;
+    g_szDBPassword = (const char*)settingValue;
+    if (tmp_sDBPassword != g_szDBPassword)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "db_name")
   {
-    string tmp_sMythDBname;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_name' from %s to %s", g_szMythDBname.c_str(), (const char*)settingValue);
-    tmp_sMythDBname = g_szMythDBname;
-    g_szMythDBname = (const char*)settingValue;
-    if (tmp_sMythDBname != g_szMythDBname)
+    string tmp_sDBName;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_name' from %s to %s", g_szDBName.c_str(), (const char*)settingValue);
+    tmp_sDBName = g_szDBName;
+    g_szDBName = (const char*)settingValue;
+    if (tmp_sDBName != g_szDBName)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "extradebug")
@@ -659,7 +725,7 @@
   int dataread = g_client->ReadLiveStream(pBuffer, iBufferSize);
   if (dataread < 0)
   {
-    XBMC->Log(LOG_ERROR,"%s: Failed to read liveStream. Errorcode: %i!", __FUNCTION__, dataread);
+    XBMC->Log(LOG_ERROR,"%s: Failed to read liveStream. Errorcode: %d!", __FUNCTION__, dataread);
   }
   return dataread;
 }
@@ -677,12 +743,7 @@
   if (g_client == NULL)
     return false;
 
-  if (g_client->SwitchChannel(channelinfo))
-    return true;
-  else
-    XBMC->QueueNotification(QUEUE_WARNING, "Failed to change channel. No free tuners?");
-
-  return false;
+  return g_client->SwitchChannel(channelinfo);
 }
 
 PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
@@ -708,7 +769,7 @@
   return true;
 }
 
-long long SeekLiveStream(long long iPosition, int iWhence) 
+long long SeekLiveStream(long long iPosition, int iWhence)
 {
   if (g_client == NULL)
     return -1;
@@ -716,7 +777,7 @@
   return g_client->SeekLiveStream(iPosition,iWhence);
 }
 
-long long PositionLiveStream(void) 
+long long PositionLiveStream(void)
 {
   if (g_client == NULL)
     return -1;
@@ -724,7 +785,7 @@
   return g_client->SeekLiveStream(0,SEEK_CUR);
 }
 
-long long LengthLiveStream(void) 
+long long LengthLiveStream(void)
 {
   if (g_client == NULL)
     return -1;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/client.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/client.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/client.h	2013-03-12 10:51:22.000000000 +0000
@@ -36,14 +36,23 @@
 #define strdup _strdup // # strdup is POSIX, _strdup should be used instead
 #endif
 
-#define DEFAULT_HOST            "127.0.0.1"
-#define DEFAULT_EXTRA_DEBUG     false
-#define DEFAULT_LIVETV_PRIORITY false
-#define DEFAULT_LIVETV          true
-#define DEFAULT_PORT            6543
-#define DEFAULT_DB_USER         "mythtv"
-#define DEFAULT_DB_PASSWORD     "mythtv"
-#define DEFAULT_DB_NAME         "mythconverg"
+#define LIVETV_CONFLICT_STRATEGY_HASLATER  0
+#define LIVETV_CONFLICT_STRATEGY_STOPTV    1
+#define LIVETV_CONFLICT_STRATEGY_CANCELREC 2
+
+#define DEFAULT_HOST                       "127.0.0.1"
+#define DEFAULT_EXTRA_DEBUG                false
+#define DEFAULT_LIVETV_PRIORITY            true
+#define DEFAULT_LIVETV_CONFLICT_STRATEGY   LIVETV_CONFLICT_STRATEGY_HASLATER
+#define DEFAULT_LIVETV                     true
+#define DEFAULT_PORT                       6543
+#define DEFAULT_DB_USER                    "mythtv"
+#define DEFAULT_DB_PASSWORD                "mythtv"
+#define DEFAULT_DB_NAME                    "mythconverg"
+#define DEFAULT_DB_PORT                    3306
+#define DEFAULT_RECORD_TEMPLATE            1
+
+#define SUBTITLE_SEPARATOR " - "
 
 /*!
  * @brief PVR macros for string exchange
@@ -55,20 +64,34 @@
 #define SAFE_DELETE(p)       do { delete (p);     (p)=NULL; } while (0)
 #define SAFE_DELETE_ARRAY(p) do { delete[] (p);   (p)=NULL; } while (0)
 
-extern bool         g_bCreated;           ///< Shows that the Create function was successfully called
-extern int          g_iClientID;          ///< The PVR client ID used by XBMC for this driver
-extern CStdString   g_szUserPath;         ///< The Path to the user directory inside user profile
-extern CStdString   g_szClientPath;       ///< The Path where this driver is located
+extern bool         g_bCreated;                ///< Shows that the Create function was successfully called
+extern int          g_iClientID;               ///< The PVR client ID used by XBMC for this driver
+extern CStdString   g_szUserPath;              ///< The Path to the user directory inside user profile
+extern CStdString   g_szClientPath;            ///< The Path where this driver is located
 
 /* Client Settings */
-extern CStdString   g_szHostname;         ///< The Host name or IP of the mythtv server
-extern int          g_iMythPort;          ///< The mythtv Port (default is 6543)
-extern CStdString   g_szMythDBuser;       ///< The mythtv sql username (default is mythtv)
-extern CStdString   g_szMythDBpassword;   ///< The mythtv sql password (default is mythtv)
-extern CStdString   g_szMythDBname;       ///< The mythtv sql database name (default is mythconverg)
-extern bool         g_bExtraDebug;        ///< Debug logging
-extern bool         g_bLiveTV;            ///< LiveTV support (or recordings only)
-extern bool         g_bLiveTVPriority;    ///< MythTV Backend setting to allow live TV to move scheduled shows
+extern CStdString   g_szMythHostname;          ///< The Host name or IP of the mythtv server
+extern int          g_iMythPort;               ///< The mythtv Port (default is 6543)
+extern CStdString   g_szDBUser;                ///< The mythtv sql username (default is mythtv)
+extern CStdString   g_szDBPassword;            ///< The mythtv sql password (default is mythtv)
+extern CStdString   g_szDBName;                ///< The mythtv sql database name (default is mythconverg)
+extern CStdString   g_szDBHostname;            ///< The mythtv sql database host name or IP of the database server
+extern int          g_iDBPort;                 ///< The mythtv sql database port (default is 3306)
+extern bool         g_bExtraDebug;             ///< Debug logging
+extern bool         g_bLiveTV;                 ///< LiveTV support (or recordings only)
+extern bool         g_bLiveTVPriority;         ///< MythTV Backend setting to allow live TV to move scheduled shows
+extern int          g_iLiveTVConflictStrategy; ///< Live TV conflict resolving strategy (0=Has later, 1=Stop TV, 2=Cancel recording)
+extern int          g_iRecTemplateType;        ///< Template type for new record (0=Internal, 1=MythTV)
+///* Internal Record template */
+extern bool         g_bRecAutoMetadata;
+extern bool         g_bRecAutoCommFlag;
+extern bool         g_bRecAutoTranscode;
+extern bool         g_bRecAutoRunJob1;
+extern bool         g_bRecAutoRunJob2;
+extern bool         g_bRecAutoRunJob3;
+extern bool         g_bRecAutoRunJob4;
+extern bool         g_bRecAutoExpire;
+extern int          g_iRecTranscoder;
 
 extern ADDON::CHelper_libXBMC_addon *XBMC;
 extern CHelper_libXBMC_pvr   *PVR;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -41,7 +41,7 @@
   return *m_channel_t == NULL;
 }
 
-int MythChannel::ID()
+unsigned int MythChannel::ID()
 {
   return cmyth_channel_chanid(*m_channel_t);
 }
@@ -54,7 +54,7 @@
   return retval;
 }
 
-int MythChannel::NumberInt()
+unsigned int MythChannel::NumberInt()
 {
   return cmyth_channel_channum(*m_channel_t);
 }
@@ -91,12 +91,12 @@
   return m_radio;
 }
 
-int MythChannel::SourceID()
+unsigned int MythChannel::SourceID()
 {
   return cmyth_channel_sourceid(*m_channel_t);
 }
 
-int MythChannel::MultiplexID()
+unsigned int MythChannel::MultiplexID()
 {
   return cmyth_channel_multiplex(*m_channel_t);
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.h	2013-03-12 10:51:22.000000000 +0000
@@ -37,16 +37,16 @@
 
   bool IsNull() const;
 
-  int ID();
+  unsigned int ID();
   CStdString Name();
-  int NumberInt();
+  unsigned int NumberInt();
   CStdString Number();
   CStdString Callsign();
   CStdString Icon();
   bool Visible();
   bool IsRadio() const;
-  int SourceID();
-  int MultiplexID();
+  unsigned int SourceID();
+  unsigned int MultiplexID();
 
 private:
   boost::shared_ptr<MythPointer<cmyth_channel_t> > m_channel_t;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -24,7 +24,7 @@
 #include "MythStorageGroupFile.h"
 #include "MythProgramInfo.h"
 #include "MythEventHandler.h"
-#include "MythTimer.h"
+#include "MythRecordingRule.h"
 #include "MythPointer.h"
 #include "../client.h"
 
@@ -102,16 +102,16 @@
 void MythConnection::Lock()
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Lock %i", m_conn_t.get());
+    XBMC->Log(LOG_DEBUG, "Lock %u", m_conn_t.get());
   m_conn_t->Lock();
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Lock acquired %i", m_conn_t.get());
+    XBMC->Log(LOG_DEBUG, "Lock acquired %u", m_conn_t.get());
 }
 
 void MythConnection::Unlock()
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Unlock %i", m_conn_t.get());
+    XBMC->Log(LOG_DEBUG, "Unlock %u", m_conn_t.get());
   m_conn_t->Unlock();
 }
 
@@ -121,13 +121,13 @@
   bool connected = *m_conn_t != 0 && !cmyth_conn_hung(*m_conn_t);
   Unlock();
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - %i", __FUNCTION__, connected);
+    XBMC->Log(LOG_DEBUG, "%s - %s", __FUNCTION__, (connected ? "true" : "false"));
   return connected;
 }
 
 bool MythConnection::TryReconnect()
 {
-  int retval = false;
+  int retval;
   Lock();
   retval = cmyth_conn_reconnect_ctrl(*m_conn_t);
   Unlock();
@@ -169,11 +169,11 @@
 bool MythConnection::GetDriveSpace(long long &total, long long &used)
 {
   int retval = 0;
-  CMYTH_CONN_CALL(retval, retval != 0, cmyth_conn_get_freespace(*m_conn_t, &total, &used));
-  return retval == 0;
+  CMYTH_CONN_CALL(retval, retval < 0, cmyth_conn_get_freespace(*m_conn_t, (int64_t*)&total, (int64_t*)&used));
+  return retval >= 0;
 }
 
-CStdString MythConnection::GetSetting(const CStdString &hostname, const CStdString &setting)
+CStdString MythConnection::GetSettingOnHost(const CStdString &setting, const CStdString &hostname)
 {
   char *value = NULL;
   CMYTH_CONN_CALL_REF(value, value == NULL, cmyth_conn_get_setting(*m_conn_t, const_cast<char*>(hostname.c_str()), const_cast<char*>(setting.c_str())));
@@ -208,8 +208,8 @@
 bool  MythConnection::DeleteRecording(MythProgramInfo &recording)
 {
   int retval = 0;
-  CMYTH_CONN_CALL(retval, retval != 0, cmyth_proginfo_delete_recording(*m_conn_t, *recording.m_proginfo_t));
-  return retval == 0;
+  CMYTH_CONN_CALL(retval, retval < 0, cmyth_proginfo_delete_recording(*m_conn_t, *recording.m_proginfo_t));
+  return retval >= 0;
 }
 
 ProgramInfoMap MythConnection::GetRecordedPrograms()
@@ -222,10 +222,9 @@
   int len = cmyth_proglist_get_count(proglist);
   for (int i = 0; i < len; i++)
   {
-    cmyth_proginfo_t cmprog = cmyth_proglist_get_item(proglist, i);
-    MythProgramInfo prog = cmyth_proginfo_get_detail(*m_conn_t, cmprog);
+    MythProgramInfo prog = cmyth_proglist_get_item(proglist, i);
     if (!prog.IsNull()) {
-      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.StrUID().c_str(), prog));
+      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.UID().c_str(), prog));
     }
   }
   ref_release(proglist);
@@ -235,6 +234,36 @@
   return retval;
 }
 
+MythProgramInfo MythConnection::GetRecordedProgram(const CStdString &basename)
+{
+  MythProgramInfo retval;
+  cmyth_proginfo_t prog = NULL;
+  if (!basename.IsEmpty())
+  {
+    CMYTH_CONN_CALL_REF(prog, prog == NULL, cmyth_proginfo_get_from_basename(*m_conn_t, const_cast<char*>(basename.c_str())));
+    if (prog) {
+      retval = MythProgramInfo(prog);
+    }
+  }
+
+  return retval;
+}
+
+MythProgramInfo MythConnection::GetRecordedProgram(int chanid, time_t recstartts)
+{
+  MythProgramInfo retval;
+  cmyth_proginfo_t prog = NULL;
+  if (chanid > 0 && recstartts > 0)
+  {
+    CMYTH_CONN_CALL_REF(prog, prog == NULL, cmyth_proginfo_get_from_timeslot(*m_conn_t, chanid, recstartts));
+    if (prog) {
+      retval = MythProgramInfo(prog);
+    }
+  }
+
+  return retval;
+}
+
 ProgramInfoMap MythConnection::GetPendingPrograms()
 {
   Lock();
@@ -247,7 +276,7 @@
   {
     MythProgramInfo prog = cmyth_proglist_get_item(proglist, i);
     if (!prog.IsNull()) {
-      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.StrUID().c_str(), prog));
+      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.UID().c_str(), prog));
     }
   }
   ref_release(proglist);
@@ -267,10 +296,9 @@
   int len = cmyth_proglist_get_count(proglist);
   for (int i = 0; i < len; i++)
   {
-    cmyth_proginfo_t cmprog = cmyth_proglist_get_item(proglist, i);
-    MythProgramInfo prog = cmyth_proginfo_get_detail(*m_conn_t, cmprog);
+    MythProgramInfo prog = cmyth_proglist_get_item(proglist, i);
     if (!prog.IsNull()) {
-      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.StrUID().c_str(), prog));
+      retval.insert(std::pair<CStdString, MythProgramInfo>(prog.UID().c_str(), prog));
     }
   }
   ref_release(proglist);
@@ -287,40 +315,18 @@
   return retval >= 0;
 }
 
-void MythConnection::DefaultTimer(MythTimer &timer)
+bool MythConnection::StopRecording(const MythProgramInfo &recording)
 {
-  timer.SetAutoTranscode(atoi(GetSetting("NULL", "AutoTranscode").c_str()) > 0);
-  timer.SetUserJob(1, atoi(GetSetting("NULL", "AutoRunUserJob1").c_str()) > 0);
-  timer.SetUserJob(2, atoi(GetSetting("NULL", "AutoRunUserJob2").c_str()) > 0);
-  timer.SetUserJob(3, atoi(GetSetting("NULL", "AutoRunUserJob3").c_str()) > 0);
-  timer.SetUserJob(4, atoi(GetSetting("NULL", "AutoRunUserJob4").c_str()) > 0);
-  timer.SetAutoCommFlag(atoi(GetSetting("NULL", "AutoCommercialFlag").c_str()) > 0);
-  timer.SetAutoExpire(atoi(GetSetting("NULL", "AutoExpireDefault").c_str()) > 0);
-  timer.SetTranscoder(atoi(GetSetting("NULL", "DefaultTranscoder").c_str()));
-  timer.SetStartOffset(atoi(GetSetting("NULL", "DefaultStartOffset").c_str()));
-  timer.SetStartOffset(atoi(GetSetting("NULL", "DefaultEndOffset").c_str()));
+  int retval;
+  CMYTH_CONN_CALL(retval, retval < 0, cmyth_proginfo_stop_recording(*m_conn_t, *recording.m_proginfo_t));
+  return (retval >= 0);
 }
 
-StorageGroupFileList MythConnection::GetStorageGroupFileList(const CStdString &storageGroup)
+MythStorageGroupFile MythConnection::GetStorageGroupFile(const CStdString &storageGroup, const CStdString &filename)
 {
-  cmyth_storagegroup_filelist_t filelist = NULL;
-  CMYTH_CONN_CALL_REF(filelist, filelist == NULL, cmyth_storagegroup_get_filelist(*m_conn_t, const_cast<char*>(storageGroup.c_str()), const_cast<char*>(GetBackendHostname().c_str())));
-
-  Lock();
-
-  int len = cmyth_storagegroup_filelist_count(filelist);
-  StorageGroupFileList retval;
-  retval.reserve(len);
-  for (int i = 0; i < len; i++)
-  {
-    cmyth_storagegroup_file_t file = cmyth_storagegroup_filelist_get_item(filelist, i);
-    retval.push_back(MythStorageGroupFile(file));
-  }
-  ref_release(filelist);
-
-  Unlock();
-
-  return retval;
+  cmyth_storagegroup_file_t file = NULL;
+  CMYTH_CONN_CALL_REF(file, file == NULL, cmyth_storagegroup_get_fileinfo(*m_conn_t, const_cast<char*>(storageGroup.c_str()), const_cast<char*>(GetBackendHostname().c_str()), const_cast<char*>(filename.c_str())));
+  return MythStorageGroupFile(file);
 }
 
 MythFile MythConnection::ConnectFile(MythProgramInfo &recording)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h	2013-03-12 10:51:22.000000000 +0000
@@ -33,16 +33,15 @@
 class MythFile;
 class MythProgramInfo;
 class MythEventHandler;
-class MythTimer;
+class MythRecordingRule;
 class MythStorageGroupFile;
 
 template <class T> class MythPointer;
 template <class T> class MythPointerThreadSafe;
 
 typedef std::map<CStdString, MythProgramInfo> ProgramInfoMap;
-typedef std::vector<MythStorageGroupFile> StorageGroupFileList;
 
-class MythConnection 
+class MythConnection
 {
 public:
   MythConnection();
@@ -62,7 +61,7 @@
   CStdString GetBackendHostname();
   int GetProtocolVersion();
   bool GetDriveSpace(long long &total, long long &used);
-  CStdString GetSetting(const CStdString &hostname, const CStdString &setting);
+  CStdString GetSettingOnHost(const CStdString &setting, const CStdString &hostname);
   bool SetSetting(const CStdString &hostname, const CStdString &setting, const CStdString &value);
 
   // Recorders
@@ -72,17 +71,19 @@
   // Recordings
   bool DeleteRecording(MythProgramInfo &recording);
   ProgramInfoMap GetRecordedPrograms();
+  MythProgramInfo GetRecordedProgram(const CStdString &basename);
+  MythProgramInfo GetRecordedProgram(int chanid, time_t recstartts);
 
   // Timers
   ProgramInfoMap GetPendingPrograms();
   ProgramInfoMap GetScheduledPrograms();
   bool UpdateSchedules(int id);
-  void DefaultTimer(MythTimer &timer);
+  bool StopRecording(const MythProgramInfo &recording);
 
   // Files
   MythFile ConnectFile(MythProgramInfo &recording);
   MythFile ConnectPath(const CStdString &filename, const CStdString &storageGroup);
-  StorageGroupFileList GetStorageGroupFileList(const CStdString &storageGroup);
+  MythStorageGroupFile GetStorageGroupFile(const CStdString &storageGroup, const CStdString &filename);
 
   // Bookmarks
   long long GetBookmark(MythProgramInfo &recording);
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -21,7 +21,7 @@
 #include "MythDatabase.h"
 #include "MythChannel.h"
 #include "MythProgramInfo.h"
-#include "MythTimer.h"
+#include "MythRecordingRule.h"
 #include "MythPointer.h"
 
 #include "../client.h"
@@ -47,10 +47,10 @@
 {
 }
 
-MythDatabase::MythDatabase(const CStdString &server, const CStdString &database, const CStdString &user, const CStdString &password)
+MythDatabase::MythDatabase(const CStdString &server, const CStdString &database, const CStdString &user, const CStdString &password, unsigned short port)
   : m_database_t(new MythPointerThreadSafe<cmyth_database_t>())
 {
-  *m_database_t = cmyth_database_init(const_cast<char*>(server.c_str()), const_cast<char*>(database.c_str()), const_cast<char*>(user.c_str()), const_cast<char*>(password.c_str()));
+  *m_database_t = cmyth_database_init(const_cast<char*>(server.c_str()), const_cast<char*>(database.c_str()), const_cast<char*>(user.c_str()), const_cast<char*>(password.c_str()), port);
 }
 
 bool MythDatabase::IsNull() const
@@ -70,18 +70,35 @@
   return retval == 1;
 }
 
+int MythDatabase::GetSchemaVersion()
+{
+  int retval = 0;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_database_get_version(*m_database_t));
+  return retval;
+}
+
+CStdString MythDatabase::GetSetting(const CStdString &setting)
+{
+  int retval;
+  char* buf = NULL;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_get_setting(*m_database_t, const_cast<char*>(setting.c_str()), &buf));
+  CStdString data(buf);
+  ref_release(buf);
+  return data;
+}
+
 bool MythDatabase::FindProgram(time_t starttime, int channelid, const CStdString &title, MythProgram* program)
 {
   int retval = 0;
-  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_get_prog_finder_time_title_chan(*m_database_t, program, const_cast<char*>(title.c_str()), starttime, channelid));
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_get_prog_finder_time_title_chan(*m_database_t, program, starttime, const_cast<char*>(title.c_str()), channelid));
   return retval > 0;
 }
 
-ProgramList MythDatabase::GetGuide(time_t starttime, time_t endtime)
+ProgramList MythDatabase::GetGuide(int channelid, time_t starttime, time_t endtime)
 {
   MythProgram *programs = 0;
   int len = 0;
-  CMYTH_DB_CALL(len, len < 0, cmyth_mysql_get_guide(*m_database_t, &programs, starttime, endtime));
+  CMYTH_DB_CALL(len, len < 0, cmyth_mysql_get_guide(*m_database_t, &programs, channelid, starttime, endtime));
 
   if (len < 1)
     return ProgramList();
@@ -91,11 +108,12 @@
   return retval;
 }
 
-ChannelMap MythDatabase::GetChannels()
+ChannelIdMap MythDatabase::GetChannels()
 {
-  ChannelMap retval;
+  int ret;
+  ChannelIdMap retval;
   cmyth_chanlist_t channels = NULL;
-  CMYTH_DB_CALL(channels, channels == NULL, cmyth_mysql_get_chanlist(*m_database_t));
+  CMYTH_DB_CALL(ret, ret < 0, cmyth_mysql_get_chanlist(*m_database_t, &channels));
   int channelCount = cmyth_chanlist_get_count(channels);
 
   for (int i = 0; i < channelCount; i++)
@@ -112,156 +130,96 @@
 ChannelGroupMap MythDatabase::GetChannelGroups()
 {
   ChannelGroupMap retval;
-  cmyth_channelgroups_t *channelGroups = NULL;
+  cmyth_channelgroup_t *channelGroups = NULL;
   int channelGroupCount = 0;
   CMYTH_DB_CALL(channelGroupCount, channelGroupCount < 0, cmyth_mysql_get_channelgroups(*m_database_t, &channelGroups));
 
   if (!channelGroups)
     return retval;
 
-  m_database_t->Lock();
-
   for (int i = 0; i < channelGroupCount; i++)
   {
-    MythChannelGroup channelGroup;
-    channelGroup.first = channelGroups[i].channelgroup;
-
     // cmyth_mysql_get_channelids_in_group writes the list of all channel IDs to its third parameter (int**)
-    int* channelIDs = 0;
-    int channelCount = cmyth_mysql_get_channelids_in_group(*m_database_t, channelGroups[i].ID, &channelIDs);
-    if (channelCount)
+    unsigned int *channelIDs = 0;
+    int channelCount = cmyth_mysql_get_channelids_in_group(*m_database_t, channelGroups[i].grpid, (uint32_t**)&channelIDs);
+    if (channelCount > 0)
     {
-      channelGroup.second = std::vector<int>(channelIDs, channelIDs + channelCount);
+      retval.insert(std::make_pair(channelGroups[i].name, std::vector<int>(channelIDs, channelIDs + channelCount)));
       ref_release(channelIDs);
     }
     else
-      channelGroup.second = std::vector<int>();
-
-    retval.insert(channelGroup);
+    {
+      retval.insert(std::make_pair(channelGroups[i].name, std::vector<int>()));
+    }
   }
   ref_release(channelGroups);
-
-  m_database_t->Unlock();
-
   return retval;
 }
 
-SourceMap MythDatabase::GetSources()
+RecorderSourceList MythDatabase::GetLiveTVRecorderSourceList(const CStdString &channum)
 {
-  SourceMap retval;
-  cmyth_rec_t *recorders = 0;
+  RecorderSourceList retval;
+  cmyth_recorder_source_t *recorders = 0;
   int recorderCount = 0;
-  CMYTH_DB_CALL(recorderCount, recorderCount < 0, cmyth_mysql_get_recorder_list(*m_database_t, &recorders));
-
-  m_database_t->Lock();
+  CMYTH_DB_CALL(recorderCount, recorderCount < 0, cmyth_mysql_get_recorder_source_channum(*m_database_t, const_cast<char*>(channum.c_str()), &recorders));
 
-  for (int i = 0; i < recorderCount; i++)
+  for (int i = 0; i < recorderCount; ++i)
   {
-    SourceMap::iterator it = retval.find(recorders[i].sourceid);
-    if (it != retval.end())
-      it->second.push_back(recorders[i].recid);
-    else
-      retval[recorders[i].sourceid] = std::vector<int>(1, recorders[i].recid);
+    retval.push_back(std::make_pair(recorders[i].recid, recorders[i].sourceid));
   }
   ref_release(recorders);
-
-  m_database_t->Unlock();
-
   return retval;
 }
 
-TimerMap MythDatabase::GetTimers()
+RecordingRuleMap MythDatabase::GetRecordingRules()
 {
-  TimerMap retval;
-  cmyth_timerlist_t timers = NULL;
-  CMYTH_DB_CALL(timers, timers == NULL, cmyth_mysql_get_timers(*m_database_t));
-  int timerCount = cmyth_timerlist_get_count(timers);
+  int ret;
+  RecordingRuleMap retval;
+  cmyth_recordingrulelist_t rules = NULL;
+  CMYTH_DB_CALL(ret, ret < 0, cmyth_mysql_get_recordingrules(*m_database_t, &rules));
+  int ruleCount = cmyth_recordingrulelist_get_count(rules);
 
-  for (int i = 0; i < timerCount; i++)
+  for (int i = 0; i < ruleCount; i++)
   {
-    cmyth_timer_t timer = cmyth_timerlist_get_item(timers, i);
+    cmyth_recordingrule_t rule = cmyth_recordingrulelist_get_item(rules, i);
 
-    MythTimer t(timer);
-    retval.insert(std::pair<int,MythTimer>(t.RecordID(), t));
+    MythRecordingRule t(rule);
+    retval.insert(std::pair<int,MythRecordingRule>(t.RecordID(), t));
   }
-  ref_release(timers);
+  ref_release(rules);
   return retval;
 }
 
-int MythDatabase::AddTimer(const MythTimer &timer)
+bool MythDatabase::AddRecordingRule(const MythRecordingRule &rule)
 {
   int retval = 0;
-  CMYTH_DB_CALL(retval, retval < 0,
-    cmyth_mysql_add_timer(*m_database_t,
-      timer.ChannelID(),
-      const_cast<char*>(timer.Callsign().c_str()),
-      const_cast<char*>(timer.Description().c_str()),
-      timer.StartTime(),
-      timer.EndTime(),
-      const_cast<char*>(timer.Title(false).c_str()),
-      const_cast<char*>(timer.Category().c_str()),
-      timer.Type(),
-      const_cast<char*>(timer.Subtitle().c_str()),
-      timer.Priority(),
-      timer.StartOffset(),
-      timer.EndOffset(),
-      timer.SearchType(),
-      timer.Inactive() ? 1 : 0,
-      timer.DuplicateControlMethod(),
-      timer.CheckDuplicatesInType(),
-      const_cast<char*>(timer.RecordingGroup().c_str()),
-      const_cast<char*>(timer.StorageGroup().c_str()),
-      const_cast<char*>(timer.PlaybackGroup().c_str()),
-      timer.AutoTranscode(),
-      timer.UserJobs(),
-      timer.AutoCommFlag(),
-      timer.AutoExpire(),
-      timer.MaxEpisodes(),
-      timer.NewExpiresOldRecord(),
-      timer.Transcoder()));
-  return retval;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_add_recordingrule(*m_database_t, *rule.m_recordingrule_t));
+  return retval > 0;
 }
 
-bool MythDatabase::UpdateTimer(const MythTimer &timer)
+bool MythDatabase::UpdateRecordingRule(const MythRecordingRule &rule)
 {
   int retval = 0;
-  CMYTH_DB_CALL(retval, retval < 0,
-    cmyth_mysql_update_timer(*m_database_t,
-      timer.RecordID(),
-      timer.ChannelID(),
-      const_cast<char*>(timer.m_callsign.c_str()),
-      const_cast<char*>(timer.m_description.c_str()),
-      timer.StartTime(),
-      timer.EndTime(),
-      const_cast<char*>(timer.Title(false).c_str()),
-      const_cast<char*>(timer.Category().c_str()),
-      timer.Type(),
-      const_cast<char*>(timer.Subtitle().c_str()),
-      timer.Priority(),
-      timer.StartOffset(),
-      timer.EndOffset(),
-      timer.SearchType(),
-      timer.Inactive() ? 1 : 0,
-      timer.DuplicateControlMethod(),
-      timer.CheckDuplicatesInType(),
-      const_cast<char*>(timer.RecordingGroup().c_str()),
-      const_cast<char*>(timer.StorageGroup().c_str()),
-      const_cast<char*>(timer.PlaybackGroup().c_str()),
-      timer.AutoTranscode(),
-      timer.UserJobs(),
-      timer.AutoCommFlag(),
-      timer.AutoExpire(),
-      timer.MaxEpisodes(),
-      timer.NewExpiresOldRecord(),
-      timer.Transcoder()));
-  return retval == 0;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_update_recordingrule(*m_database_t, *rule.m_recordingrule_t));
+  return retval > 0;
 }
 
-bool MythDatabase::DeleteTimer(int recordid)
+bool MythDatabase::DeleteRecordingRule(unsigned int recordid)
 {
   int retval = 0;
-  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_delete_timer(*m_database_t, recordid));
-  return retval == 0;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_delete_recordingrule(*m_database_t, recordid));
+  return retval > 0;
+}
+
+MythRecordingRule MythDatabase::LoadRecordingRuleTemplate(const CStdString &category, const CStdString &category_type)
+{
+  int ret;
+  MythRecordingRule retval;
+  cmyth_recordingrule_t rule = NULL;
+  CMYTH_DB_CALL(ret, ret < 0, cmyth_mysql_recordingrule_from_template(*m_database_t, const_cast<char*>(category.c_str()), const_cast<char*>(category_type.c_str()), &rule));
+  if (ret >= 0)
+    retval = MythRecordingRule(rule);
+  return retval;
 }
 
 RecordingProfileList MythDatabase::GetRecordingProfiles()
@@ -272,7 +230,6 @@
 
   CMYTH_DB_CALL(recordingProfileCount, recordingProfileCount < 0, cmyth_mysql_get_recprofiles(*m_database_t, &recordingProfiles));
 
-  m_database_t->Lock();
   for (int i = 0; i < recordingProfileCount; i++)
   {
     RecordingProfileList::iterator it = std::find(retval.begin(), retval.end(), CStdString(recordingProfiles[i].cardtype));
@@ -285,22 +242,52 @@
     it->profile.insert(std::pair<int, CStdString>(recordingProfiles[i].id, recordingProfiles[i].name));
   }
   ref_release(recordingProfiles);
-
-  m_database_t->Unlock();
-
   return retval;
 }
 
-int MythDatabase::SetWatchedStatus(const MythProgramInfo &recording, bool watched)
+bool MythDatabase::SetWatchedStatus(const MythProgramInfo &recording, bool watched)
 {
   int retval = 0;
-  CMYTH_DB_CALL(retval, retval < 0, cmyth_set_watched_status_mysql(*m_database_t, *recording.m_proginfo_t, watched ? 1 : 0));
-  return retval;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_set_watched_status(*m_database_t, *recording.m_proginfo_t, watched ? 1 : 0));
+  return retval > 0;
 }
 
 long long MythDatabase::GetBookmarkMark(const MythProgramInfo &recording, long long bk, int mode)
 {
   long long mark = 0;
-  CMYTH_DB_CALL(mark, mark < 0, cmyth_get_bookmark_mark(*m_database_t, *recording.m_proginfo_t, bk, mode));
+  CMYTH_DB_CALL(mark, mark < 0, cmyth_mysql_get_bookmark_mark(*m_database_t, *recording.m_proginfo_t, bk, mode));
   return mark;
 }
+
+long long MythDatabase::GetRecordingMarkup(const MythProgramInfo &recording, int type)
+{
+  long long value = 0;
+  CMYTH_DB_CALL(value, value < 0, cmyth_mysql_get_recording_markup(*m_database_t, *recording.m_proginfo_t, (cmyth_recording_markup_t)type));
+  return value;
+}
+
+long long MythDatabase::GetRecordingFrameRate(const MythProgramInfo &recording)
+{
+  long long value = 0;
+  CMYTH_DB_CALL(value, value < 0, cmyth_mysql_get_recording_framerate(*m_database_t, *recording.m_proginfo_t));
+  return value;
+}
+
+bool MythDatabase::FillRecordingArtwork(MythProgramInfo &recording)
+{
+  int retval = 0;
+  char* coverart;
+  char* fanart;
+  char* banner;
+  CMYTH_DB_CALL(retval, retval < 0, cmyth_mysql_get_recording_artwork(*m_database_t, *recording.m_proginfo_t, &coverart, &fanart, &banner));
+  if (retval > 0)
+  {
+    recording.m_coverart = coverart;
+    recording.m_fanart = fanart;
+    ref_release(coverart);
+    ref_release(fanart);
+    ref_release(banner);
+    return true;
+  }
+  return false;
+}
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythDatabase.h	2013-03-12 10:51:22.000000000 +0000
@@ -31,7 +31,7 @@
 };
 
 class MythChannel;
-class MythTimer;
+class MythRecordingRule;
 class MythProgramInfo;
 
 template <class T> class MythPointerThreadSafe;
@@ -39,12 +39,13 @@
 typedef cmyth_program_t MythProgram;
 typedef std::vector<MythProgram> ProgramList;
 
-typedef std::map<int, MythChannel> ChannelMap;
-typedef std::pair<CStdString, std::vector<int> > MythChannelGroup;
+typedef std::map<int, MythChannel> ChannelIdMap;
+typedef std::multimap<CStdString, MythChannel> ChannelNumberMap;
 typedef std::map<CStdString, std::vector<int> > ChannelGroupMap;
 
-typedef std::map<int, std::vector<int> > SourceMap;
-typedef std::map<int, MythTimer> TimerMap;
+typedef std::vector<std::pair<unsigned int, unsigned int> > RecorderSourceList;
+
+typedef std::map<int, MythRecordingRule> RecordingRuleMap;
 
 // TODO: Rework MythRecordingProfile
 class MythRecordingProfile : public CStdString
@@ -59,29 +60,40 @@
 {
 public:
   MythDatabase();
-  MythDatabase(const CStdString &server, const CStdString &database, const CStdString &user, const CStdString &password);
+  MythDatabase(const CStdString &server, const CStdString &database, const CStdString &user, const CStdString &password, unsigned short port);
 
   bool IsNull() const;
 
   bool TestConnection(CStdString *msg);
 
+  int GetSchemaVersion();
+
+  CStdString GetSetting(const CStdString &setting);
+
   bool FindProgram(time_t starttime, int channelid, const CStdString &title, MythProgram* pprogram);
-  ProgramList GetGuide(time_t starttime, time_t endtime);
+  ProgramList GetGuide(int channelid, time_t starttime, time_t endtime);
 
-  ChannelMap GetChannels();
+  ChannelIdMap GetChannels();
   ChannelGroupMap GetChannelGroups();
-  SourceMap GetSources();
 
-  TimerMap GetTimers();
-  int AddTimer(const MythTimer &timer);
-  bool UpdateTimer(const MythTimer &timer);
-  bool DeleteTimer(int recordid);
+  RecorderSourceList GetLiveTVRecorderSourceList(const CStdString &channum);
+
+  RecordingRuleMap GetRecordingRules();
+  bool AddRecordingRule(const MythRecordingRule &rule);
+  bool UpdateRecordingRule(const MythRecordingRule &rule);
+  bool DeleteRecordingRule(unsigned int recordid);
+  MythRecordingRule LoadRecordingRuleTemplate(const CStdString &category, const CStdString &category_type);
 
   RecordingProfileList GetRecordingProfiles();
 
-  int SetWatchedStatus(const MythProgramInfo &recording, bool watched);
+  bool SetWatchedStatus(const MythProgramInfo &recording, bool watched);
   long long GetBookmarkMark(const MythProgramInfo &recording, long long bk, int mode);
 
+  long long GetRecordingMarkup(const MythProgramInfo &recording, int type);
+  long long GetRecordingFrameRate(const MythProgramInfo &recording);
+
+  bool FillRecordingArtwork(MythProgramInfo &recording);
+
 private:
   boost::shared_ptr<MythPointerThreadSafe<cmyth_database_t> > m_database_t;
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -23,8 +23,12 @@
 #include "MythSignal.h"
 #include "MythPointer.h"
 #include "MythFile.h"
+#include "MythProgramInfo.h"
+#include "MythTimestamp.h"
 #include "../client.h"
 
+#include <list>
+
 using namespace ADDON;
 
 template <class ContainerT>
@@ -62,12 +66,16 @@
 
   virtual void* Process(void);
 
+  void HandleAskRecording(const CStdString &buffer, MythProgramInfo &programInfo);
+
   void HandleUpdateSignal(const CStdString &buffer);
 
   void SetRecordingEventListener(const CStdString &recordid, const MythFile &file);
   void HandleUpdateFileSize(const CStdString &buffer);
 
   void RetryConnect();
+  bool TryReconnect();
+  void RecordingListChange();
 
   // Data
   CStdString m_server;
@@ -75,12 +83,17 @@
 
   boost::shared_ptr<MythPointerThreadSafe<cmyth_conn_t> > m_conn_t;
 
+  MythEventObserver *m_observer;
+
   MythRecorder m_recorder;
   MythSignal m_signal;
 
   bool m_playback;
+  bool m_hang;
   CStdString m_currentRecordID;
   MythFile m_currentFile;
+
+  std::list<MythEventHandler::RecordingChangeEvent> m_recordingChangeEventList;
 };
 
 MythEventHandler::MythEventHandlerPrivate::MythEventHandlerPrivate(const CStdString &server, unsigned short port)
@@ -89,9 +102,12 @@
   , m_server(server)
   , m_port(port)
   , m_conn_t(new MythPointerThreadSafe<cmyth_conn_t>())
+  , m_observer(NULL)
   , m_recorder(MythRecorder())
   , m_signal()
   , m_playback(false)
+  , m_hang(false)
+  , m_recordingChangeEventList()
 {
   *m_conn_t = cmyth_conn_connect_event(const_cast<char*>(m_server.c_str()), port, 64 * 1024, 16 * 1024);
 }
@@ -127,12 +143,15 @@
   cmyth_event_t myth_event;
   char databuf[2049];
   databuf[0] = 0;
+  bool triggerRecordingUpdate = false;
+  unsigned int recordingChangeCount = 0;
   timeval timeout;
   timeout.tv_sec = 0;
   timeout.tv_usec = 100000;
 
   while (!IsStopped())
   {
+    bool recordingChange = false;
     int select = 0;
     m_conn_t->Lock();
     select = cmyth_event_select(*m_conn_t, &timeout);
@@ -140,8 +159,9 @@
 
     if (select > 0)
     {
+      cmyth_proginfo_t proginfo = NULL;
       m_conn_t->Lock();
-      myth_event = cmyth_event_get(*m_conn_t, databuf, 2048);
+      myth_event = cmyth_event_get_message(*m_conn_t, databuf, 2048, &proginfo);
       m_conn_t->Unlock();
 
       if (g_bExtraDebug)
@@ -150,11 +170,11 @@
       if (myth_event == CMYTH_EVENT_UPDATE_FILE_SIZE)
       {
         if (g_bExtraDebug)
-          XBMC->Log(LOG_NOTICE,"%s - Event file size update: %i", __FUNCTION__, databuf);
+          XBMC->Log(LOG_NOTICE,"%s - Event file size update: %s", __FUNCTION__, databuf);
         HandleUpdateFileSize(databuf);
       }
 
-      if (myth_event == CMYTH_EVENT_LIVETV_CHAIN_UPDATE)
+      else if (myth_event == CMYTH_EVENT_LIVETV_CHAIN_UPDATE)
       {
         Lock();
         if (!m_recorder.IsNull())
@@ -169,7 +189,7 @@
         Unlock();
       }
 
-      if (myth_event == CMYTH_EVENT_LIVETV_WATCH)
+      else if (myth_event == CMYTH_EVENT_LIVETV_WATCH)
       {
         if (g_bExtraDebug)
           XBMC->Log(LOG_NOTICE,"%s: Event LIVETV_WATCH: recoder %s", __FUNCTION__, databuf);
@@ -187,7 +207,7 @@
         Unlock();
       }
 
-      if(myth_event == CMYTH_EVENT_DONE_RECORDING)
+      else if(myth_event == CMYTH_EVENT_DONE_RECORDING)
       {
         if (g_bExtraDebug)
           XBMC->Log(LOG_NOTICE, "%s: Event DONE_RECORDING: recorder %s", __FUNCTION__, databuf);
@@ -205,7 +225,13 @@
         Unlock();
       }
 
-      if (myth_event == CMYTH_EVENT_SIGNAL)
+      else if (myth_event == CMYTH_EVENT_ASK_RECORDING)
+      {
+        MythProgramInfo prog(proginfo);
+        HandleAskRecording(databuf, prog);
+      }
+
+      else if (myth_event == CMYTH_EVENT_SIGNAL)
       {
         HandleUpdateSignal(databuf);
       }
@@ -215,26 +241,66 @@
         if (g_bExtraDebug)
           XBMC->Log(LOG_NOTICE, "%s - Event schedule change", __FUNCTION__);
         PVR->TriggerTimerUpdate();
-        PVR->TriggerRecordingUpdate();
       }
 
-      if (!m_playback && (
-          myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_ADD ||
-          myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_DELETE ||
-          myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_UPDATE ||
-          myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE))
+      else if (myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_ADD)
+      {
+        //Event data: "4121 2010-03-06T01:06:43[]:[]empty"
+        unsigned int chanid;
+        char recstartts[20];
+        if (strlen(databuf)>=24 && sscanf(databuf, "%u %19s", &chanid, recstartts) == 2) {
+          Lock();
+          m_recordingChangeEventList.push_back(RecordingChangeEvent(CHANGE_ADD, chanid, recstartts));
+          Unlock();
+          if (g_bExtraDebug)
+            XBMC->Log(LOG_DEBUG,"%s - Event recording list add: CHANID=%u TS=%s", __FUNCTION__, chanid, recstartts);
+          recordingChange = true;
+        }
+      }
+
+      else if (myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_UPDATE)
+      {
+        //Event data: Updated 'proginfo' is returned
+        MythProgramInfo prog = MythProgramInfo(proginfo);
+        if (!prog.IsNull())
+        {
+          Lock();
+          m_recordingChangeEventList.push_back(RecordingChangeEvent(CHANGE_UPDATE, prog));
+          Unlock();
+          if (g_bExtraDebug)
+            XBMC->Log(LOG_DEBUG,"%s - Event recording list update: UID=%s", __FUNCTION__, prog.UID().c_str());
+          recordingChange = true;
+        }
+      }
+
+      else if (myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE_DELETE)
+      {
+        //Event data: "4121 2010-03-06T01:06:43[]:[]empty"
+        unsigned int chanid;
+        char recstartts[20];
+        if (strlen(databuf)>=24 && sscanf(databuf, "%u %19s", &chanid, recstartts) == 2) {
+          Lock();
+          m_recordingChangeEventList.push_back(RecordingChangeEvent(CHANGE_DELETE, chanid, recstartts));
+          Unlock();
+          if (g_bExtraDebug)
+            XBMC->Log(LOG_DEBUG,"%s - Event recording list delete: CHANID=%u TS=%s", __FUNCTION__, chanid, recstartts);
+          recordingChange = true;
+        }
+      }
+
+      else if (myth_event == CMYTH_EVENT_RECORDING_LIST_CHANGE)
       {
         if (g_bExtraDebug)
           XBMC->Log(LOG_NOTICE, "%s - Event recording list change", __FUNCTION__);
-        PVR->TriggerRecordingUpdate();
+        RecordingListChange();
       }
 
-      if (myth_event == CMYTH_EVENT_UNKNOWN)
+      else if (myth_event == CMYTH_EVENT_UNKNOWN)
       {
         XBMC->Log(LOG_NOTICE, "%s - Event unknown, databuf: %s", __FUNCTION__, databuf);
       }
 
-      if (myth_event == CMYTH_EVENT_CLOSE)
+      else if (myth_event == CMYTH_EVENT_CLOSE)
       {
         XBMC->Log(LOG_NOTICE, "%s - Event client connection closed", __FUNCTION__);
         RetryConnect();
@@ -244,29 +310,51 @@
     }
     else if (select < 0)
     {
-        XBMC->Log(LOG_ERROR, "%s Event client connection error", __FUNCTION__);
-        RetryConnect();
+      XBMC->Log(LOG_ERROR, "%s Event client connection error", __FUNCTION__);
+      RetryConnect();
     }
-    else if (select = 0 && cmyth_conn_hung(*m_conn_t))
+    else if (cmyth_conn_hung(*m_conn_t))
     {
       XBMC->Log(LOG_NOTICE, "%s - Connection hung - reconnect event client connection", __FUNCTION__);
+      if (!m_conn_t || !TryReconnect())
+        RetryConnect();
+    }
 
-      if (!m_conn_t)
-        break;
-
-      m_conn_t->Lock();
-      int retval = cmyth_conn_reconnect_event(*m_conn_t);
-      m_conn_t->Unlock();
-      if (retval == 1)
-        XBMC->Log(LOG_NOTICE, "%s - Connected client to event socket", __FUNCTION__);
+    //Accumulate recording change events before triggering PVR event
+    //First timeout is 0.5 sec and next 2 secs
+    if (recordingChange)
+    {
+      if (recordingChangeCount == 0)
+      {
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 500000;
+      }
       else
-        XBMC->Log(LOG_NOTICE, "%s - Could not connect client to event socket", __FUNCTION__);
+      {
+        timeout.tv_sec = 2;
+        timeout.tv_usec = 0;
+      }
+      recordingChangeCount++;
+      triggerRecordingUpdate = true;
+    }
+    else
+    {
+      //Restore timeout
+      timeout.tv_sec = 0;
+      timeout.tv_usec = 100000;
+      //Need PVR update ?
+      if (triggerRecordingUpdate)
+      {
+        XBMC->Log(LOG_DEBUG, "%s - Trigger PVR recording update: %lu recording(s)", __FUNCTION__, recordingChangeCount);
+        PVR->TriggerRecordingUpdate();
+        triggerRecordingUpdate = false;
+      }
+      //Reset counter
+      recordingChangeCount = 0;
     }
-
-    //Restore timeout
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 100000;
   }
+  // Free recording change event
+  m_recordingChangeEventList.clear();
   return NULL;
 }
 
@@ -278,6 +366,44 @@
   m_currentRecordID = recordIDBuffer;
 }
 
+void MythEventHandler::MythEventHandlerPrivate::HandleAskRecording(const CStdString &databuf, MythProgramInfo &programInfo)
+{
+  // ASK_RECORDING <card id> <time until> <has rec> <has later>[]:[]<program info>
+  // Example: ASK_RECORDING 9 29 0 1[]:[]<program>
+
+  // The scheduled recording will hang in MythTV if ASK_RECORDING is just ignored.
+  // - Stop recorder (and blocked for time until seconds)
+  // - Skip the recording by sending CANCEL_NEXT_RECORDING(true)
+
+  unsigned int cardid;
+  int timeuntil, hasrec, haslater;
+  if (sscanf(databuf.c_str(), "%d %d %d %d", &cardid, &timeuntil, &hasrec, &haslater) == 4)
+    XBMC->Log(LOG_NOTICE, "%s: Event ASK_RECORDING: rec=%d timeuntil=%d hasrec=%d haslater=%d", __FUNCTION__, cardid, timeuntil, hasrec, haslater);
+  else
+    XBMC->Log(LOG_ERROR, "%s: Incorrect ASK_RECORDING event: rec=%d timeuntil=%d hasrec=%d haslater=%d", __FUNCTION__, cardid, timeuntil, hasrec, haslater);
+
+  CStdString title;
+  if (!programInfo.IsNull())
+    title = programInfo.Title();
+  XBMC->Log(LOG_NOTICE, "%s: Event ASK_RECORDING: title=%s", __FUNCTION__, title.c_str());
+
+  if (timeuntil >= 0 && !m_recorder.IsNull() && m_recorder.ID() == cardid)
+  {
+    if (g_iLiveTVConflictStrategy == LIVETV_CONFLICT_STRATEGY_CANCELREC ||
+      (g_iLiveTVConflictStrategy == LIVETV_CONFLICT_STRATEGY_HASLATER && haslater))
+    {
+      XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30307), title.c_str()); // Canceling conflicting recording: %s
+      m_recorder.CancelNextRecording(true);
+    }
+    else // LIVETV_CONFLICT_STRATEGY_STOPTV
+    {
+      XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30308), title.c_str()); // Stopping Live TV due to conflicting recording: %s
+      if (m_observer)
+        m_observer->CloseLiveStream();
+    }
+  }
+}
+
 void MythEventHandler::MythEventHandlerPrivate::HandleUpdateSignal(const CStdString &buffer)
 {
   // SIGNAL <card id> On known multiplex... or <tuner status list>
@@ -286,7 +412,7 @@
 
   std::vector<std::string> tokenList;
   tokenize<std::vector<std::string> >(buffer, tokenList, ";");
-  for (std::vector<std::string>::iterator it = tokenList.begin(); it != tokenList.end(); it++)
+  for (std::vector<std::string>::iterator it = tokenList.begin(); it != tokenList.end(); ++it)
   {
     std::vector<std::string> tokenList2;
     tokenize< std::vector<std::string> >(*it, tokenList2, " ");
@@ -299,9 +425,9 @@
       else if (tokenList2[0] == "snr")
         m_signal.m_SNR = std::atoi(tokenList2[1].c_str());
       else if (tokenList2[0] == "ber")
-        m_signal.m_BER = std::atoi(tokenList2[1].c_str());
+        m_signal.m_BER = std::atol(tokenList2[1].c_str());
       else if (tokenList2[0] == "ucb")
-        m_signal.m_UNC = std::atoi(tokenList2[1].c_str());
+        m_signal.m_UNC = std::atol(tokenList2[1].c_str());
       else if (tokenList2[0] == "cardid")
         m_signal.m_ID = std::atoi(tokenList2[1].c_str());
     }
@@ -315,38 +441,60 @@
 
   long long length;
   char recordIDBuffer[20];
-  sscanf(buffer.c_str(),"%4s %4s-%2s-%2sT%2s:%2s:%2s %lli", recordIDBuffer, recordIDBuffer + 4, recordIDBuffer + 8, recordIDBuffer + 10, recordIDBuffer + 12, recordIDBuffer + 14, recordIDBuffer + 16, &length);
+  sscanf(buffer.c_str(),"%4s %4s-%2s-%2sT%2s:%2s:%2s %lld", recordIDBuffer, recordIDBuffer + 4, recordIDBuffer + 8, recordIDBuffer + 10, recordIDBuffer + 12, recordIDBuffer + 14, recordIDBuffer + 16, &length);
   CStdString recordID = recordIDBuffer;
 
   if (m_currentRecordID.compare(recordID) == 0) {
     if (g_bExtraDebug)
-      XBMC->Log(LOG_DEBUG,"EVENT: %s, --UPDATING CURRENT RECORDING LENGTH-- EVENT msg: %s %ll", __FUNCTION__, recordID.c_str(), length);
+      XBMC->Log(LOG_DEBUG,"EVENT: %s, --UPDATING CURRENT RECORDING LENGTH-- EVENT msg: %s %lld", __FUNCTION__, recordID.c_str(), length);
     m_currentFile.UpdateLength(length);
   }
 }
 
 void MythEventHandler::MythEventHandlerPrivate::RetryConnect()
 {
-    while (!IsStopped())
-    {
-      usleep(999999);
-      ref_release(*m_conn_t);
-      *m_conn_t = NULL;
-      *m_conn_t = cmyth_conn_connect_event(const_cast<char*>(m_server.c_str()), m_port, 64 * 1024, 16 * 1024);
+  XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30302)); // MythTV backend unavailable
+  m_hang = true;
+  while (!IsStopped())
+  {
+    usleep(999999);
+    ref_release(*m_conn_t);
+    *m_conn_t = NULL;
+    *m_conn_t = cmyth_conn_connect_event(const_cast<char*>(m_server.c_str()), m_port, 64 * 1024, 16 * 1024);
 
-      if (*m_conn_t == NULL)
-        XBMC->Log(LOG_NOTICE, "%s - Could not connect client to event socket", __FUNCTION__);
-      else
-      {
-        XBMC->Log(LOG_NOTICE, "%s - Connected client to event socket", __FUNCTION__);
-        break;
-      }
+    if (*m_conn_t == NULL)
+      XBMC->Log(LOG_NOTICE, "%s - Could not connect client to event socket", __FUNCTION__);
+    else
+    {
+      XBMC->Log(LOG_NOTICE, "%s - Connected client to event socket", __FUNCTION__);
+      XBMC->QueueNotification(QUEUE_INFO, XBMC->GetLocalizedString(30303)); // MythTV backend available
+      m_hang = false;
+      RecordingListChange();
+      break;
     }
+  }
 }
 
-MythEventHandler::MythEventHandler()
-  : m_imp()
+bool MythEventHandler::MythEventHandlerPrivate::TryReconnect()
 {
+  int retval = 0;
+  XBMC->Log(LOG_DEBUG, "%s - Trying to reconnect", __FUNCTION__);
+  m_conn_t->Lock();
+  retval = cmyth_conn_reconnect_event(*m_conn_t);
+  m_conn_t->Unlock();
+  if (retval == 1)
+    XBMC->Log(LOG_NOTICE, "%s - Connected client to event socket", __FUNCTION__);
+  else
+    XBMC->Log(LOG_NOTICE, "%s - Could not connect client to event socket", __FUNCTION__);
+  return retval == 1;
+}
+
+void MythEventHandler::MythEventHandlerPrivate::RecordingListChange()
+{
+  Lock();
+  m_recordingChangeEventList.push_back(RecordingChangeEvent(CHANGE_ALL));
+  Unlock();
+  PVR->TriggerRecordingUpdate();
 }
 
 MythEventHandler::MythEventHandler(const CStdString &server, unsigned short port)
@@ -355,26 +503,9 @@
   m_imp->CreateThread();
 }
 
-
-bool MythEventHandler::TryReconnect()
+void MythEventHandler::RegisterObserver(MythEventObserver *observer)
 {
-  int retval = 0;
-  if (m_retryCount < 10)
-  {
-    XBMC->Log(LOG_DEBUG, "%s - Trying to reconnect (retry count: %d)", __FUNCTION__, m_retryCount);
-    m_retryCount++;
-
-    m_imp->m_conn_t->Lock();
-    retval = cmyth_conn_reconnect_event(*(m_imp->m_conn_t));
-    m_imp->m_conn_t->Unlock();
-
-    if (retval == 1)
-      m_retryCount = 0;
-  }
-  if (g_bExtraDebug && retval == 0)
-    XBMC->Log(LOG_DEBUG, "%s - Unable to reconnect (retry count: %d)", __FUNCTION__, m_retryCount);
-
-  return retval == 1;
+  m_imp->m_observer = observer;
 }
 
 void MythEventHandler::PreventLiveChainUpdate()
@@ -420,9 +551,35 @@
   return m_imp->m_playback;
 }
 
+bool MythEventHandler::IsListening() const
+{
+  return (!m_imp->m_hang);
+}
+
 void MythEventHandler::SetRecordingListener(const CStdString &recordid, const MythFile &file)
 {
   m_imp->Lock();
   m_imp->SetRecordingEventListener(recordid, file);
   m_imp->Unlock();
 }
+
+bool MythEventHandler::HasRecordingChangeEvent() const
+{
+  return !m_imp->m_recordingChangeEventList.empty();
+}
+
+MythEventHandler::RecordingChangeEvent MythEventHandler::NextRecordingChangeEvent()
+{
+  m_imp->Lock();
+  RecordingChangeEvent event = m_imp->m_recordingChangeEventList.front();
+  m_imp->m_recordingChangeEventList.pop_front();
+  m_imp->Unlock();
+  return event;
+}
+
+void MythEventHandler::ClearRecordingChangeEvents()
+{
+  m_imp->Lock();
+  m_imp->m_recordingChangeEventList.clear();
+  m_imp->Unlock();
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythEventHandler.h	2013-03-12 10:51:22.000000000 +0000
@@ -21,6 +21,8 @@
 
 #include "platform/util/StdString.h"
 
+#include <ctime>
+
 #include <boost/shared_ptr.hpp>
 
 extern "C" {
@@ -30,16 +32,24 @@
 class MythRecorder;
 class MythSignal;
 class MythFile;
+class MythProgramInfo;
+
+#include "MythProgramInfo.h"
 
 template <class T> class MythPointer;
 
-class MythEventHandler 
+class MythEventObserver
 {
 public:
-  MythEventHandler();
-  MythEventHandler(const CStdString &server, unsigned short port);
+  // Request to stop Live TV
+  virtual void CloseLiveStream() = 0;
+};
 
-  bool TryReconnect();
+class MythEventHandler
+{
+public:
+  MythEventHandler(const CStdString &server, unsigned short port);
+  void RegisterObserver(MythEventObserver *observer);
 
   void PreventLiveChainUpdate();
   void AllowLiveChainUpdate();
@@ -51,9 +61,63 @@
   void EnablePlayback();
   void DisablePlayback();
   bool IsPlaybackActive() const;
+  bool IsListening() const;
+
+  //Recordings change events
+  enum RecordingChangeType
+  {
+    CHANGE_ALL = 0,
+    CHANGE_ADD = 1,
+    CHANGE_UPDATE,
+    CHANGE_DELETE
+  };
+
+  class RecordingChangeEvent
+  {
+  public:
+    RecordingChangeEvent(RecordingChangeType type, unsigned int chanid, char *recstartts)
+      : m_type(type)
+      , m_channelID(chanid)
+      , m_recordStartTimeSlot(0)
+    {
+      if (recstartts) {
+        MythTimestamp time(recstartts, false);
+        m_recordStartTimeSlot = time.UnixTime();
+      }
+    }
+
+    RecordingChangeEvent(RecordingChangeType type, const MythProgramInfo &prog)
+      : m_type(type)
+      , m_channelID(0)
+      , m_recordStartTimeSlot(0)
+      , m_prog(prog)
+    {
+    }
+
+    RecordingChangeEvent(RecordingChangeType type)
+      : m_type(type)
+      , m_channelID(0)
+      , m_recordStartTimeSlot(0)
+    {
+    }
+
+    RecordingChangeType Type() const { return m_type; }
+    unsigned int ChannelID() const { return m_channelID; };
+    time_t RecordingStartTimeslot() const { return m_recordStartTimeSlot; }
+    MythProgramInfo Program() const { return m_prog; }
+
+  private:
+    RecordingChangeType m_type;
+    unsigned int m_channelID;     // ADD and DELETE
+    time_t m_recordStartTimeSlot; // ADD and DELETE
+    MythProgramInfo m_prog;       // UPDATE
+  };
+
+  bool HasRecordingChangeEvent() const;
+  RecordingChangeEvent NextRecordingChangeEvent();
+  void ClearRecordingChangeEvents();
 
 private:
   class MythEventHandlerPrivate; // Needs to be within MythEventHandler to inherit friend permissions
   boost::shared_ptr<MythEventHandlerPrivate> m_imp; // Private Implementation
-  int m_retryCount;
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -51,11 +51,11 @@
 void MythFile::UpdateLength(unsigned long long length)
 {
   int retval = 0;
-  retval = cmyth_update_file_length(*m_file_t, length);
+  retval = cmyth_file_update_length(*m_file_t, length);
   (void)retval;
 }
 
-int MythFile::Read(void *buffer, unsigned long length)
+int MythFile::Read(void *buffer, unsigned int length)
 {
   int bytesRead;
   bytesRead = cmyth_file_read(*m_file_t, static_cast< char * >(buffer), length);
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythFile.h	2013-03-12 10:51:22.000000000 +0000
@@ -38,7 +38,7 @@
   unsigned long long Length();
   void UpdateLength(unsigned long long length);
 
-  int Read(void *buffer, unsigned long length);
+  int Read(void *buffer, unsigned int length);
   long long Seek(long long offset, int whence);
   unsigned long long Position();
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -24,11 +24,17 @@
 
 MythProgramInfo::MythProgramInfo()
   : m_proginfo_t()
+  , m_framerate(-1)
+  , m_coverart("")
+  , m_fanart("")
 {
 }
 
 MythProgramInfo::MythProgramInfo(cmyth_proginfo_t cmyth_proginfo)
   : m_proginfo_t(new MythPointer<cmyth_proginfo_t>())
+  , m_framerate(-1)
+  , m_coverart("")
+  , m_fanart("")
 {
   *m_proginfo_t = cmyth_proginfo;
 }
@@ -40,26 +46,15 @@
   return *m_proginfo_t == NULL;
 }
 
-CStdString MythProgramInfo::StrUID()
+CStdString MythProgramInfo::UID()
 {
-  // Creates unique IDs from ChannelID, RecordID and StartTime like "100_200_2011-12-10T12:00:00"
-  char buf[40] = "";
-  sprintf(buf, "%d_%ld_", ChannelID(), RecordID());
-  time_t starttime = RecordingStartTime();
-  strftime(buf + strlen(buf), 20, "%Y-%m-%dT%H:%M:%S", localtime(&starttime));
+  // Creates unique IDs from ChannelID, StartTime and RecordID like "100_2011-12-10T12:00:00_247"
+  char buf[50] = "";
+  MythTimestamp time(RecordingStartTime());
+  sprintf(buf, "%u_%s_%u", ChannelID(), time.String().c_str(), RecordID());
   return CStdString(buf);
 }
 
-long long MythProgramInfo::UID()
-{
-  long long retval = RecordingStartTime();
-  retval <<= 32;
-  retval += ChannelID();
-  if (retval > 0)
-    retval = -retval;
-  return retval;
-}
-
 CStdString MythProgramInfo::ProgramID()
 {
   char* progId = cmyth_proginfo_programid(*m_proginfo_t);
@@ -68,18 +63,11 @@
   return retval;
 }
 
-CStdString MythProgramInfo::Title(bool subtitleEncoded)
+CStdString MythProgramInfo::Title()
 {
   char* title = cmyth_proginfo_title(*m_proginfo_t);
   CStdString retval(title);
   ref_release(title);
-
-  if (subtitleEncoded)
-  {
-    CStdString subtitle = Subtitle();
-    if (!subtitle.empty())
-      retval.Format("%s - %s", retval, subtitle);
-  }
   return retval;
 }
 
@@ -91,7 +79,7 @@
   return retval;
 }
 
-CStdString MythProgramInfo::Path()
+CStdString MythProgramInfo::BaseName()
 {
   char* path = cmyth_proginfo_pathname(*m_proginfo_t);
   CStdString retval(path);
@@ -149,7 +137,28 @@
   return (recording_flags & 0x00000080) != 0; // FL_DELETEPENDING
 }
 
-int MythProgramInfo::ChannelID()
+bool MythProgramInfo::HasBookmark()
+{
+  unsigned long recording_flags = cmyth_proginfo_flags(*m_proginfo_t);
+  return (recording_flags & 0x00000010) != 0; // FL_BOOKMARK
+}
+
+bool MythProgramInfo::IsVisible()
+{
+  // Filter out recording of special storage groups (like LiveTV or Deleted)
+
+  // When  deleting a recording, it might not be deleted immediately but marked as 'pending delete'.
+  // Depending on the protocol version the recording is moved to the group Deleted or
+  // the 'delete pending' flag is set
+  if (RecordingGroup() == "LiveTV" || RecordingGroup() == "Deleted" || IsDeletePending())
+  {
+    return false;
+  }
+
+  return true;
+}
+
+unsigned int MythProgramInfo::ChannelID()
 {
   return cmyth_proginfo_chan_id(*m_proginfo_t);
 }
@@ -175,7 +184,7 @@
   return retval;
 }
 
-unsigned long MythProgramInfo::RecordID()
+unsigned int MythProgramInfo::RecordID()
 {
   return cmyth_proginfo_recordid(*m_proginfo_t);
 }
@@ -198,3 +207,28 @@
 {
   return cmyth_proginfo_priority(*m_proginfo_t); // Might want to use recpriority2 instead
 }
+
+void MythProgramInfo::SetFramerate(const long long framerate)
+{
+  m_framerate = framerate;
+}
+
+long long MythProgramInfo::Framterate() const
+{
+  return m_framerate;
+}
+
+CStdString MythProgramInfo::IconPath()
+{
+  return (BaseName() + ".png");
+}
+
+CStdString MythProgramInfo::Coverart() const
+{
+  return m_coverart;
+}
+
+CStdString MythProgramInfo::Fanart() const
+{
+  return m_fanart;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythProgramInfo.h	2013-03-12 10:51:22.000000000 +0000
@@ -19,6 +19,8 @@
  *
  */
 
+#include "MythTimestamp.h"
+
 #include "platform/util/StdString.h"
 
 #include <boost/shared_ptr.hpp>
@@ -41,12 +43,11 @@
 
   bool IsNull() const;
 
-  CStdString StrUID();
-  long long UID();
+  CStdString UID();
   CStdString ProgramID();
-  CStdString Title(bool subtitleEncoded);
+  CStdString Title();
   CStdString Subtitle();
-  CStdString Path();
+  CStdString BaseName();
   CStdString Description();
   int Duration();
   CStdString Category();
@@ -54,17 +55,33 @@
   time_t EndTime();
   bool IsWatched();
   bool IsDeletePending();
+  bool HasBookmark();
+  bool IsVisible();
 
-  int ChannelID();
+  unsigned int ChannelID();
   CStdString ChannelName();
 
   RecordStatus Status();
   CStdString RecordingGroup();
-  unsigned long RecordID();
+  unsigned int RecordID();
   time_t RecordingStartTime();
   time_t RecordingEndTime();
   int Priority();
 
+  void SetFramerate(const long long framerate);
+  long long Framterate() const;
+
+  CStdString IconPath();
+  CStdString Coverart() const;
+  CStdString Fanart() const;
+
 private:
   boost::shared_ptr<MythPointer<cmyth_proginfo_t> > m_proginfo_t;
+
+  // Cached PVR attributes
+  long long m_framerate;
+
+  // Artworks
+  CStdString m_coverart;
+  CStdString m_fanart;
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -51,22 +51,22 @@
 void MythRecorder::Lock()
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Recorder Lock %i", m_recorder_t.get());
+    XBMC->Log(LOG_DEBUG, "Recorder Lock %u", m_recorder_t.get());
   m_recorder_t->Lock();
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Recorder Lock acquired %i", m_recorder_t.get());
+    XBMC->Log(LOG_DEBUG, "Recorder Lock acquired %u", m_recorder_t.get());
 }
 
 void MythRecorder::Unlock()
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "Recorder Unlock %i", m_recorder_t.get());
+    XBMC->Log(LOG_DEBUG, "Recorder Unlock %u", m_recorder_t.get());
   m_recorder_t->Unlock();
 }
 
-int MythRecorder::ID()
+unsigned int MythRecorder::ID()
 {
-  int retval = 0;
+  unsigned int retval = 0;
   Lock();
   retval = cmyth_recorder_get_recorder_id(*m_recorder_t);
   Unlock();
@@ -91,11 +91,20 @@
   return retval == 1;
 }
 
+bool MythRecorder::CancelNextRecording(bool cancel)
+{
+  int retval = 0;
+  Lock();
+  retval = cmyth_recorder_cancel_next_recording(*m_recorder_t, cancel ? 1 : 0);
+  Unlock();
+  return retval == 1;
+}
+
 bool MythRecorder::IsTunable(MythChannel &channel)
 {
   Lock();
 
-  XBMC->Log(LOG_DEBUG, "%s: called for recorder %i, channel %i", __FUNCTION__, ID(), channel.ID());
+  XBMC->Log(LOG_DEBUG, "%s: called for recorder %u, channel %u", __FUNCTION__, ID(), channel.ID());
 
   cmyth_inputlist_t inputlist = cmyth_get_free_inputlist(*m_recorder_t);
 
@@ -103,19 +112,19 @@
   for (int i = 0; i < inputlist->input_count; ++i)
   {
     cmyth_input_t input = inputlist->input_list[i];
-    if ((int)input->sourceid != channel.SourceID())
+    if (input->sourceid != channel.SourceID())
     {
-      XBMC->Log(LOG_DEBUG, "%s: skip input, source id differs (channel: %i, input: %i)", __FUNCTION__, channel.SourceID(), input->sourceid);
+      XBMC->Log(LOG_DEBUG, "%s: skip input, source id differs (channel: %u, input: %u)", __FUNCTION__, channel.SourceID(), input->sourceid);
       continue;
     }
 
-    if (input->multiplexid && (int)input->multiplexid != channel.MultiplexID())
+    if (input->multiplexid && input->multiplexid != channel.MultiplexID())
     {
-      XBMC->Log(LOG_DEBUG, "%s: skip input, multiplex id id differs (channel: %i, input: %i)", __FUNCTION__, channel.MultiplexID(), input->multiplexid);
+      XBMC->Log(LOG_DEBUG, "%s: skip input, multiplex id id differs (channel: %u, input: %u)", __FUNCTION__, channel.MultiplexID(), input->multiplexid);
       continue;
     }
 
-    XBMC->Log(LOG_DEBUG,"%s: using recorder, input is tunable: source id: %i, multiplex id: channel: %i, input: %i)", __FUNCTION__, channel.SourceID(), channel.MultiplexID(), input->multiplexid);
+    XBMC->Log(LOG_DEBUG,"%s: using recorder, input is tunable: source id: %u, multiplex id: channel: %u, input: %u)", __FUNCTION__, channel.SourceID(), channel.MultiplexID(), input->multiplexid);
 
     ret = true;
     break;
@@ -142,6 +151,7 @@
 
 bool MythRecorder::SpawnLiveTV(MythChannel &channel)
 {
+  bool ret = false;
   char* pErr = NULL;
 
   Lock();
@@ -150,30 +160,42 @@
   *m_liveChainUpdated = 0;
   cmyth_recorder_t recorder = NULL;
   recorder = cmyth_spawn_live_tv(*m_recorder_t, 64*1024, 64*1024, MythRecorder::prog_update_callback, &pErr, const_cast<char*>(channel.Number().c_str()));
-  *m_recorder_t = recorder;
 
-  if (pErr == NULL) {
-    /* Wait for chain update for 30s before break */
+  if (recorder && pErr == NULL) {
+    *m_recorder_t = recorder;
+    // Wait for chain update for 30s before break
     int i = 0;
     while (*m_liveChainUpdated == 0 && i < 30000) {
-      /* Release the latch to allow chain update */
+      // Release the latch to allow chain update
       Unlock();
       usleep(100000);
-      /* Gets the latch before read chain status */
+      // Gets the latch before read chain status
       Lock();
       i += 100;
       XBMC->Log(LOG_DEBUG, "%s: Delay channel switch: %d", __FUNCTION__, i);
     }
     if (*m_liveChainUpdated == 0)
-      pErr = const_cast<char*>("Chain update failed.");
+    {
+      XBMC->Log(LOG_ERROR,"%s - Chain update failed", __FUNCTION__);
+      XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30304)); // No response from MythTV backend
+    }
+    else
+      ret = true;
+  }
+  else
+  {
+    // Dereference recorder to cancel callback
+    *m_recorder_t = NULL;
+    // Chain setup fails. Stop existing recorder
+    ref_release(recorder);
+    if (pErr)
+      XBMC->Log(LOG_ERROR,"%s - %s", __FUNCTION__, pErr);
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30306)); // Recorder unavailable
   }
 
   Unlock();
-  ASSERT(*m_recorder_t);
 
-  if (pErr)
-    XBMC->Log(LOG_ERROR,"%s - %s", __FUNCTION__, pErr);
-  return pErr == NULL;
+  return ret;
 }
 
 bool MythRecorder::SetChannel(MythChannel &channel)
@@ -182,7 +204,7 @@
 
   if (!IsRecording())
   {
-    XBMC->Log(LOG_ERROR, "%s: Recorder %i is not recording", __FUNCTION__, ID(), const_cast<char*>(channel.Name().c_str()));
+    XBMC->Log(LOG_ERROR, "%s: Recorder %u is not recording", __FUNCTION__, ID(), const_cast<char*>(channel.Name().c_str()));
     // m_recorder_t->Unlock();
     Unlock();
     return false;
@@ -192,7 +214,7 @@
 
   if (cmyth_recorder_pause(*m_recorder_t) != 0)
   {
-    XBMC->Log(LOG_ERROR, "%s: Failed to pause recorder %i", __FUNCTION__, ID());
+    XBMC->Log(LOG_ERROR, "%s: Failed to pause recorder %u", __FUNCTION__, ID());
     // m_recorder_t->Unlock();
     Unlock();
     return false;
@@ -200,7 +222,7 @@
 
   if (!CheckChannel(channel))
   {
-    XBMC->Log(LOG_ERROR, "%s: Recorder %i doesn't provide channel %s", __FUNCTION__, ID(), channel.Name().c_str());
+    XBMC->Log(LOG_ERROR, "%s: Recorder %u doesn't provide channel %s", __FUNCTION__, ID(), channel.Name().c_str());
     // m_recorder_t->Unlock();
     Unlock();
     return false;
@@ -208,7 +230,7 @@
 
   if (cmyth_recorder_set_channel(*m_recorder_t,channelNum.GetBuffer())!=0)
   {
-    XBMC->Log(LOG_ERROR, "%s: Failed to change recorder %i to channel %s", __FUNCTION__, ID(), channel.Name().c_str());
+    XBMC->Log(LOG_ERROR, "%s: Failed to change recorder %u to channel %s", __FUNCTION__, ID(), channel.Name().c_str());
     // m_recorder_t->Unlock();
     Unlock();
     return false;
@@ -216,7 +238,7 @@
 
   if (cmyth_livetv_chain_switch_last(*m_recorder_t) != 1)
   {
-    XBMC->Log(LOG_ERROR,"%s: Failed to switch chain for recorder %i", __FUNCTION__, ID(), channel.Name().c_str());
+    XBMC->Log(LOG_ERROR,"%s: Failed to switch chain for recorder %u", __FUNCTION__, ID(), channel.Name().c_str());
     // m_recorder_t->Unlock();
     Unlock();
     return false;
@@ -256,7 +278,7 @@
   Unlock();
   if (retval != 0)
     XBMC->Log(LOG_ERROR, "LiveTVWatch failed: %s", msg.c_str());
-  return retval == 0;
+  return retval >= 0;
 }
 
 /* JLB
@@ -271,7 +293,7 @@
   Unlock();
   if (retval != 0)
     XBMC->Log(LOG_ERROR, "LiveTVDoneRecording failed: %s", msg.c_str());
-  return retval == 0;
+  return retval >= 0;
 }
 
 bool MythRecorder::LiveTVChainUpdate(const CStdString &chainid)
@@ -286,10 +308,10 @@
     XBMC->Log(LOG_ERROR,"LiveTVChainUpdate failed on chainID: %s", chainid.c_str());
   else
     *m_liveChainUpdated = 1;
-  return retval == 0;
+  return retval >= 0;
 }
 
-int MythRecorder::ReadLiveTV(void *buffer, unsigned long length)
+int MythRecorder::ReadLiveTV(void *buffer, unsigned int length)
 {
   /* Unlocked: LiveTV stream has its own control connection */
   int bytesRead = 0;
@@ -320,7 +342,7 @@
   Lock();
   retval = cmyth_recorder_stop_livetv(*m_recorder_t);
   Unlock();
-  return retval == 0;
+  return retval >= 0;
 }
 
 void MythRecorder::prog_update_callback(cmyth_proginfo_t prog)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecorder.h	2013-03-12 10:51:22.000000000 +0000
@@ -44,10 +44,11 @@
   void Lock();
   void Unlock();
 
-  int ID();
+  unsigned int ID();
   MythProgramInfo GetCurrentProgram();
 
   bool IsRecording();
+  bool CancelNextRecording(bool cancel);
   bool IsTunable(MythChannel &channel);
   bool CheckChannel(MythChannel &channel);
 
@@ -56,7 +57,7 @@
   bool LiveTVWatch(const CStdString &msg);
   bool LiveTVDoneRecording(const CStdString &msg);
   bool LiveTVChainUpdate(const CStdString &chainid);
-  int ReadLiveTV(void *buffer, unsigned long length);
+  int ReadLiveTV(void *buffer, unsigned int length);
   long long LiveTVSeek(long long offset, int whence);
   long long LiveTVDuration();
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,364 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "MythRecordingRule.h"
+#include "MythPointer.h"
+
+MythRecordingRule::MythRecordingRule()
+  : m_recordingrule_t(new MythPointer<cmyth_recordingrule_t>())
+{
+  *m_recordingrule_t = cmyth_recordingrule_init();
+}
+
+MythRecordingRule::MythRecordingRule(cmyth_recordingrule_t cmyth_recordingrule)
+  : m_recordingrule_t(new MythPointer<cmyth_recordingrule_t>())
+{
+  *m_recordingrule_t = cmyth_recordingrule;
+}
+
+bool MythRecordingRule::IsNull() const
+{
+  if (m_recordingrule_t == NULL)
+    return true;
+  return *m_recordingrule_t == NULL;
+}
+
+unsigned int MythRecordingRule::RecordID() const
+{
+  return cmyth_recordingrule_recordid(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetRecordID(unsigned int recordid)
+{
+  cmyth_recordingrule_set_recordid(*m_recordingrule_t, recordid);
+}
+
+unsigned int MythRecordingRule::ChannelID() const
+{
+  return cmyth_recordingrule_chanid(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetChannelID(unsigned int chanid)
+{
+  cmyth_recordingrule_set_chanid(*m_recordingrule_t, chanid);
+}
+
+CStdString MythRecordingRule::Callsign() const
+{
+  char *buf = cmyth_recordingrule_callsign(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetCallsign(const CStdString &channame)
+{
+  cmyth_recordingrule_set_callsign(*m_recordingrule_t, const_cast<char*>(channame.c_str()));
+}
+
+time_t MythRecordingRule::StartTime() const
+{
+  return cmyth_recordingrule_starttime(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetStartTime(time_t starttime)
+{
+  cmyth_recordingrule_set_starttime(*m_recordingrule_t, starttime);
+}
+
+time_t MythRecordingRule::EndTime() const
+{
+  return cmyth_recordingrule_endtime(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetEndTime(time_t endtime)
+{
+  cmyth_recordingrule_set_endtime(*m_recordingrule_t, endtime);
+}
+
+CStdString MythRecordingRule::Title() const
+{
+  char *buf = cmyth_recordingrule_title(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetTitle(const CStdString &title)
+{
+  cmyth_recordingrule_set_title(*m_recordingrule_t, const_cast<char*>(title.c_str()));
+}
+
+CStdString MythRecordingRule::Subtitle() const
+{
+  char *buf = cmyth_recordingrule_subtitle(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetSubtitle(const CStdString &subtitle)
+{
+  cmyth_recordingrule_set_subtitle(*m_recordingrule_t, const_cast<char*>(subtitle.c_str()));
+}
+
+CStdString MythRecordingRule::Description() const
+{
+  char *buf = cmyth_recordingrule_description(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetDescription(const CStdString &description)
+{
+  cmyth_recordingrule_set_description(*m_recordingrule_t, const_cast<char*>(description.c_str()));
+}
+
+MythRecordingRule::RuleType MythRecordingRule::Type() const
+{
+  return static_cast<RuleType>(cmyth_recordingrule_type(*m_recordingrule_t));
+}
+
+void MythRecordingRule::SetType(MythRecordingRule::RuleType type)
+{
+  cmyth_recordingrule_set_type(*m_recordingrule_t, type);
+}
+
+CStdString MythRecordingRule::Category() const
+{
+  char *buf = cmyth_recordingrule_category(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetCategory(const CStdString &category)
+{
+  cmyth_recordingrule_set_category(*m_recordingrule_t, const_cast<char*>(category.c_str()));
+}
+
+int MythRecordingRule::StartOffset() const
+{
+  return cmyth_recordingrule_startoffset(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetStartOffset(int startoffset)
+{
+  cmyth_recordingrule_set_startoffset(*m_recordingrule_t, startoffset);
+}
+
+int MythRecordingRule::EndOffset() const
+{
+  return cmyth_recordingrule_endoffset(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetEndOffset(int endoffset)
+{
+  cmyth_recordingrule_set_endoffset(*m_recordingrule_t, endoffset);
+}
+
+int MythRecordingRule::Priority() const
+{
+  return cmyth_recordingrule_recpriority(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetPriority(int priority)
+{
+  cmyth_recordingrule_set_recpriority(*m_recordingrule_t, priority);
+}
+
+bool MythRecordingRule::Inactive() const
+{
+  return (cmyth_recordingrule_inactive(*m_recordingrule_t) == 1);
+}
+
+void MythRecordingRule::SetInactive(bool inactive)
+{
+  cmyth_recordingrule_set_inactive(*m_recordingrule_t, (inactive ? 1 : 0));
+}
+
+MythRecordingRule::RuleSearchType MythRecordingRule::SearchType() const
+{
+  return static_cast<RuleSearchType>(cmyth_recordingrule_searchtype(*m_recordingrule_t));
+}
+
+void MythRecordingRule::SetSearchType(MythRecordingRule::RuleSearchType searchtype)
+{
+  cmyth_recordingrule_set_searchtype(*m_recordingrule_t, searchtype);
+}
+
+MythRecordingRule::RuleDuplicateControlMethod  MythRecordingRule::DuplicateControlMethod() const
+{
+  return static_cast<RuleDuplicateControlMethod>(cmyth_recordingrule_dupmethod(*m_recordingrule_t));
+}
+
+void  MythRecordingRule::SetDuplicateControlMethod( MythRecordingRule::RuleDuplicateControlMethod method)
+{
+  cmyth_recordingrule_set_dupmethod(*m_recordingrule_t, method);
+}
+
+MythRecordingRule::RuleCheckDuplicatesInType  MythRecordingRule::CheckDuplicatesInType() const
+{
+  return static_cast<RuleCheckDuplicatesInType>(cmyth_recordingrule_dupin(*m_recordingrule_t));
+}
+
+void  MythRecordingRule::SetCheckDuplicatesInType(MythRecordingRule::RuleCheckDuplicatesInType in)
+{
+  cmyth_recordingrule_set_dupin(*m_recordingrule_t, in);
+}
+
+CStdString  MythRecordingRule::RecordingGroup() const
+{
+  char *buf = cmyth_recordingrule_recgroup(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetRecordingGroup(const CStdString &group)
+{
+  cmyth_recordingrule_set_recgroup(*m_recordingrule_t, const_cast<char*>(group.c_str()));
+}
+
+CStdString  MythRecordingRule::StorageGroup() const
+{
+  char *buf = cmyth_recordingrule_storagegroup(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void MythRecordingRule::SetStorageGroup(const CStdString &group)
+{
+  cmyth_recordingrule_set_storagegroup(*m_recordingrule_t, const_cast<char*>(group.c_str()));
+}
+
+CStdString  MythRecordingRule::PlaybackGroup() const
+{
+  char *buf = cmyth_recordingrule_playgroup(*m_recordingrule_t);
+  CStdString retval(buf);
+  ref_release(buf);
+  return retval;
+}
+
+void  MythRecordingRule::SetPlaybackGroup(const CStdString &group)
+{
+  cmyth_recordingrule_set_playgroup(*m_recordingrule_t, const_cast<char*>(group.c_str()));
+}
+
+bool  MythRecordingRule::AutoTranscode() const
+{
+  return (cmyth_recordingrule_autotranscode(*m_recordingrule_t) == 1);
+}
+
+void  MythRecordingRule::SetAutoTranscode(bool enable)
+{
+  cmyth_recordingrule_set_autotranscode(*m_recordingrule_t, (enable ? 1 : 0));
+}
+
+bool MythRecordingRule::UserJob(int jobnumber) const
+{
+  if (jobnumber < 1 || jobnumber > 4)
+    return false;
+  return ((cmyth_recordingrule_userjobs(*m_recordingrule_t) & (1 << (jobnumber - 1))) == 1);
+}
+
+void MythRecordingRule::SetUserJob(int jobnumber, bool enable)
+{
+  if (jobnumber < 1 || jobnumber > 4)
+    return;
+  int jobs = cmyth_recordingrule_userjobs(*m_recordingrule_t);
+  if (enable)
+    jobs |= 1 << (jobnumber - 1);
+  else
+    jobs &= ~(1 << (jobnumber - 1));
+  cmyth_recordingrule_set_userjobs(*m_recordingrule_t, jobs);
+}
+
+unsigned short MythRecordingRule::UserJobs() const
+{
+  return cmyth_recordingrule_userjobs(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetUserJobs(unsigned short jobs)
+{
+  cmyth_recordingrule_set_userjobs(*m_recordingrule_t, (uint8_t)jobs);
+}
+
+bool  MythRecordingRule::AutoMetadata() const
+{
+  return (cmyth_recordingrule_autometadata(*m_recordingrule_t) == 1);
+}
+
+void  MythRecordingRule::SetAutoMetadata(bool enable)
+{
+  cmyth_recordingrule_set_autometadata(*m_recordingrule_t, (enable ? 1 : 0));
+}
+
+bool  MythRecordingRule::AutoCommFlag() const
+{
+  return (cmyth_recordingrule_autocommflag(*m_recordingrule_t) == 1);
+}
+
+void  MythRecordingRule::SetAutoCommFlag(bool enable)
+{
+  cmyth_recordingrule_set_autocommflag(*m_recordingrule_t, (enable ? 1 : 0));
+}
+
+bool  MythRecordingRule::AutoExpire() const
+{
+  return (cmyth_recordingrule_autoexpire(*m_recordingrule_t) > 0);
+}
+
+void  MythRecordingRule::SetAutoExpire(bool enable)
+{
+  cmyth_recordingrule_set_autoexpire(*m_recordingrule_t, (enable ? 1 : 0));
+}
+
+int  MythRecordingRule::MaxEpisodes() const
+{
+  return cmyth_recordingrule_maxepisodes(*m_recordingrule_t);
+}
+
+void  MythRecordingRule::SetMaxEpisodes(int max)
+{
+  cmyth_recordingrule_set_maxepisodes(*m_recordingrule_t, max);
+}
+
+bool  MythRecordingRule::NewExpiresOldRecord() const
+{
+  return (cmyth_recordingrule_maxnewest(*m_recordingrule_t) > 0);
+}
+
+void  MythRecordingRule::SetNewExpiresOldRecord(bool enable)
+{
+  cmyth_recordingrule_set_maxnewest(*m_recordingrule_t, (enable ? 1 :0));
+}
+
+unsigned int MythRecordingRule::Transcoder() const
+{
+  return cmyth_recordingrule_transcoder(*m_recordingrule_t);
+}
+
+void MythRecordingRule::SetTranscoder(unsigned int transcoder)
+{
+  cmyth_recordingrule_set_transcoder(*m_recordingrule_t, transcoder);
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythRecordingRule.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,174 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "platform/util/StdString.h"
+
+#include <boost/shared_ptr.hpp>
+
+extern "C" {
+#include <cmyth/cmyth.h>
+};
+
+template <class T> class MythPointer;
+
+class MythRecordingRule
+{
+  friend class MythDatabase;
+
+public:
+  enum RuleType
+  {
+    NotRecording = 0,
+    SingleRecord = 1,
+    TimeslotRecord,
+    ChannelRecord,
+    AllRecord,
+    WeekslotRecord,
+    FindOneRecord,
+    OverrideRecord,
+    DontRecord,
+    FindDailyRecord,
+    FindWeeklyRecord,
+    TemplateRecord
+  };
+
+  enum RuleSearchType
+  {
+    NoSearch = 0,
+    PowerSearch,
+    TitleSearch,
+    KeywordSearch,
+    PeopleSearch,
+    ManualSearch
+  };
+
+  enum RuleDuplicateControlMethod
+  {
+    CheckNone                    = 0x01,
+    CheckSubtitle                = 0x02,
+    CheckDescription             = 0x04,
+    CheckSubtitleAndDescription  = 0x06,
+    CheckSubtitleThenDescription = 0x08
+  };
+
+  enum RuleCheckDuplicatesInType
+  {
+    InRecorded    = 0x01,
+    InOldRecorded = 0x02,
+    InAll         = 0x0F,
+    NewEpi        = 0x10
+  };
+
+  MythRecordingRule();
+  MythRecordingRule(cmyth_recordingrule_t cmyth_recordingrule);
+
+  bool IsNull() const;
+
+  unsigned int RecordID() const;
+  void SetRecordID(unsigned int recordid);
+
+  unsigned int ChannelID() const;
+  void SetChannelID(unsigned int channelid);
+
+  CStdString Callsign() const;
+  void SetCallsign(const CStdString &callsign);
+
+  time_t StartTime() const;
+  void SetStartTime(time_t starttime);
+
+  time_t EndTime() const;
+  void SetEndTime(time_t endtime);
+
+  CStdString Title() const;
+  void SetTitle(const CStdString &title);
+
+  CStdString Subtitle() const;
+  void SetSubtitle(const CStdString &subtitle);
+
+  CStdString Description() const;
+  void SetDescription(const CStdString &description);
+
+  RuleType Type() const;
+  void SetType(RuleType type);
+
+  CStdString Category() const;
+  void SetCategory(const CStdString &category);
+
+  int StartOffset() const;
+  void SetStartOffset(int startoffset);
+
+  int EndOffset() const;
+  void SetEndOffset(int endoffset);
+
+  int Priority() const;
+  void SetPriority(int priority);
+
+  bool Inactive() const;
+  void SetInactive(bool inactive);
+
+  RuleSearchType SearchType() const;
+  void SetSearchType(RuleSearchType searchtype);
+
+  RuleDuplicateControlMethod DuplicateControlMethod() const;
+  void SetDuplicateControlMethod(RuleDuplicateControlMethod method);
+
+  RuleCheckDuplicatesInType CheckDuplicatesInType() const;
+  void SetCheckDuplicatesInType(RuleCheckDuplicatesInType in);
+
+  CStdString RecordingGroup() const;
+  void SetRecordingGroup(const CStdString &group);
+
+  CStdString StorageGroup() const;
+  void SetStorageGroup(const CStdString &group);
+
+  CStdString PlaybackGroup() const;
+  void SetPlaybackGroup(const CStdString &group);
+
+  bool AutoTranscode() const;
+  void SetAutoTranscode(bool enable);
+
+  bool UserJob(int jobnumber) const;
+  void SetUserJob(int jobnumber, bool enable);
+
+  unsigned short UserJobs() const;
+  void SetUserJobs(unsigned short jobs);
+
+  bool AutoMetadata() const;
+  void SetAutoMetadata(bool enable);
+
+  bool AutoCommFlag() const;
+  void SetAutoCommFlag(bool enable);
+
+  bool AutoExpire() const;
+  void SetAutoExpire(bool enable);
+
+  int MaxEpisodes() const;
+  void SetMaxEpisodes(int max);
+
+  bool NewExpiresOldRecord() const;
+  void SetNewExpiresOldRecord(bool enable);
+
+  unsigned int Transcoder() const;
+  void SetTranscoder(unsigned int transcoder);
+
+private:
+  boost::shared_ptr<MythPointer<cmyth_recordingrule_t> > m_recordingrule_t;
+};
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -55,7 +55,7 @@
   return m_UNC;
 }
 
-int MythSignal::ID() const
+unsigned int MythSignal::ID() const
 {
   return m_ID;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythSignal.h	2013-03-12 10:51:22.000000000 +0000
@@ -33,7 +33,7 @@
   int  Signal() const;              /*!< @brief (optional) signal strength */
   long BER() const;                 /*!< @brief (optional) bit error rate */
   long UNC() const;                 /*!< @brief (optional) uncorrected blocks */
-  int  ID() const;                  /*!< @brief (optional) Recorder ID */
+  unsigned int ID() const;          /*!< @brief (optional) Recorder ID */
 
 private:
   CStdString m_AdapterStatus; /*!< @brief (optional) status of the adapter that's being used */
@@ -41,5 +41,5 @@
   int  m_Signal;              /*!< @brief (optional) signal strength */
   long m_BER;                 /*!< @brief (optional) bit error rate */
   long m_UNC;                 /*!< @brief (optional) uncorrected blocks */
-  int  m_ID;                  /*!< @brief (optional) Recorder ID */
+  unsigned int m_ID;          /*!< @brief (optional) Recorder ID */
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -41,7 +41,7 @@
 
 CStdString MythStorageGroupFile::Filename()
 {
-  char* name = cmyth_storagegroup_file_get_filename(*m_storagegroup_file_t);
+  char* name = cmyth_storagegroup_file_filename(*m_storagegroup_file_t);
   CStdString retval(name);
   ref_release(name);
   return retval;
@@ -49,12 +49,12 @@
 
 unsigned long long MythStorageGroupFile::Size()
 {
-  unsigned long long retval = cmyth_storagegroup_file_get_size(*m_storagegroup_file_t);
+  unsigned long long retval = cmyth_storagegroup_file_size(*m_storagegroup_file_t);
   return retval;
 }
 
-unsigned long MythStorageGroupFile::LastModified()
+time_t MythStorageGroupFile::LastModified()
 {
-  unsigned long retval = cmyth_storagegroup_file_get_lastmodified(*m_storagegroup_file_t);
+  time_t retval = cmyth_storagegroup_file_lastmodified(*m_storagegroup_file_t);
   return retval;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythStorageGroupFile.h	2013-03-12 10:51:22.000000000 +0000
@@ -39,7 +39,7 @@
 
   CStdString Filename();
   unsigned long long Size();
-  unsigned long LastModified();
+  time_t LastModified();
 
 private:
   boost::shared_ptr<MythPointer<cmyth_storagegroup_file_t> > m_storagegroup_file_t;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,419 +0,0 @@
-/*
- *      Copyright (C) 2005-2012 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "MythTimer.h"
-
-extern "C" {
-#include <refmem/refmem.h>
-};
-
-MythTimer::MythTimer()
-  : m_recordid(-1)
-  , m_channelid(-1)
-  , m_callsign("")
-  , m_starttime(0)
-  , m_endtime(0)
-  , m_title("")
-  , m_description("")
-  , m_type(NotRecording)
-  , m_category("")
-  , m_subtitle("")
-  , m_priority(0)
-  , m_startoffset(0)
-  , m_endoffset(0)
-  , m_searchtype(NoSearch)
-  , m_inactive(true)
-  , m_dupmethod(CheckSubtitleAndDescription)
-  , m_dupin(InAll)
-  , m_recgroup("Default")
-  , m_storegroup("Default")
-  , m_playgroup("Default")
-  , m_autotranscode(false)
-  , m_userjobs(0)
-  , m_autocommflag(false)
-  , m_autoexpire(false)
-  , m_maxepisodes(0)
-  , m_maxnewest(0)
-  , m_transcoder(0)
-{
-}
-
-MythTimer::MythTimer(cmyth_timer_t cmyth_timer, bool release)
-  : m_recordid(cmyth_timer_recordid(cmyth_timer))
-  , m_channelid(cmyth_timer_chanid(cmyth_timer))
-  , m_callsign("")
-  , m_starttime(cmyth_timer_starttime(cmyth_timer))
-  , m_endtime(cmyth_timer_endtime(cmyth_timer))
-  , m_title("")
-  , m_description("")
-  , m_type(static_cast<TimerType>(cmyth_timer_type(cmyth_timer)))
-  , m_category("")
-  , m_subtitle("")
-  , m_priority(cmyth_timer_priority(cmyth_timer))
-  , m_startoffset(cmyth_timer_startoffset(cmyth_timer))
-  , m_endoffset(cmyth_timer_endoffset(cmyth_timer))
-  , m_searchtype(static_cast<TimerSearchType>(cmyth_timer_searchtype(cmyth_timer)))
-  , m_inactive(cmyth_timer_inactive(cmyth_timer) != 0)
-  , m_dupmethod(static_cast<TimerDuplicateControlMethod>(cmyth_timer_dup_method(cmyth_timer)))
-  , m_dupin(static_cast<TimerCheckDuplicatesInType>(cmyth_timer_dup_in(cmyth_timer)))
-  , m_recgroup("")
-  , m_storegroup("")
-  , m_playgroup("")
-  , m_autotranscode(cmyth_timer_autotranscode(cmyth_timer) == 1)
-  , m_userjobs(cmyth_timer_userjobs(cmyth_timer))
-  , m_autocommflag(cmyth_timer_autocommflag(cmyth_timer) == 1)
-  , m_autoexpire(cmyth_timer_autoexpire(cmyth_timer) == 1)
-  , m_maxepisodes(cmyth_timer_maxepisodes(cmyth_timer))
-  , m_maxnewest(cmyth_timer_maxnewest(cmyth_timer) == 1)
-  , m_transcoder(cmyth_timer_transcoder(cmyth_timer))
-{
-  char *title = cmyth_timer_title(cmyth_timer);
-  char *description = cmyth_timer_description(cmyth_timer);
-  char *category = cmyth_timer_category(cmyth_timer);
-  char *subtitle = cmyth_timer_subtitle(cmyth_timer);
-  char *callsign = cmyth_timer_callsign(cmyth_timer);
-  char *recgroup = cmyth_timer_rec_group(cmyth_timer);
-  char *storegroup = cmyth_timer_store_group(cmyth_timer);
-  char *playgroup = cmyth_timer_play_group(cmyth_timer);
-
-  m_title = title;
-  m_description = description;
-  m_category = category;
-  m_subtitle = subtitle;
-  m_callsign = callsign;
-  m_recgroup = recgroup;
-  m_storegroup = storegroup;
-  m_playgroup = playgroup;
-
-  ref_release(title);
-  ref_release(description);
-  ref_release(category);
-  ref_release(subtitle);
-  ref_release(callsign);
-  ref_release(recgroup);
-  ref_release(storegroup);
-  ref_release(playgroup);
-
-  if (release)
-    ref_release(cmyth_timer);
-}
-
-int MythTimer::RecordID() const
-{
-  return m_recordid;
-}
-
-void MythTimer::SetRecordID(int recordid)
-{
-  m_recordid = recordid;
-}
-
-int MythTimer::ChannelID() const
-{
-  return m_channelid;
-}
-
-void MythTimer::SetChannelID(int chanid)
-{
-  m_channelid = chanid;
-}
-
-CStdString MythTimer::Callsign() const
-{
-  return m_callsign;
-}
-
-void MythTimer::SetCallsign(const CStdString &channame)
-{
-  m_callsign = channame;
-}
-
-time_t MythTimer::StartTime() const
-{
-  return m_starttime;
-}
-
-void MythTimer::SetStartTime(time_t starttime)
-{
-  m_starttime = starttime;
-}
-
-time_t MythTimer::EndTime() const
-{
-  return m_endtime;
-}
-
-void MythTimer::SetEndTime(time_t endtime)
-{
-  m_endtime = endtime;
-}
-
-CStdString MythTimer::Title(bool subtitleEncoded) const
-{
-  if (subtitleEncoded && !m_subtitle.empty())
-  {
-    CStdString retval;
-    retval.Format("%s::%s", m_title, m_subtitle);
-    return retval;
-  }
-  return m_title;
-}
-
-void MythTimer::SetTitle(const CStdString &title, bool subtitleEncoded)
-{
-  if (subtitleEncoded)
-  {
-    size_t seppos = title.find("::");
-    if (seppos != CStdString::npos)
-    {
-      m_title = title.substr(0, seppos);
-      m_subtitle = title.substr(seppos + 2);
-      return;
-    }
-  }
-  m_title = title;
-}
-
-CStdString MythTimer::Subtitle() const
-{
-  return m_subtitle;
-}
-
-void MythTimer::SetSubtitle(const CStdString &subtitle)
-{
-  m_subtitle = subtitle;
-}
-
-CStdString MythTimer::Description() const
-{
-  return m_description;
-}
-
-void MythTimer::SetDescription(const CStdString &description)
-{
-  m_description = description;
-}
-
-MythTimer::TimerType MythTimer::Type() const
-{
-  return m_type;
-}
-
-void MythTimer::SetType(MythTimer::TimerType type)
-{
-  m_type = type;
-}
-
-CStdString MythTimer::Category() const
-{
-  return m_category;
-}
-
-void MythTimer::SetCategory(const CStdString &category)
-{
-  m_category = category;
-}
-
-int MythTimer::StartOffset() const
-{
-  return m_startoffset;
-}
-
-void MythTimer::SetStartOffset(int startoffset)
-{
-  m_startoffset = startoffset;
-}
-
-int MythTimer::EndOffset() const
-{
-  return m_endoffset;
-}
-
-void MythTimer::SetEndOffset(int endoffset)
-{
-  m_endoffset = endoffset;
-}
-
-int MythTimer::Priority() const
-{
-  return m_priority;
-}
-
-void MythTimer::SetPriority(int priority)
-{
-  m_priority = priority;
-}
-
-bool MythTimer::Inactive() const
-{
-  return m_inactive;
-}
-
-void MythTimer::SetInactive(bool inactive)
-{
-  m_inactive = inactive;
-}
-
-MythTimer::TimerSearchType MythTimer::SearchType() const
-{
-  return m_searchtype;
-}
-
-void MythTimer::SetSearchType(MythTimer::TimerSearchType searchtype)
-{
-  m_searchtype = searchtype;
-}
-
-MythTimer::TimerDuplicateControlMethod  MythTimer::DuplicateControlMethod() const
-{
-  return m_dupmethod;
-}
-
-void  MythTimer::SetDuplicateControlMethod( MythTimer::TimerDuplicateControlMethod method)
-{
-  m_dupmethod = method;
-}
-
-MythTimer::TimerCheckDuplicatesInType  MythTimer::CheckDuplicatesInType() const
-{
-  return m_dupin;
-}
-
-void  MythTimer::SetCheckDuplicatesInType(MythTimer::TimerCheckDuplicatesInType in)
-{
-  m_dupin = in;
-}
-
-CStdString  MythTimer::RecordingGroup() const
-{
-  return m_recgroup;
-}
-
-void MythTimer::SetRecordingGroup(const CStdString &group)
-{
-  m_recgroup = group;
-}
-
-CStdString  MythTimer::StorageGroup() const
-{
-  return m_storegroup;
-}
-
-void MythTimer::SetStorageGroup(const CStdString &group)
-{
-  m_storegroup = group;
-}
-
-CStdString  MythTimer::PlaybackGroup() const
-{
-  return m_playgroup;
-}
-
-void  MythTimer::SetPlaybackGroup(const CStdString &group)
-{
-  m_playgroup = group;
-}
-
-bool  MythTimer::AutoTranscode() const
-{
-  return m_autotranscode;
-}
-
-void  MythTimer::SetAutoTranscode(bool enable)
-{
-  m_autotranscode = enable;
-}
-
-bool MythTimer::UserJob(int jobnumber) const
-{
-  if (jobnumber < 1 || jobnumber > 4)
-    return false;
-  return (m_userjobs & (1 << (jobnumber - 1))) == 1;
-}
-
-void MythTimer::SetUserJob(int jobnumber, bool enable)
-{
-  if (jobnumber < 1 || jobnumber > 4)
-    return;
-  if (enable)
-    m_userjobs |= 1 << (jobnumber - 1);
-  else
-    m_userjobs &= ~(1 << (jobnumber - 1));
-}
-
-int MythTimer::UserJobs() const
-{
-  return m_userjobs;
-}
-
-void MythTimer::SetUserJobs(int jobs)
-{
-  m_userjobs = jobs;
-}
-
-bool  MythTimer::AutoCommFlag() const
-{
-  return m_autocommflag;
-}
-  
-void  MythTimer::SetAutoCommFlag(bool enable)
-{
-  m_autocommflag = enable;
-}
-
-bool  MythTimer::AutoExpire() const
-{
-  return m_autoexpire;
-}
-
-void  MythTimer::SetAutoExpire(bool enable)
-{
-  m_autoexpire = enable;
-}
-
-int  MythTimer::MaxEpisodes() const
-{
-  return m_maxepisodes;
-}
-
-void  MythTimer::SetMaxEpisodes(int max)
-{
-  m_maxepisodes = max;
-}
-
-bool  MythTimer::NewExpiresOldRecord() const
-{
-  return m_maxnewest;
-}
-
-void  MythTimer::SetNewExpiresOldRecord(bool enable)
-{
-  m_maxnewest = enable;
-}
-
-int MythTimer::Transcoder() const
-{
-  return m_transcoder;
-}
-
-void MythTimer::SetTranscoder(int transcoder)
-{
-  m_transcoder = transcoder;
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth/MythTimer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2012 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "platform/util/StdString.h"
-
-extern "C" {
-#include <cmyth/cmyth.h>
-};
-
-class MythTimer
-{
-  friend class MythDatabase;
-
-public:
-  enum TimerType
-  {
-    NotRecording = 0,
-    SingleRecord = 1,
-    TimeslotRecord,
-    ChannelRecord,
-    AllRecord,
-    WeekslotRecord,
-    FindOneRecord,
-    OverrideRecord,
-    DontRecord,
-    FindDailyRecord,
-    FindWeeklyRecord
-  };
-
-  enum TimerSearchType
-  {
-    NoSearch = 0,
-    PowerSearch,
-    TitleSearch,
-    KeywordSearch,
-    PeopleSearch,
-    ManualSearch
-  };
-
-  enum TimerDuplicateControlMethod
-  {
-    CheckNone                    = 0x01,
-    CheckSubtitle                = 0x02,
-    CheckDescription             = 0x04,
-    CheckSubtitleAndDescription  = 0x06,
-    CheckSubtitleThenDescription = 0x08
-  };
-
-  enum TimerCheckDuplicatesInType
-  {
-    InRecorded    = 0x01,
-    InOldRecorded = 0x02,
-    InAll         = 0x0F,
-    NewEpi        = 0x10
-  };
-
-  MythTimer();
-  MythTimer(cmyth_timer_t cmyth_timer, bool release = true);
-
-  int RecordID() const;
-  void SetRecordID(int recordid);
-
-  int ChannelID() const;
-  void SetChannelID(int channelid);
-
-  CStdString Callsign() const;
-  void SetCallsign(const CStdString &callsign);
-
-  time_t StartTime() const;
-  void SetStartTime(time_t starttime);
-
-  time_t EndTime() const;
-  void SetEndTime(time_t endtime);
-
-  CStdString Title(bool subtitleEncoded) const;
-  void SetTitle(const CStdString &title, bool subtitleEncoded);
-
-  CStdString Subtitle() const;
-  void SetSubtitle(const CStdString &subtitle);
-
-  CStdString Description() const;
-  void SetDescription(const CStdString &description);
-
-  TimerType Type() const;
-  void SetType(TimerType type);
-
-  CStdString Category() const;
-  void SetCategory(const CStdString &category);
-
-  int StartOffset() const;
-  void SetStartOffset(int startoffset);
-
-  int EndOffset() const;
-  void SetEndOffset(int endoffset);
-
-  int Priority() const;
-  void SetPriority(int priority);
-
-  bool Inactive() const;
-  void SetInactive(bool inactive);
-
-  TimerSearchType SearchType() const;
-  void SetSearchType(TimerSearchType searchtype);
-
-  TimerDuplicateControlMethod DuplicateControlMethod() const;
-  void SetDuplicateControlMethod(TimerDuplicateControlMethod method);
-
-  TimerCheckDuplicatesInType CheckDuplicatesInType() const;
-  void SetCheckDuplicatesInType(TimerCheckDuplicatesInType in);
-
-  CStdString RecordingGroup() const;
-  void SetRecordingGroup(const CStdString &group);
-
-  CStdString StorageGroup() const;
-  void SetStorageGroup(const CStdString &group);
-
-  CStdString PlaybackGroup() const;
-  void SetPlaybackGroup(const CStdString &group);
-
-  bool AutoTranscode() const;
-  void SetAutoTranscode(bool enable);
-
-  bool UserJob(int jobnumber) const;
-  void SetUserJob(int jobnumber, bool enable);
-
-  int UserJobs() const;
-  void SetUserJobs(int jobs);
-
-  bool AutoCommFlag() const;
-  void SetAutoCommFlag(bool enable);
-
-  bool AutoExpire() const;
-  void SetAutoExpire(bool enable);
-
-  int MaxEpisodes() const;
-  void SetMaxEpisodes(int max);
-
-  bool NewExpiresOldRecord() const;
-  void SetNewExpiresOldRecord(bool enable);
-
-  int Transcoder() const;
-  void SetTranscoder(int transcoder);
-
-private:
-  int m_recordid;
-  int m_channelid;
-  CStdString m_callsign;
-  time_t m_starttime;
-  time_t m_endtime;
-  CStdString m_title;
-  CStdString m_description;
-  TimerType m_type;
-  CStdString m_category;
-  CStdString m_subtitle;
-  int m_priority;
-  int m_startoffset;
-  int m_endoffset;
-  TimerSearchType m_searchtype;
-  bool m_inactive;
-  TimerDuplicateControlMethod m_dupmethod;
-  TimerCheckDuplicatesInType m_dupin;
-  CStdString m_recgroup;
-  CStdString m_storegroup;
-  CStdString m_playgroup;
-  bool m_autotranscode;
-  int m_userjobs;
-  bool m_autocommflag;
-  bool m_autoexpire;
-  int m_maxepisodes;
-  bool m_maxnewest;
-  int m_transcoder;
-};
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/cppmyth.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/cppmyth.h	2013-03-12 10:51:22.000000000 +0000
@@ -8,5 +8,5 @@
 #include "cppmyth/MythProgramInfo.h"
 #include "cppmyth/MythRecorder.h"
 #include "cppmyth/MythSignal.h"
-#include "cppmyth/MythTimer.h"
+#include "cppmyth/MythRecordingRule.h"
 #include "cppmyth/MythTimestamp.h"
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/fileOps.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/fileOps.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/fileOps.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/fileOps.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -73,7 +73,7 @@
   // Determine filename
   CStdString localFilename = m_localBasePath + "channels" + PATH_SEPARATOR_CHAR + GetFileName(remoteFilename, '/');
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s: determined localFilename: %s", __FUNCTION__, localFilename.c_str());
+    XBMC->Log(LOG_DEBUG, "%s: determined localFilename: %s", __FUNCTION__, localFilename.c_str());
 
   if (!XBMC->FileExists(localFilename, true))
   {
@@ -88,7 +88,7 @@
   return localFilename;
 }
 
-CStdString FileOps::GetPreviewIconPath(const CStdString &remoteFilename)
+CStdString FileOps::GetPreviewIconPath(const CStdString &remoteFilename, const CStdString &recordingGroup)
 {
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s: preview icon: %s", __FUNCTION__, remoteFilename.c_str());
@@ -98,84 +98,60 @@
   if (it != m_preview.end())
     return it->second;
 
-  // Determine local filename
-  CStdString localFilename = m_localBasePath + "preview" + PATH_SEPARATOR_CHAR + GetFileName(remoteFilename, '/');
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s: determined localFilename: %s", __FUNCTION__, localFilename.c_str());
+  // Check file exists in storage group
+  MythStorageGroupFile sgfile = m_con.GetStorageGroupFile(recordingGroup, remoteFilename);
 
-  if (!XBMC->FileExists(localFilename, true))
+  // Determine local filename
+  CStdString localFilename;
+  if (!sgfile.IsNull())
   {
-    Lock();
-    FileOps::JobItem job(localFilename, remoteFilename, "Default");
-    m_jobQueue.push_back(job);
-    m_queueContent.Signal();
-    Unlock();
-  }
+    localFilename = m_localBasePath + "preview" + PATH_SEPARATOR_CHAR + GetFileName(remoteFilename, '/');
+    if (g_bExtraDebug)
+      XBMC->Log(LOG_DEBUG, "%s: determined localFilename: %s", __FUNCTION__, localFilename.c_str());
+
+    if (!XBMC->FileExists(localFilename, true))
+    {
+      Lock();
+      FileOps::JobItem job(localFilename, remoteFilename, "Default");
+      m_jobQueue.push_back(job);
+      m_queueContent.Signal();
+      Unlock();
+    }
 
-  m_preview[remoteFilename] = localFilename;
+    m_preview[remoteFilename] = localFilename;
+  }
   return localFilename;
 }
 
-CStdString FileOps::GetArtworkPath(const CStdString &title, FileType fileType)
+CStdString FileOps::GetArtworkPath(const CStdString &remoteFilename, FileType fileType)
 {
-  // Update storage group filelist only once every 30s
-  std::time_t now = 0;
-
-  // Update the list of files in a storage group if the filelist is empty
-  // or the validity timeout has been reached (30s)
-  if (m_StorageGroupFileList.find(fileType) == m_StorageGroupFileList.end() ||
-    std::difftime(now, m_StorageGroupFileListLastUpdated[fileType]) > 30)
-  {
-    if (g_bExtraDebug)
-      XBMC->Log(LOG_DEBUG, "%s Getting storage group file list for type: %s (%s - %s)", __FUNCTION__, GetFolderNameByFileType(fileType), std::asctime(std::localtime(&now)), std::asctime(std::localtime(&m_StorageGroupFileListLastUpdated[fileType])));
-
-    m_StorageGroupFileList[fileType] = m_con.GetStorageGroupFileList(GetFolderNameByFileType(fileType));
-    m_StorageGroupFileListLastUpdated[fileType] = now;
-
-    // Clean the file lists of unwanted files
-    StorageGroupFileList::iterator it = m_StorageGroupFileList[fileType].begin();
-    while (it != m_StorageGroupFileList[fileType].end())
-    {
-      if (g_bExtraDebug)
-        XBMC->Log(LOG_DEBUG, "%s %s - %s", __FUNCTION__, GetFolderNameByFileType(fileType), it->Filename().c_str());
-
-      // Check file extension, if it's not an image, remove the file from storage group
-      size_t extensionPos = it->Filename().find_last_of('.');
-      CStdString extension = it->Filename().substr(extensionPos + 1);
-      if (extension != "jpg" && extension != "png" && extension != "bmp")
-      {
-        it = m_StorageGroupFileList[fileType].erase(it);
-        continue;
-      }
+  if (g_bExtraDebug)
+    XBMC->Log(LOG_DEBUG, "%s: filename: %s, fileType: %s", __FUNCTION__, remoteFilename.c_str(), GetFolderNameByFileType(fileType));
 
-      ++it;
-    }
-  }
+  // Check local directory
+  std::pair<FileType, CStdString> key = std::make_pair(fileType, remoteFilename);
+  std::map<std::pair<FileType, CStdString>, CStdString>::iterator iter = m_artworks.find(key);
+  if (iter != m_artworks.end())
+    return iter->second;
 
-  // Search in the storage group file list
-  StorageGroupFileList::iterator it;
-  for (it = m_StorageGroupFileList[fileType].begin(); it != m_StorageGroupFileList[fileType].end(); ++it)
-  {
-    if (it->Filename().Left(title.GetLength()) == title)
-      break;
-  }
-  if (it == m_StorageGroupFileList[fileType].end())
-  {
-    return ""; // Not found
-  }
+  // Check file exists in storage group
+  MythStorageGroupFile sgfile = m_con.GetStorageGroupFile(GetFolderNameByFileType(fileType), remoteFilename);
 
   // Determine local filename
   CStdString localFilename;
-  localFilename.Format("%u_%s", it->LastModified(), it->Filename());
-  localFilename = m_localBasePath + GetFolderNameByFileType(fileType) + PATH_SEPARATOR_CHAR + localFilename.c_str();
-
-  if (!XBMC->FileExists(localFilename, true))
+  if (!sgfile.IsNull())
   {
-    Lock();
-    FileOps::JobItem job(localFilename, it->Filename(), GetFolderNameByFileType(fileType));
-    m_jobQueue.push_back(job);
-    m_queueContent.Signal();
-    Unlock();
+    localFilename = m_localBasePath + GetFolderNameByFileType(fileType) + PATH_SEPARATOR_CHAR + remoteFilename.c_str();
+
+    if (!XBMC->FileExists(localFilename, true))
+    {
+      Lock();
+        FileOps::JobItem job(localFilename, remoteFilename, GetFolderNameByFileType(fileType));
+        m_jobQueue.push_back(job);
+        m_queueContent.Signal();
+      Unlock();
+    }
+    m_artworks[key] = localFilename;
   }
 
   return localFilename;
@@ -208,7 +184,6 @@
 {
   XBMC->Log(LOG_DEBUG, "%s FileOps Thread Started", __FUNCTION__);
 
-  std::time_t lastRunCacheClean = std::time(NULL);
   std::list<FileOps::JobItem> jobQueueDelayed;
 
   while (!IsStopped())
@@ -227,8 +202,9 @@
       if (g_bExtraDebug)
         XBMC->Log(LOG_DEBUG,"%s Job fetched: local: %s, remote: %s, storagegroup: %s", __FUNCTION__, job.m_localFilename.c_str(), job.m_remoteFilename.c_str(), job.m_storageGroup.c_str());
 
+      // Connect to the file and cache it to the local addon cache
       MythFile file = m_con.ConnectPath(job.m_remoteFilename, job.m_storageGroup);
-      if (file.Length() > 0)
+      if (!file.IsNull() && file.Length() > 0)
       {
         if (CacheFile(job.m_localFilename.c_str(), file))
         {
@@ -246,11 +222,28 @@
       }
       else
       {
-        // File was empty (this happens usually for new recordings where the preview image hasn't been generated)
-        XBMC->Log(LOG_DEBUG, "%s File is empty, delayed recache: local: %s, remote: %s, type: %s", __FUNCTION__, job.m_localFilename.c_str(), job.m_remoteFilename.c_str(), job.m_storageGroup.c_str());
-        jobQueueDelayed.push_back(job);
-      }
+        // Failed to open file for reading. Unfortunately it cannot be determined if this is a permanent or a temporary problem (new recording's preview hasn't been generated yet).
+        // Increase the error count and retry to cache the file a few times
+        if (file.IsNull())
+        {
+          XBMC->Log(LOG_ERROR, "%s Failed to read file: local: %s, remote: %s, type: %s", __FUNCTION__, job.m_localFilename.c_str(), job.m_remoteFilename.c_str(), job.m_storageGroup.c_str());
+          job.m_errorCount += 1;
+        }
+
+        // File was empty (this happens usually for new recordings where the preview image hasn't been generated yet)
+        // This is not an error, always try to recache the file
+        else if (file.Length() == 0)
+        {
+          XBMC->Log(LOG_DEBUG, "%s File is empty: local: %s, remote: %s, type: %s", __FUNCTION__, job.m_localFilename.c_str(), job.m_remoteFilename.c_str(), job.m_storageGroup.c_str());
+        }
 
+        // Recache the file if it hasn't exceeded the maximum number of allowed attempts
+        if (job.m_errorCount <= c_maximumAttemptsOnReadError)
+        {
+          XBMC->Log(LOG_DEBUG, "%s Delayed recache file: local: %s, remote: %s, type: %s", __FUNCTION__, job.m_localFilename.c_str(), job.m_remoteFilename.c_str(), job.m_storageGroup.c_str());
+          jobQueueDelayed.push_back(job);
+        }
+      }
     }
 
     // Try to recache the currently empty files
@@ -258,14 +251,6 @@
     m_jobQueue.insert(m_jobQueue.end(), jobQueueDelayed.begin(), jobQueueDelayed.end());
     jobQueueDelayed.clear();
     Unlock();
-
-    // Clean the cache from time to time
-    std::time_t now = std::time(NULL);
-    if (std::difftime(now, lastRunCacheClean) > (double)c_timeoutCacheCleaning)
-    {
-      CleanCache();
-      lastRunCacheClean = now;
-    }
   }
 
   XBMC->Log(LOG_DEBUG, "%s FileOps Thread Stopped", __FUNCTION__);
@@ -312,7 +297,6 @@
 
   unsigned long long totalLength = source.Length();
   unsigned long long totalRead = 0;
-  unsigned long long totalWrite = 0;
 
   const long buffersize = 32768;
   char* buffer = new char[buffersize];
@@ -334,12 +318,11 @@
 
       bytes_read -= bytes_written;
       p += bytes_written;
-      totalWrite += bytes_written;
     }
   }
 
   XBMC->CloseFile(file);
-  delete buffer;
+  delete[] buffer;
 
   if (totalRead < totalLength)
   {
@@ -368,7 +351,6 @@
     if (!directory.IsEmpty())
       directories.push_back(m_localBasePath + directory);
   }
-  directories.push_back(m_localBasePath + "channels");
   directories.push_back(m_localBasePath + "preview");
   std::vector<CStdString>::const_iterator it2;
   for (it2 = directories.begin(); it2 != directories.end(); ++it2)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/fileOps.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/fileOps.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/fileOps.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/fileOps.h	2013-03-12 10:51:22.000000000 +0000
@@ -81,15 +81,15 @@
     }
   }
 
-  static const int c_timeoutProcess       = 10;       // Wake the thread every 10s
-  static const int c_timeoutCacheCleaning = 60*60*24; // Clean the cache every 24h
+  static const int c_timeoutProcess              = 10;       // Wake the thread every 10s
+  static const int c_maximumAttemptsOnReadError  = 3;        // Retry when reading file failed
 
   FileOps(MythConnection &mythConnection);
   virtual ~FileOps();
 
-  CStdString GetArtworkPath(const CStdString &title, FileType fileType);
-  CStdString GetChannelIconPath(const CStdString &remotePath);
-  CStdString GetPreviewIconPath(const CStdString &remotePath);
+  CStdString GetArtworkPath(const CStdString &remoteFilename, FileType fileType);
+  CStdString GetChannelIconPath(const CStdString &remoteFilename);
+  CStdString GetPreviewIconPath(const CStdString &remoteFilename, const CStdString &recordingGroup);
 
   void Suspend();
   void Resume();
@@ -103,10 +103,10 @@
   static CStdString GetFileName(const CStdString &path, char separator = PATH_SEPARATOR_CHAR);
   static CStdString GetDirectoryName(const CStdString &path, char separator = PATH_SEPARATOR_CHAR);
 
-  std::map<FileType, StorageGroupFileList> m_StorageGroupFileList;
-  std::map<FileType, std::time_t> m_StorageGroupFileListLastUpdated;
   std::map<CStdString, CStdString> m_icons;
   std::map<CStdString, CStdString> m_preview;
+  std::map<std::pair<FileType, CStdString>, CStdString> m_artworks;
+
   MythConnection m_con;
 
   CStdString m_localBasePath;
@@ -116,12 +116,14 @@
       : m_localFilename(localFilename)
       , m_remoteFilename(remoteFilename)
       , m_storageGroup(storageGroup)
+      , m_errorCount(0)
     {
     }
 
     CStdString m_localFilename;
     CStdString m_remoteFilename;
     CStdString m_storageGroup;
+    int        m_errorCount;
   };
 
   PLATFORM::CEvent m_queueContent;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp	2012-12-12 01:00:24.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -24,24 +24,25 @@
 #include "tools.h"
 
 #include <time.h>
+#include <set>
 
 using namespace ADDON;
 using namespace PLATFORM;
 
-RecordingRule::RecordingRule(const MythTimer &timer)
-  : MythTimer(timer)
+RecordingRule::RecordingRule(const MythRecordingRule &rule)
+  : MythRecordingRule(rule)
   , m_parent(0)
 {
 }
 
-RecordingRule &RecordingRule::operator=(const MythTimer &t)
+RecordingRule &RecordingRule::operator=(const MythRecordingRule &rule)
 {
-  MythTimer::operator=(t);
+  MythRecordingRule::operator=(rule);
   clear();
   return *this;
 }
 
-bool RecordingRule::operator==(const int &id)
+bool RecordingRule::operator==(const unsigned int &id)
 {
   return id==RecordID();
 }
@@ -56,19 +57,19 @@
   m_parent = &parent;
 }
 
-bool RecordingRule::HasModifiers() const
+bool RecordingRule::HasOverrideRules() const
 {
-  return !m_modifiers.empty();
+  return !m_overrideRules.empty();
 }
 
-std::vector<RecordingRule*> RecordingRule::GetModifiers() const
+std::vector<RecordingRule*> RecordingRule::GetOverrideRules() const
 {
-  return m_modifiers;
+  return m_overrideRules;
 }
 
-void RecordingRule::AddModifier(RecordingRule &modifier)
+void RecordingRule::AddOverrideRule(RecordingRule &overrideRule)
 {
-  m_modifiers.push_back(&modifier);
+  m_overrideRules.push_back(&overrideRule);
 }
 
 bool RecordingRule::SameTimeslot(RecordingRule &rule) const
@@ -78,23 +79,24 @@
 
   switch (rule.Type())
   {
-  case MythTimer::NotRecording:
-  case MythTimer::SingleRecord:
-  case MythTimer::OverrideRecord:
-  case MythTimer::DontRecord:
+  case MythRecordingRule::TemplateRecord:
+  case MythRecordingRule::NotRecording:
+  case MythRecordingRule::SingleRecord:
+  case MythRecordingRule::OverrideRecord:
+  case MythRecordingRule::DontRecord:
     return rStarttime == starttime && rule.EndTime() == EndTime() && rule.ChannelID() == ChannelID();
-  case MythTimer::FindDailyRecord:
-  case MythTimer::FindWeeklyRecord:
-  case MythTimer::FindOneRecord:
-    return rule.Title(false) == Title(false);
-  case MythTimer::TimeslotRecord:
-    return rule.Title(false) == Title(false) && daytime(&starttime) == daytime(&rStarttime) &&  rule.ChannelID() == ChannelID();
-  case MythTimer::ChannelRecord:
-    return rule.Title(false) == Title(false) && rule.ChannelID() == ChannelID(); //TODO: dup
-  case MythTimer::AllRecord:
-    return rule.Title(false) == Title(false); //TODO: dup
-  case MythTimer::WeekslotRecord:
-    return rule.Title(false) == Title(false) && daytime(&starttime) == daytime(&rStarttime) && weekday(&starttime) == weekday(&rStarttime) && rule.ChannelID() == ChannelID();
+  case MythRecordingRule::FindDailyRecord:
+  case MythRecordingRule::FindWeeklyRecord:
+  case MythRecordingRule::FindOneRecord:
+    return rule.Title() == Title();
+  case MythRecordingRule::TimeslotRecord:
+    return rule.Title() == Title() && daytime(&starttime) == daytime(&rStarttime) &&  rule.ChannelID() == ChannelID();
+  case MythRecordingRule::ChannelRecord:
+    return rule.Title() == Title() && rule.ChannelID() == ChannelID(); //TODO: dup
+  case MythRecordingRule::AllRecord:
+    return rule.Title() == Title(); //TODO: dup
+  case MythRecordingRule::WeekslotRecord:
+    return rule.Title() == Title() && daytime(&starttime) == daytime(&rStarttime) && weekday(&starttime) == weekday(&rStarttime) && rule.ChannelID() == ChannelID();
   }
   return false;
 }
@@ -120,11 +122,9 @@
  , m_pEventHandler(NULL)
  , m_db()
  , m_fileOps(NULL)
- , m_protocolVersion("")
+ , m_backendVersion("")
  , m_connectionString("")
  , m_categories()
- , m_EPGstart(0)
- , m_EPGend(0)
  , m_channelGroups()
 {
 }
@@ -163,7 +163,7 @@
     case CMYTH_DBG_DETAIL:
     case CMYTH_DBG_DEBUG:
     case CMYTH_DBG_PROTO:
-    case CMYTH_DBG_ALL: 
+    case CMYTH_DBG_ALL:
       loglevel = LOG_DEBUG;
       break;
     }
@@ -182,10 +182,11 @@
   cmyth_set_dbg_msgcallback(Log);
 
   // Create MythTV connection
-  m_con = MythConnection(g_szHostname, g_iMythPort);
+  m_con = MythConnection(g_szMythHostname, g_iMythPort);
   if (!m_con.IsConnected())
   {
-    XBMC->QueueNotification(QUEUE_ERROR, "%s: Failed to connect to MythTV backend %s: %i", __FUNCTION__, g_szHostname.c_str(), g_iMythPort);
+    XBMC->Log(LOG_ERROR,"Failed to connect to MythTV backend on %s:%d", g_szMythHostname.c_str(), g_iMythPort);
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30300));
     return false;
   }
 
@@ -193,17 +194,18 @@
   m_pEventHandler = m_con.CreateEventHandler();
   if (!m_pEventHandler)
   {
-    XBMC->QueueNotification(QUEUE_ERROR, "Failed to create MythTV Event Handler");
+    XBMC->Log(LOG_ERROR, "Failed to create MythEventHandler");
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30300));
     return false;
   }
+  m_pEventHandler->RegisterObserver(this);
 
   // Create database connection
-  m_protocolVersion.Format("%i", m_con.GetProtocolVersion());
-  m_connectionString.Format("%s:%i", g_szHostname, g_iMythPort);
-  m_db = MythDatabase(g_szHostname, g_szMythDBname, g_szMythDBuser, g_szMythDBpassword);
+  m_db = MythDatabase(g_szDBHostname, g_szDBName, g_szDBUser, g_szDBPassword, g_iDBPort);
   if (m_db.IsNull())
   {
-    XBMC->QueueNotification(QUEUE_ERROR, "Failed to connect to MythTV MySQL database %s@%s %s/%s", g_szMythDBname.c_str(), g_szHostname.c_str(), g_szMythDBuser.c_str(), g_szMythDBpassword.c_str());
+    XBMC->Log(LOG_ERROR,"Failed to connect to MythTV database %s@%s:%d with user %s", g_szDBName.c_str(), g_szDBHostname.c_str(), g_iDBPort, g_szDBUser.c_str());
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30301));
     return false;
   }
 
@@ -211,54 +213,35 @@
   CStdString db_test;
   if (!m_db.TestConnection(&db_test))
   {
-    XBMC->QueueNotification(QUEUE_ERROR, "Failed to connect to MythTV MySQL database %s@%s %s/%s\n%s", g_szMythDBname.c_str(), g_szHostname.c_str(), g_szMythDBuser.c_str(), g_szMythDBpassword.c_str(), db_test.c_str());
+    XBMC->Log(LOG_ERROR,"Failed to connect to MythTV database %s@%s:%d with user %s: %s", g_szDBName.c_str(), g_szDBHostname.c_str(), g_iDBPort, g_szDBUser.c_str(), db_test.c_str());
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30301));
     return false;
   }
 
   // Create file operation helper (image caching)
   m_fileOps = new FileOps(m_con);
 
-  // Get channel list
-  m_channels = m_db.GetChannels();
-  if (m_channels.empty())
-    XBMC->Log(LOG_INFO,"%s: Empty channel list", __FUNCTION__);
-
-  // Get sources
-  m_sources = m_db.GetSources();
-  if (m_sources.empty())
-    XBMC->Log(LOG_INFO,"%s: Empty source list", __FUNCTION__);
-
-  // Get channel groups
-  m_channelGroups = m_db.GetChannelGroups();
-  if (m_channelGroups.empty())
-    XBMC->Log(LOG_INFO,"%s: No channel groups", __FUNCTION__);
-
-  // Get recordings
-  m_recordings = m_con.GetRecordedPrograms();
-  if (m_recordings.empty())
-    XBMC->Log(LOG_INFO,"%s: No recordings", __FUNCTION__);
-
   return true;
 }
 
 const char *PVRClientMythTV::GetBackendName()
 {
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
-  return m_con.GetBackendName();
+  m_backendName.Format("MythTV (%s)", m_con.GetBackendName());
+  XBMC->Log(LOG_DEBUG, "GetBackendName: %s", m_backendName.c_str());
+  return m_backendName;
 }
 
-const char *PVRClientMythTV::GetBackendVersion() const
+const char *PVRClientMythTV::GetBackendVersion()
 {
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
-  return m_protocolVersion;
+  m_backendVersion.Format(XBMC->GetLocalizedString(30100), m_con.GetProtocolVersion(), m_db.GetSchemaVersion());
+  XBMC->Log(LOG_DEBUG, "GetBackendVersion: %s", m_backendVersion.c_str());
+  return m_backendVersion;
 }
 
-const char *PVRClientMythTV::GetConnectionString() const
+const char *PVRClientMythTV::GetConnectionString()
 {
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
+  m_connectionString.Format("%s:%d - %s@%s:%d", g_szMythHostname, g_iMythPort, g_szDBName, g_szDBHostname, g_iDBPort);
+  XBMC->Log(LOG_DEBUG, "GetConnectionString: %s", m_connectionString.c_str());
   return m_connectionString;
 }
 
@@ -272,24 +255,19 @@
 PVR_ERROR PVRClientMythTV::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s - start: %i, end: %i, ChannelID: %i", __FUNCTION__, iStart, iEnd, channel.iUniqueId);
+    XBMC->Log(LOG_DEBUG,"%s - start: %ld, end: %ld, ChannelID: %u", __FUNCTION__, iStart, iEnd, channel.iUniqueId);
 
-  if (iStart != m_EPGstart && iEnd != m_EPGend)
+  if (!channel.bIsHidden)
   {
-    m_EPG = m_db.GetGuide(iStart, iEnd);
-    if (g_bExtraDebug)
-      XBMC->Log(LOG_DEBUG,"%s: Fetching EPG - size: %i", __FUNCTION__, m_EPG.size());
-    m_EPGstart = iStart;
-    m_EPGend = iEnd;
-  }
+    ProgramList EPG = m_db.GetGuide(channel.iUniqueId, iStart, iEnd);
 
-  for (ProgramList::iterator it = m_EPG.begin(); it != m_EPG.end(); it++)
-  {
-    if ((unsigned)it->chanid==channel.iUniqueId)
+    // Transfer EPG for the given channel
+    for (ProgramList::iterator it = EPG.begin(); it != EPG.end(); ++it)
     {
       EPG_TAG tag;
       memset(&tag, 0, sizeof(EPG_TAG));
 
+      tag.iUniqueBroadcastId = (it->starttime << 16) + (it->channum & 0xFFFF);
       tag.iChannelNumber = it->channum;
       tag.startTime = it->starttime;
       tag.endTime = it->endtime;
@@ -297,28 +275,26 @@
       CStdString title = it->title;
       CStdString subtitle = it->subtitle;
       if (!subtitle.IsEmpty())
-        title += ": " + subtitle;
+	title += SUBTITLE_SEPARATOR + subtitle;
       tag.strTitle = title;
-
       tag.strPlot = it->description;
-      tag.iUniqueBroadcastId = (tag.startTime << 16) + (tag.iChannelNumber & 0xffff);
 
       int genre = m_categories.Category(it->category);
       tag.iGenreSubType = genre & 0x0F;
       tag.iGenreType = genre & 0xF0;
+      tag.strGenreDescription = it->category;
 
       // Unimplemented
-      tag.strEpisodeName="";
-      tag.strGenreDescription="";
-      tag.strIconPath="";
-      tag.strPlotOutline="";
-      tag.bNotify=false;
-      tag.firstAired=0;
-      tag.iEpisodeNumber=0;
-      tag.iEpisodePartNumber=0;
-      tag.iParentalRating=0;
-      tag.iSeriesNumber=0;
-      tag.iStarRating=0;
+      tag.strEpisodeName = "";
+      tag.strIconPath = "";
+      tag.strPlotOutline = "";
+      tag.bNotify = false;
+      tag.firstAired = 0;
+      tag.iEpisodeNumber = 0;
+      tag.iEpisodePartNumber = 0;
+      tag.iParentalRating = 0;
+      tag.iSeriesNumber = 0;
+      tag.iStarRating = 0;
 
       PVR->TransferEpgEntry(handle, &tag);
     }
@@ -334,23 +310,41 @@
 {
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
-  return m_channels.size();
+
+  LoadChannelsAndChannelGroups();
+
+  return m_channelsById.size();
 }
 
 PVR_ERROR PVRClientMythTV::GetChannels(ADDON_HANDLE handle, bool bRadio)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - radio: %i", __FUNCTION__, bRadio);
+    XBMC->Log(LOG_DEBUG, "%s - radio: %s", __FUNCTION__, (bRadio ? "true" : "false"));
+
+  LoadChannelsAndChannelGroups();
+
+  // Create a set<channum, callsign> to merge channels with same channum and callsign
+  std::set<std::pair<CStdString, CStdString> > channelIdentifiers;
 
-  for (ChannelMap::iterator it = m_channels.begin(); it != m_channels.end(); it++)
+  // Transfer channels of the requested type (radio / tv)
+  for (ChannelIdMap::iterator it = m_channelsById.begin(); it != m_channelsById.end(); ++it)
   {
     if (it->second.IsRadio() == bRadio && !it->second.IsNull())
     {
+      // Skip channels with same channum and callsign
+      std::pair<CStdString, CStdString> channelIdentifier = make_pair(it->second.Number(), it->second.Callsign());
+      if (channelIdentifiers.find(channelIdentifier) != channelIdentifiers.end())
+      {
+        XBMC->Log(LOG_DEBUG, "%s - skipping channel: %d", __FUNCTION__, it->second.ID());
+        continue;
+      }
+      channelIdentifiers.insert(channelIdentifier);
+
       PVR_CHANNEL tag;
       memset(&tag, 0, sizeof(PVR_CHANNEL));
 
       tag.iUniqueId = it->first;
-      tag.iChannelNumber = it->second.NumberInt(); // Use ID instead as MythTV channel number is a string?
+      tag.iChannelNumber = it->second.NumberInt();
       PVR_STRCPY(tag.strChannelName, it->second.Name());
       tag.bIsHidden = !it->second.Visible();
       tag.bIsRadio = it->second.IsRadio();
@@ -361,7 +355,7 @@
       // Unimplemented
       PVR_STRCPY(tag.strStreamURL, "");
       PVR_STRCPY(tag.strInputFormat, "");
-      tag.iEncryptionSystem=0;
+      tag.iEncryptionSystem = 0;
 
       PVR->TransferChannelEntry(handle, &tag);
     }
@@ -373,30 +367,37 @@
   return PVR_ERROR_NO_ERROR;
 }
 
-int PVRClientMythTV::GetChannelGroupsAmount() const
+int PVRClientMythTV::GetChannelGroupsAmount()
 {
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
+  LoadChannelsAndChannelGroups();
+
   return m_channelGroups.size();
 }
 
 PVR_ERROR PVRClientMythTV::GetChannelGroups(ADDON_HANDLE handle, bool bRadio)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - radio: %i", __FUNCTION__, bRadio);
+    XBMC->Log(LOG_DEBUG, "%s - radio: %s", __FUNCTION__, (bRadio ? "true" : "false"));
 
-  for (ChannelGroupMap::iterator it = m_channelGroups.begin(); it != m_channelGroups.end(); it++)
+  LoadChannelsAndChannelGroups();
+
+  // Transfer channel groups of the given type (radio / tv)
+  for (ChannelGroupMap::iterator channelGroupsIt = m_channelGroups.begin(); channelGroupsIt != m_channelGroups.end(); ++channelGroupsIt)
   {
     PVR_CHANNEL_GROUP tag;
     memset(&tag, 0, sizeof(PVR_CHANNEL_GROUP));
 
-    PVR_STRCPY(tag.strGroupName, it->first);
+    PVR_STRCPY(tag.strGroupName, channelGroupsIt->first);
     tag.bIsRadio = bRadio;
 
-    for (std::vector<int>::iterator it2 = it->second.begin(); it2 != it->second.end(); it2++)
+    // Only add the group if we have at least one channel of the correct type
+    for (std::vector<int>::iterator channelGroupIt = channelGroupsIt->second.begin(); channelGroupIt != channelGroupsIt->second.end(); ++channelGroupIt)
     {
-      if (m_channels.find(*it2) != m_channels.end() && m_channels.at(*it2).IsRadio() == bRadio)
+      ChannelIdMap::iterator channelIt = m_channelsById.find(*channelGroupIt);
+      if (channelIt != m_channelsById.end() && channelIt->second.IsRadio() == bRadio)
       {
         PVR->TransferChannelGroup(handle, &tag);
         break;
@@ -415,22 +416,29 @@
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s - group: %s", __FUNCTION__, group.strGroupName);
 
-  int i=0;
-  for (std::vector<int>::iterator it = m_channelGroups.at(group.strGroupName).begin(); it != m_channelGroups.at(group.strGroupName).end(); it++)
+  LoadChannelsAndChannelGroups();
+
+  ChannelGroupMap::iterator channelGroupsIt = m_channelGroups.find(group.strGroupName);
+  if (channelGroupsIt == m_channelGroups.end())
   {
-    PVR_CHANNEL_GROUP_MEMBER tag;
-    memset(&tag, 0, sizeof(PVR_CHANNEL_GROUP_MEMBER));
+    XBMC->Log(LOG_ERROR,"%s - Channel group not found", __FUNCTION__);
+    return PVR_ERROR_INVALID_PARAMETERS;
+  }
 
-    if (m_channels.find(*it) != m_channels.end())
+  // Transfer the channel group members for the requested group
+  int channelNumber = 0;
+  for (std::vector<int>::iterator channelGroupIt = channelGroupsIt->second.begin(); channelGroupIt != channelGroupsIt->second.end(); ++channelGroupIt)
+  {
+    ChannelIdMap::iterator channelIt = m_channelsById.find(*channelGroupIt);
+    if (channelIt != m_channelsById.end() && channelIt->second.IsRadio() == group.bIsRadio)
     {
-      MythChannel chan = m_channels.at(*it);
-      if (group.bIsRadio == chan.IsRadio())
-      {
-        tag.iChannelNumber = i++;
-        tag.iChannelUniqueId = chan.ID();
-        PVR_STRCPY(tag.strGroupName, group.strGroupName);
-        PVR->TransferChannelGroupMember(handle, &tag);
-      }
+      PVR_CHANNEL_GROUP_MEMBER tag;
+      memset(&tag, 0, sizeof(PVR_CHANNEL_GROUP_MEMBER));
+
+      tag.iChannelNumber = channelNumber++;
+      tag.iChannelUniqueId = channelIt->second.ID();
+      PVR_STRCPY(tag.strGroupName, group.strGroupName);
+      PVR->TransferChannelGroupMember(handle, &tag);
     }
   }
 
@@ -440,20 +448,40 @@
   return PVR_ERROR_NO_ERROR;
 }
 
+void PVRClientMythTV::LoadChannelsAndChannelGroups()
+{
+  if (!m_channelsById.empty())
+    return;
+
+  m_channelsById = m_db.GetChannels();
+
+  for (ChannelIdMap::iterator channelIt = m_channelsById.begin(); channelIt != m_channelsById.end(); ++channelIt)
+    m_channelsByNumber.insert(std::make_pair(channelIt->second.Number(), channelIt->second));
+
+  m_channelGroups = m_db.GetChannelGroups();
+}
+
 int PVRClientMythTV::GetRecordingsAmount(void)
 {
+  int res = 0;
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
-  m_con.Lock();
-  m_recordings = m_con.GetRecordedPrograms();
-  m_con.Unlock();
-  int res = 0;
-  for (ProgramInfoMap::iterator it = m_recordings.begin(); it != m_recordings.end(); ++it)
+  m_recordingsLock.Lock();
+  if (m_recordings.empty())
+    // Load recorings list
+    res = FillRecordings();
+  else
   {
-    if (!it->second.IsNull() && IsRecordingVisible(it->second))
-      res++;
+    for (ProgramInfoMap::iterator it = m_recordings.begin(); it != m_recordings.end(); ++it)
+    {
+      if (!it->second.IsNull() && it->second.IsVisible())
+        res++;
+    }
   }
+  m_recordingsLock.Unlock();
+  if (res == 0)
+    XBMC->Log(LOG_INFO, "%s: No recording", __FUNCTION__);
   return res;
 }
 
@@ -462,12 +490,17 @@
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
-  m_con.Lock();
-  m_recordings = m_con.GetRecordedPrograms();
-  m_con.Unlock();
+  m_recordingsLock.Lock();
+  if (m_recordings.empty())
+    // Load recorings list
+    FillRecordings();
+  else
+    // Update recording list from change events
+    EventUpdateRecordings();
+
   for (ProgramInfoMap::iterator it = m_recordings.begin(); it != m_recordings.end(); ++it)
   {
-    if (!it->second.IsNull() && IsRecordingVisible(it->second))
+    if (!it->second.IsNull() && it->second.IsVisible())
     {
       PVR_RECORDING tag;
       memset(&tag, 0, sizeof(PVR_RECORDING));
@@ -476,9 +509,11 @@
       tag.iDuration = it->second.Duration();
       tag.iPlayCount = it->second.IsWatched() ? 1 : 0;
 
-      CStdString id = it->second.StrUID();
-      CStdString path = it->second.Path();
-      CStdString title = it->second.Title(true);
+      CStdString id = it->second.UID();
+      CStdString title = it->second.Title();
+      CStdString subtitle = it->second.Subtitle();
+      if (!subtitle.IsEmpty())
+        title += SUBTITLE_SEPARATOR + subtitle;
 
       PVR_STRCPY(tag.strRecordingId, id);
       PVR_STRCPY(tag.strTitle, title);
@@ -491,15 +526,19 @@
 
       // Add recording title to directory to group everything according to its name just like MythTV does
       CStdString strDirectory;
-      strDirectory.Format("%s/%s", it->second.RecordingGroup(), it->second.Title(false));
+      strDirectory.Format("%s/%s", it->second.RecordingGroup(), it->second.Title());
       PVR_STRCPY(tag.strDirectory, strDirectory);
 
       // Images
-      CStdString strIconPath = GetArtWork(FileOps::FileTypeCoverart, title);
-      if (strIconPath.IsEmpty())
-        strIconPath = m_fileOps->GetPreviewIconPath(path + ".png");
+      CStdString strIconPath;
+      if (!it->second.Coverart().IsEmpty())
+        strIconPath = GetArtWork(FileOps::FileTypeCoverart, it->second.Coverart());
+      else
+        strIconPath = m_fileOps->GetPreviewIconPath(it->second.IconPath(), it->second.RecordingGroup());
 
-      CStdString strFanartPath = GetArtWork(FileOps::FileTypeFanart, title);
+      CStdString strFanartPath;
+      if (!it->second.Fanart().IsEmpty())
+        strFanartPath = GetArtWork(FileOps::FileTypeFanart, it->second.Fanart());
 
       PVR_STRCPY(tag.strIconPath, strIconPath.c_str());
       PVR_STRCPY(tag.strThumbnailPath, strIconPath.c_str());
@@ -514,6 +553,7 @@
       PVR->TransferRecordingEntry(handle, &tag);
     }
   }
+  m_recordingsLock.Unlock();
 
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s - Done", __FUNCTION__);
@@ -521,50 +561,173 @@
   return PVR_ERROR_NO_ERROR;
 }
 
-bool PVRClientMythTV::IsRecordingVisible(MythProgramInfo &recording)
+void PVRClientMythTV::EventUpdateRecordings()
 {
-  // Filter out recordings of special storage groups (like LiveTV or Deleted)
+  if (g_bExtraDebug)
+    XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
+
+  // Check event connection
+  if (!m_pEventHandler->IsListening())
+    return;
 
-  // When  deleting a recording, it might not be deleted immediately but marked as 'pending delete'.
-  // Depending on the protocol version the recording is moved to the group Deleted or
-  // the 'delete pending' flag is set
-  if (recording.RecordingGroup() == "LiveTV" || recording.RecordingGroup() == "Deleted" || recording.IsDeletePending())
+  while (true)
   {
-    XBMC->Log(LOG_DEBUG, "%s: Ignoring recording %s", __FUNCTION__, recording.Path().c_str());
-    return false;
+    if (!m_pEventHandler->HasRecordingChangeEvent())
+      break;
+
+    MythEventHandler::RecordingChangeEvent event = m_pEventHandler->NextRecordingChangeEvent();
+
+    switch (event.Type())
+    {
+      case MythEventHandler::CHANGE_ALL:
+      {
+        if (g_bExtraDebug)
+          XBMC->Log(LOG_DEBUG, "%s - Reload all recordings", __FUNCTION__);
+        FillRecordings();
+        break;
+      }
+      case MythEventHandler::CHANGE_ADD:
+      {
+        MythProgramInfo prog = m_con.GetRecordedProgram(event.ChannelID(), event.RecordingStartTimeslot());
+        if (!prog.IsNull())
+        {
+          ProgramInfoMap::iterator it = m_recordings.find(prog.UID());
+          if (it == m_recordings.end())
+          {
+            if (g_bExtraDebug)
+              XBMC->Log(LOG_DEBUG, "%s - Add recording: %s", __FUNCTION__, prog.UID().c_str());
+
+            // Fill artwork
+            m_db.FillRecordingArtwork(prog);
+
+            // Add recording
+            m_recordings.insert(std::pair<CStdString, MythProgramInfo>(prog.UID().c_str(), prog));
+          }
+        }
+        else
+          XBMC->Log(LOG_ERROR, "%s - Add recording failed for %u %ld", __FUNCTION__, event.ChannelID(), event.RecordingStartTimeslot());
+        break;
+      }
+      case MythEventHandler::CHANGE_UPDATE:
+      {
+        MythProgramInfo prog = event.Program();
+        ProgramInfoMap::iterator it = m_recordings.find(prog.UID());
+        if (it != m_recordings.end())
+        {
+          if (g_bExtraDebug)
+            XBMC->Log(LOG_DEBUG, "%s - Update recording: %s", __FUNCTION__, prog.UID().c_str());
+
+          // Copy cached framerate
+          prog.SetFramerate(it->second.Framterate());
+
+          // Fill artwork
+          m_db.FillRecordingArtwork(prog);
+
+          // Update recording
+          it->second = prog;
+        }
+        break;
+      }
+      case MythEventHandler::CHANGE_DELETE:
+      {
+        // MythTV send two DELETE events. First requests deletion, second confirms deletion.
+        // On first we delete recording. On second program will not be found.
+        MythProgramInfo prog = m_con.GetRecordedProgram(event.ChannelID(), event.RecordingStartTimeslot());
+        if (!prog.IsNull())
+        {
+          ProgramInfoMap::iterator it = m_recordings.find(prog.UID());
+          if (it != m_recordings.end())
+          {
+            if (g_bExtraDebug)
+              XBMC->Log(LOG_DEBUG, "%s - Delete recording: %s", __FUNCTION__, prog.UID().c_str());
+
+            // Remove recording
+            m_recordings.erase(it);
+          }
+        }
+        break;
+      }
+    }
   }
+}
 
-  return true;
+void PVRClientMythTV::ForceUpdateRecording(ProgramInfoMap::iterator it)
+{
+  if (g_bExtraDebug)
+    XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
+
+  if (!it->second.IsNull())
+  {
+    MythProgramInfo prog = m_con.GetRecordedProgram(it->second.BaseName());
+    if (!prog.IsNull())
+    {
+      // Copy cached framerate
+      prog.SetFramerate(it->second.Framterate());
+
+      // Fill artwork
+      m_db.FillRecordingArtwork(prog);
+
+      // Update recording
+      it->second = prog;
+      PVR->TriggerRecordingUpdate();
+
+      if (g_bExtraDebug)
+        XBMC->Log(LOG_DEBUG, "%s - Done", __FUNCTION__);
+    }
+  }
 }
 
-PVR_ERROR PVRClientMythTV::DeleteRecording(const PVR_RECORDING &recording)
+int PVRClientMythTV::FillRecordings()
 {
+  int res = 0;
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
-  m_con.Lock();
+  // Check event connection
+  if (!m_pEventHandler->IsListening())
+    return res;
+
+  // Clear all recording change events
+  m_pEventHandler->ClearRecordingChangeEvents();
+
+  // Load recordings list
+  m_recordings.clear();
+  m_recordings = m_con.GetRecordedPrograms();
+
+  // Fill artworks
+  for (ProgramInfoMap::iterator it = m_recordings.begin(); it != m_recordings.end(); ++it)
+  {
+    if (!it->second.IsNull() && it->second.IsVisible())
+      m_db.FillRecordingArtwork(it->second);
+      res++;
+  }
+  return res;
+}
+
+PVR_ERROR PVRClientMythTV::DeleteRecording(const PVR_RECORDING &recording)
+{
+  XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
+
+  CLockObject lock(m_recordingsLock);
+
   ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId);
   if (it != m_recordings.end())
   {
     bool ret = m_con.DeleteRecording(it->second);
     if (ret)
     {
-      m_recordings.erase(it);
-      if (g_bExtraDebug)
-        XBMC->Log(LOG_DEBUG, "%s - Deleted recording %s", __FUNCTION__, recording.strRecordingId);
-      m_con.Unlock();
+      XBMC->Log(LOG_DEBUG, "%s - Deleted recording %s", __FUNCTION__, recording.strRecordingId);
       return PVR_ERROR_NO_ERROR;
     }
     else
     {
-      XBMC->Log(LOG_DEBUG, "%s - Failed to delete recording %s", __FUNCTION__, recording.strRecordingId);
+      XBMC->Log(LOG_ERROR, "%s - Failed to delete recording %s", __FUNCTION__, recording.strRecordingId);
     }
   }
   else
   {
-    XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
+    XBMC->Log(LOG_ERROR, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
   }
-  m_con.Unlock();
   return PVR_ERROR_FAILED;
 }
 
@@ -575,30 +738,26 @@
   if (count > 1) count = 1;
   if (count < 0) count = 0;
 
-  m_con.Lock();
+  CLockObject lock(m_recordingsLock);
   ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId);
   if (it != m_recordings.end())
   {
-    int ret = m_db.SetWatchedStatus(it->second, count > 0);
-
-    if (ret == 1)
+    if (m_db.SetWatchedStatus(it->second, count > 0))
     {
       if (g_bExtraDebug)
         XBMC->Log(LOG_DEBUG, "%s - Set watched state for %s", __FUNCTION__, recording.strRecordingId);
-      m_con.Unlock();
-      PVR->TriggerRecordingUpdate();
+      ForceUpdateRecording(it);
       return PVR_ERROR_NO_ERROR;
     }
     else
     {
-      XBMC->Log(LOG_DEBUG, "%s - Failed setting watched state for: %s: %d)", __FUNCTION__, recording.strRecordingId, ret);
+      XBMC->Log(LOG_DEBUG, "%s - Failed setting watched state for: %s", __FUNCTION__, recording.strRecordingId);
     }
   }
   else
   {
-    XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);    
+    XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
   }
-  m_con.Unlock();
   return PVR_ERROR_FAILED;
 }
 
@@ -606,19 +765,21 @@
 {
   // MythTV provides it's bookmarks as frame offsets whereas XBMC expects a time offset.
   // The frame offset is calculated by: frameOffset = bookmark * frameRate.
-  long long frameOffset = 0;
 
   if (g_bExtraDebug)
   {
     XBMC->Log(LOG_DEBUG, "%s - Setting Bookmark for: %s to %d", __FUNCTION__, recording.strTitle, lastplayedposition);
   }
 
-  m_con.Lock();
+  CLockObject lock(m_recordingsLock);
   ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId);
   if (it != m_recordings.end())
   {
+    // pin framerate value
+    if (it->second.Framterate() < 0)
+      it->second.SetFramerate(m_db.GetRecordingFrameRate(it->second));
     // Calculate the frame offset
-    frameOffset = (long long)((float)lastplayedposition * GetRecordingFrameRate(it->second));
+    long long frameOffset = (long long)(lastplayedposition * it->second.Framterate() / 1000.0f);
     if (frameOffset < 0) frameOffset = 0;
     if (g_bExtraDebug)
     {
@@ -629,10 +790,7 @@
     if (m_con.SetBookmark(it->second, frameOffset))
     {
       if (g_bExtraDebug)
-      {
-        XBMC->Log(LOG_ERROR, "%s - Setting Bookmark successful", __FUNCTION__);
-      }
-      m_con.Unlock();
+        XBMC->Log(LOG_DEBUG, "%s - Setting Bookmark successful", __FUNCTION__);
       return PVR_ERROR_NO_ERROR;
     }
     else
@@ -647,7 +805,6 @@
   {
     XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
   }
-  m_con.Unlock();
   return PVR_ERROR_FAILED;
 }
 
@@ -662,9 +819,9 @@
     XBMC->Log(LOG_DEBUG, "%s - Reading Bookmark for: %s", __FUNCTION__, recording.strTitle);
   }
 
-  m_con.Lock();
+  CLockObject lock(m_recordingsLock);
   ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId);
-  if (it != m_recordings.end())
+  if (it != m_recordings.end() && it->second.HasBookmark())
   {
     long long frameOffset = m_con.GetBookmark(it->second); // returns 0 if no bookmark was found
     if (frameOffset > 0)
@@ -673,8 +830,10 @@
       {
         XBMC->Log(LOG_DEBUG, "%s - FrameOffset: %lld)", __FUNCTION__, frameOffset);
       }
-
-      float frameRate = GetRecordingFrameRate(it->second);
+      // Pin framerate value
+      if (it->second.Framterate() <0)
+        it->second.SetFramerate(m_db.GetRecordingFrameRate(it->second));
+      float frameRate = (float)it->second.Framterate() / 1000.0f;
       if (frameRate > 0)
       {
         bookmark = (int)((float)frameOffset / frameRate);
@@ -687,53 +846,19 @@
   }
   else
   {
-    XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
-    m_con.Unlock();
-    return PVR_ERROR_FAILED;
-  }
-
-  // Set the bookmark few seconds earlier (due to the accuracy of the above float operations)
-  bookmark = bookmark - 3;
-  if (bookmark < 0) bookmark = 0;
-  m_con.Unlock();
-  return bookmark;
-}
-
-float PVRClientMythTV::GetRecordingFrameRate(MythProgramInfo &recording)
-{
-  // MythTV uses frame offsets whereas XBMC expects a time offset.
-  // This function can be used to convert the frame offsets to time offsets and back.
-  // The average frameRate is calculated by: frameRate = frameCount / duration.
-  float frameRate = 0.0f;
-
-  if (g_bExtraDebug)
-  {
-    XBMC->Log(LOG_DEBUG, "%s - Getting Framerate for: %s)", __FUNCTION__, recording.Title(false).c_str());
-  }
-
-  // cmyth_get_bookmark_mark returns the appropriate frame offset for the given byte offset (recordedseek table)
-  // This can be used to determine the frame count (by querying the max byte offset)
-  long long frameCount = m_db.GetBookmarkMark(recording, LLONG_MAX, 0);
-  if (frameCount > 0)
-  {
-    if (g_bExtraDebug)
+    if (it == m_recordings.end())
     {
-      XBMC->Log(LOG_DEBUG, "%s - FrameCount: %lld)", __FUNCTION__, frameCount);
-      XBMC->Log(LOG_DEBUG, "%s - Duration: %d)", __FUNCTION__, recording.Duration());
+      XBMC->Log(LOG_ERROR, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
     }
-
-    if (recording.Duration() > 0)
+    else if (!it->second.HasBookmark() && g_bExtraDebug)
     {
-      // Calculate frameRate
-      frameRate = (float)frameCount / (float)recording.Duration();
-
-      if (g_bExtraDebug)
-      {
-        XBMC->Log(LOG_DEBUG, "%s - FrameRate: %f)", __FUNCTION__, frameRate);
-      }
+      XBMC->Log(LOG_DEBUG, "%s - Recording %s has no bookmark", __FUNCTION__, recording.strRecordingId);
     }
+    return bookmark;
   }
-  return frameRate;
+
+  if (bookmark < 0) bookmark = 0;
+  return bookmark;
 }
 
 int PVRClientMythTV::GetTimersAmount(void)
@@ -741,7 +866,7 @@
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
-  TimerMap timers = m_db.GetTimers();
+  RecordingRuleMap timers = m_db.GetRecordingRules();
   return timers.size();
 }
 
@@ -750,29 +875,29 @@
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
-  TimerMap timers = m_db.GetTimers();
+  RecordingRuleMap rules = m_db.GetRecordingRules();
   m_recordingRules.clear();
 
-  for (TimerMap::iterator it = timers.begin(); it != timers.end(); it++)
+  for (RecordingRuleMap::iterator it = rules.begin(); it != rules.end(); ++it)
     m_recordingRules.push_back(it->second);
 
   //Search for modifiers and add links to them
-  for (RecordingRuleList::iterator it = m_recordingRules.begin(); it != m_recordingRules.end(); it++)
-    if (it->Type() == MythTimer::DontRecord || it->Type() == MythTimer::OverrideRecord)
-      for (RecordingRuleList::iterator it2 = m_recordingRules.begin(); it2 != m_recordingRules.end(); it2++)
-        if (it2->Type() != MythTimer::DontRecord && it2->Type() != MythTimer::OverrideRecord)
+  for (RecordingRuleList::iterator it = m_recordingRules.begin(); it != m_recordingRules.end(); ++it)
+    if (it->Type() == MythRecordingRule::DontRecord || it->Type() == MythRecordingRule::OverrideRecord)
+      for (RecordingRuleList::iterator it2 = m_recordingRules.begin(); it2 != m_recordingRules.end(); ++it2)
+        if (it2->Type() != MythRecordingRule::DontRecord && it2->Type() != MythRecordingRule::OverrideRecord)
           if (it->SameTimeslot(*it2) && !it->GetParent())
           {
-            it2->AddModifier(*it);
+            it2->AddOverrideRule(*it);
             it->SetParent(*it2);
           }
 
   ProgramInfoMap upcomingRecordings = m_con.GetPendingPrograms();
-  for (ProgramInfoMap::iterator it = upcomingRecordings.begin(); it != upcomingRecordings.end(); it++)
+  for (ProgramInfoMap::iterator it = upcomingRecordings.begin(); it != upcomingRecordings.end(); ++it)
   {
     // When deleting a timer from mythweb, it might happen that it's removed from database
     // but it's still present over mythprotocol. Skip those timers, because timers.at would crash.
-    if (timers.count(it->second.RecordID()) == 0)
+    if (rules.count(it->second.RecordID()) == 0)
     {
       XBMC->Log(LOG_DEBUG, "%s - Skipping timer that is no more in database", __FUNCTION__);
       continue;
@@ -785,8 +910,8 @@
     tag.endTime = it->second.RecordingEndTime();
     tag.iClientChannelUid = it->second.ChannelID();
     tag.iClientIndex = it->second.RecordID();
-    tag.iMarginEnd = timers.at(it->second.RecordID()).EndOffset();
-    tag.iMarginStart = timers.at(it->second.RecordID()).StartOffset();
+    tag.iMarginEnd = rules.at(it->second.RecordID()).EndOffset();
+    tag.iMarginStart = rules.at(it->second.RecordID()).StartOffset();
     tag.iPriority = it->second.Priority();
     tag.bIsRepeating = false;
     tag.firstDay = 0;
@@ -797,13 +922,17 @@
     tag.iGenreType = genre & 0xF0;
 
     // Title
-    CStdString title = it->second.Title(true);
+    CStdString title = it->second.Title();
+    CStdString subtitle = it->second.Subtitle();
+    if (!subtitle.IsEmpty())
+      title += SUBTITLE_SEPARATOR + subtitle;
+
     if (title.IsEmpty())
     {
       MythProgram epgProgram;
-      title= "%";
-      m_db.FindProgram(tag.startTime, tag.iClientChannelUid, title, &epgProgram);
-      title = epgProgram.title;
+      bool hasEpgProgram = m_db.FindProgram(tag.startTime, tag.iClientChannelUid, "%", &epgProgram);
+      if (hasEpgProgram)
+        title = epgProgram.title;
     }
     PVR_STRCPY(tag.strTitle, title);
 
@@ -816,6 +945,8 @@
     switch (it->second.Status())
     {
     case RS_RECORDING:
+      tag.state = PVR_TIMER_STATE_RECORDING;
+      break;
     case RS_TUNING:
       tag.state = PVR_TIMER_STATE_RECORDING;
       break;
@@ -828,25 +959,15 @@
     case RS_WILL_RECORD:
       tag.state = PVR_TIMER_STATE_SCHEDULED;
       break;
-    case RS_UNKNOWN:
-    case RS_DONT_RECORD:
-    case RS_PREVIOUS_RECORDING:
-    case RS_CURRENT_RECORDING:
-    case RS_EARLIER_RECORDING:
-    case RS_TOO_MANY_RECORDINGS:
-    case RS_NOT_LISTED:
     case RS_CONFLICT:
-    case RS_LATER_SHOWING:
-    case RS_REPEAT:
-    case RS_INACTIVE:
-    case RS_NEVER_RECORD:
-    case RS_OFFLINE:
-    case RS_OTHER_SHOWING:
+      tag.state = PVR_TIMER_STATE_CONFLICT_NOK;
+      break;
     case RS_FAILED:
-    case RS_TUNER_BUSY:
+      tag.state = PVR_TIMER_STATE_ERROR;
+      break;
     case RS_LOW_DISKSPACE:
-    case RS_CANCELLED:
-    case RS_MISSED:
+      tag.state = PVR_TIMER_STATE_ERROR;
+      break;
     default:
       tag.state = PVR_TIMER_STATE_CANCELLED;
       break;
@@ -873,40 +994,22 @@
   return PVR_ERROR_NO_ERROR;
 }
 
-// kManualSearch = http://www.gossamer-threads.com/lists/mythtv/dev/155150?search_string=kManualSearch;#155150
-
 PVR_ERROR PVRClientMythTV::AddTimer(const PVR_TIMER &timer)
 {
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - title: %s, start: %i, end: %i, chanID: %i", __FUNCTION__, timer.strTitle, timer.startTime, timer.iClientChannelUid);
+  XBMC->Log(LOG_DEBUG, "%s - title: %s, start: %ld, end: %ld, chanID: %u", __FUNCTION__, timer.strTitle, timer.startTime, timer.endTime, timer.iClientChannelUid);
 
-  MythTimer mt;
-  m_con.DefaultTimer(mt);
-  CStdString category = m_categories.Category(timer.iGenreType);
-  mt.SetCategory(category);
-  mt.SetChannelID(timer.iClientChannelUid);
-  mt.SetCallsign(m_channels.at(timer.iClientChannelUid).Callsign());
-  mt.SetDescription(timer.strSummary);
-  mt.SetEndOffset(timer.iMarginEnd);
-  mt.SetEndTime(timer.endTime);
-  mt.SetInactive(timer.state == PVR_TIMER_STATE_ABORTED ||timer.state ==  PVR_TIMER_STATE_CANCELLED);
-  mt.SetPriority(timer.iPriority);
-  mt.SetStartOffset(timer.iMarginStart);
-  mt.SetStartTime(timer.startTime);
-  mt.SetTitle(timer.strTitle, true);
-  CStdString title = mt.Title(false);
-  mt.SetSearchType(m_db.FindProgram(timer.startTime, timer.iClientChannelUid, title, NULL) ? MythTimer::NoSearch : MythTimer::ManualSearch);
-  mt.SetType(timer.bIsRepeating ? (timer.iWeekdays == 127 ? MythTimer::TimeslotRecord : MythTimer::WeekslotRecord) : MythTimer::SingleRecord);
+  MythRecordingRule rule;
 
-  int id = m_db.AddTimer(mt);
-  if (id<0)
+  // Fill rule with timer data
+  PVRtoMythRecordingRule(timer, rule);
+
+  if (!m_db.AddRecordingRule(rule))
     return PVR_ERROR_FAILED;
 
-  if (!m_con.UpdateSchedules(id))
+  if (!m_con.UpdateSchedules(rule.RecordID()))
     return PVR_ERROR_FAILED;
 
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done - %i", __FUNCTION__, id);
+  XBMC->Log(LOG_DEBUG, "%s - Done - %d", __FUNCTION__, rule.RecordID());
 
   // Completion of the scheduling will be signaled by a SCHEDULE_CHANGE event.
   // Thus no need to call TriggerTimerUpdate().
@@ -918,198 +1021,309 @@
 {
   (void)bForceDelete;
 
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - title: %s, start: %i, end: %i, chanID: %i", __FUNCTION__, timer.strTitle, timer.startTime, timer.iClientChannelUid);
+  XBMC->Log(LOG_DEBUG, "%s - title: %s, start: %ld, end: %ld, chanID: %u", __FUNCTION__, timer.strTitle, timer.startTime, timer.endTime, timer.iClientChannelUid);
+
+  RecordingRule rule = m_recordingRules[(timer.iClientIndex)>>16];
+  if (rule.GetParent())
+    rule = *rule.GetParent();
 
-  TimerMap timers = m_db.GetTimers();
-  RecordingRule recordingRule = m_recordingRules[(timer.iClientIndex)>>16];
-  if (recordingRule.GetParent())
-    recordingRule = *recordingRule.GetParent();
-
-  // Delete related Override and Don't Record timers
-  std::vector<RecordingRule*> modifiers = recordingRule.GetModifiers();
-  for (std::vector <RecordingRule*>::iterator it = modifiers.begin(); it != modifiers.end(); ++it)
-    m_db.DeleteTimer((*it)->RecordID());
+  // Delete related override rules
+  std::vector<RecordingRule*> overrideRules = rule.GetOverrideRules();
+  for (std::vector<RecordingRule*>::iterator it = overrideRules.begin(); it != overrideRules.end(); ++it)
+  {
+    // Stop recording scheduled by the override rule before delete
+    for (std::vector<std::pair<PVR_TIMER, MythProgramInfo> >::iterator ip = (*it)->begin(); ip != (*it)->end(); ++ip)
+    {
+      XBMC->Log(LOG_DEBUG, "%s - recording %s, status = %d", __FUNCTION__, (ip->second).UID().c_str(), (ip->second).Status());
+      if ((ip->second).Status() == RS_RECORDING || (ip->second).Status() == RS_TUNING)
+      {
+        XBMC->Log(LOG_DEBUG, "%s - Stop recording %s", __FUNCTION__, (ip->second).UID().c_str());
+        m_con.StopRecording(ip->second);
+      }
+    }
+    XBMC->Log(LOG_DEBUG, "%s - Delete recording rule %u (modifier of rule %u)", __FUNCTION__, (*it)->RecordID(), rule.RecordID());
+    if (!m_db.DeleteRecordingRule((*it)->RecordID()))
+      return PVR_ERROR_FAILED;
+  }
 
-  if (!m_db.DeleteTimer(recordingRule.RecordID()))
+  // Delete parent rule
+  for (std::vector<std::pair<PVR_TIMER, MythProgramInfo> >::iterator ip = rule.begin(); ip != rule.end(); ++ip)
+  {
+    // Stop recording scheduled by the parent rule
+    XBMC->Log(LOG_DEBUG, "%s - recording %s, status = %d", __FUNCTION__, (ip->second).UID().c_str(), (ip->second).Status());
+    if ((ip->second).Status() == RS_RECORDING || (ip->second).Status() == RS_TUNING)
+    {
+      XBMC->Log(LOG_DEBUG, "%s - Stop recording %s", __FUNCTION__, (ip->second).UID().c_str());
+      m_con.StopRecording(ip->second);
+    }
+  }
+  XBMC->Log(LOG_DEBUG, "%s - Delete recording rule %u", __FUNCTION__, rule.RecordID());
+  if (!m_db.DeleteRecordingRule(rule.RecordID()))
     return PVR_ERROR_FAILED;
 
   m_con.UpdateSchedules(-1);
 
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done", __FUNCTION__);
+  XBMC->Log(LOG_DEBUG, "%s - Done", __FUNCTION__);
 
   PVR->TriggerTimerUpdate();
 
   return PVR_ERROR_NO_ERROR;
 }
 
-void PVRClientMythTV::PVRtoMythTimer(const PVR_TIMER timer, MythTimer &mt)
+void PVRClientMythTV::PVRtoMythRecordingRule(const PVR_TIMER timer, MythRecordingRule &rule)
 {
-  CStdString category = m_categories.Category(timer.iGenreType);
-  mt.SetCategory(category);
-  mt.SetChannelID(timer.iClientChannelUid);
-  mt.SetCallsign(m_channels.at(timer.iClientChannelUid).Callsign());
-  mt.SetDescription(timer.strSummary);
-  mt.SetEndOffset(timer.iMarginEnd);
-  mt.SetEndTime(timer.endTime);
-  mt.SetInactive(timer.state == PVR_TIMER_STATE_ABORTED ||timer.state ==  PVR_TIMER_STATE_CANCELLED);
-  mt.SetPriority(timer.iPriority);
-  mt.SetStartOffset(timer.iMarginStart);
-  mt.SetStartTime(timer.startTime);
-  mt.SetTitle(timer.strTitle,true);
-  CStdString title = mt.Title(false);
-  mt.SetSearchType(m_db.FindProgram(timer.startTime, timer.iClientChannelUid, title, NULL) ? MythTimer::NoSearch : MythTimer::ManualSearch);
-  mt.SetType(timer.bIsRepeating ? (timer.iWeekdays == 127 ? MythTimer::TimeslotRecord : MythTimer::WeekslotRecord) : MythTimer::SingleRecord);
-  mt.SetRecordID(timer.iClientIndex);
+  MythProgram program;
+  bool programFound = m_db.FindProgram(timer.startTime, timer.iClientChannelUid, "%", &program);
+
+  // Load rule template from selected provider
+  switch (g_iRecTemplateType)
+  {
+  case 1: // Template provider is 'MythTV', then load the template from backend.
+    if (programFound)
+      rule = m_db.LoadRecordingRuleTemplate(program.category, program.category_type);
+    else
+      rule = m_db.LoadRecordingRuleTemplate("", "");
+    break;
+  case 0: // Template provider is 'Internal', then set rule with settings
+    rule.SetAutoCommFlag(g_bRecAutoCommFlag);
+    rule.SetAutoMetadata(g_bRecAutoMetadata);
+    rule.SetAutoTranscode(g_bRecAutoTranscode);
+    rule.SetUserJob(1, g_bRecAutoRunJob1);
+    rule.SetUserJob(2, g_bRecAutoRunJob2);
+    rule.SetUserJob(3, g_bRecAutoRunJob3);
+    rule.SetUserJob(4, g_bRecAutoRunJob4);
+    rule.SetAutoExpire(g_bRecAutoExpire);
+    rule.SetTranscoder(g_iRecTranscoder);
+  }
+
+  // Override template with PVR settings
+  rule.SetStartOffset(timer.iMarginStart);
+  rule.SetEndOffset(timer.iMarginEnd);
+  rule.SetPriority(timer.iPriority);
+
+  // Category override
+  if (programFound)
+  {
+    CStdString overTimeCategory = m_db.GetSetting("OverTimeCategory");
+    if (!overTimeCategory.IsEmpty() && (overTimeCategory.Equals(program.category) || overTimeCategory.Equals(program.category_type)))
+    {
+      CStdString categoryOverTime = m_db.GetSetting("CategoryOverTime");
+      XBMC->Log(LOG_DEBUG, "Overriding end offset for category %s: +%s", overTimeCategory.c_str(), categoryOverTime.c_str());
+      rule.SetEndOffset(rule.EndOffset() + atoi(categoryOverTime));
+    }
+  }
+
+  // If we have an entry in the EPG for the timer, we use it to set title and subtitle from it
+  // PVR_TIMER has no subtitle thus might send it encoded within the title.
+  if (programFound)
+  {
+    rule.SetSearchType(MythRecordingRule::NoSearch);
+    rule.SetTitle(program.title);
+    rule.SetSubtitle(program.subtitle);
+    rule.SetCategory(program.category);
+  }
+  else
+  {
+    // kManualSearch = http://www.gossamer-threads.com/lists/mythtv/dev/155150?search_string=kManualSearch;#155150
+    rule.SetSearchType(MythRecordingRule::ManualSearch);
+    rule.SetTitle(timer.strTitle);
+    rule.SetCategory(m_categories.Category(timer.iGenreType));
+  }
+  rule.SetDescription(timer.strSummary);
+  rule.SetChannelID(timer.iClientChannelUid);
+  rule.SetStartTime((timer.startTime == 0 ? time(NULL) : timer.startTime));
+  rule.SetEndTime(timer.endTime);
+  rule.SetInactive(timer.state == PVR_TIMER_STATE_ABORTED || timer.state ==  PVR_TIMER_STATE_CANCELLED);
+
+  ChannelIdMap::iterator channelIt = m_channelsById.find(timer.iClientChannelUid);
+  if (channelIt != m_channelsById.end())
+    rule.SetCallsign(channelIt->second.Callsign());
+
+  if (timer.bIsRepeating)
+  {
+    if (timer.iWeekdays == 0x7F)
+      rule.SetType(MythRecordingRule::TimeslotRecord);
+    else
+      rule.SetType(MythRecordingRule::WeekslotRecord);
+  }
+  else
+  {
+    rule.SetType(MythRecordingRule::SingleRecord);
+  }
 }
 
 PVR_ERROR PVRClientMythTV::UpdateTimer(const PVR_TIMER &timer)
 {
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s - title: %s, start: %i, end: %i, chanID: %i, ID: %i", __FUNCTION__, timer.strTitle, timer.startTime, timer.iClientChannelUid, timer.iClientIndex);
+  XBMC->Log(LOG_DEBUG, "%s - title: %s, start: %ld, end: %ld, chanID: %u", __FUNCTION__, timer.strTitle, timer.startTime, timer.endTime, timer.iClientChannelUid);
 
-  RecordingRule r = m_recordingRules[(timer.iClientIndex) >> 16];
-  PVR_TIMER oldPvrTimer = r[(timer.iClientIndex) & 0xffff].first;
+  RecordingRule oldRule = m_recordingRules[(timer.iClientIndex) >> 16];
+  PVR_TIMER oldTimer = oldRule[(timer.iClientIndex) & 0xffff].first;
   {
     bool createNewRule = false;
     bool createNewOverrideRule = false;
-    MythTimer mt;
-    PVRtoMythTimer(timer, mt);
-    mt.SetDescription(oldPvrTimer.strSummary); // Fix broken description
-    mt.SetInactive(false);
-    mt.SetRecordID(r.RecordID());
+    MythRecordingRule rule;
+    PVRtoMythRecordingRule(timer, rule);
+    rule.SetDescription(oldTimer.strSummary); // Fix broken description
+    rule.SetInactive(false);
+    rule.SetRecordID(oldRule.RecordID());
 
     // These should trigger a manual search or a new rule
-    if (oldPvrTimer.iClientChannelUid != timer.iClientChannelUid ||
-      oldPvrTimer.endTime != timer.endTime ||
-      oldPvrTimer.startTime != timer.startTime ||
-      oldPvrTimer.startTime != timer.startTime ||
-      strcmp(oldPvrTimer.strTitle, timer.strTitle) ||
-      //strcmp(oldPvrTimer.strSummary, timer.strSummary) ||
+    if (oldTimer.iClientChannelUid != timer.iClientChannelUid ||
+      oldTimer.endTime != timer.endTime ||
+      oldTimer.startTime != timer.startTime ||
+      strcmp(oldTimer.strTitle, timer.strTitle) ||
       timer.bIsRepeating
       )
       createNewRule = true;
 
     // Change type
-    if (oldPvrTimer.state != timer.state)
+    if (oldTimer.state != timer.state)
     {
-      if (r.Type() != MythTimer::SingleRecord && !createNewRule)
+      if (rule.Type() != MythRecordingRule::SingleRecord && !createNewRule)
       {
         if (timer.state == PVR_TIMER_STATE_ABORTED || timer.state == PVR_TIMER_STATE_CANCELLED)
-          mt.SetType(MythTimer::DontRecord);
+          rule.SetType(MythRecordingRule::DontRecord);
         else
-          mt.SetType(MythTimer::OverrideRecord);
+          rule.SetType(MythRecordingRule::OverrideRecord);
         createNewOverrideRule = true;
       }
       else
-        mt.SetInactive(timer.state == PVR_TIMER_STATE_ABORTED || timer.state == PVR_TIMER_STATE_CANCELLED);
+        rule.SetInactive(timer.state == PVR_TIMER_STATE_ABORTED || timer.state == PVR_TIMER_STATE_CANCELLED);
     }
 
     // These can be updated without triggering a new rule
-    if (oldPvrTimer.iMarginEnd != timer.iMarginEnd ||
-      oldPvrTimer.iPriority != timer.iPriority ||
-      oldPvrTimer.iMarginStart != timer.iMarginStart)
+    if (oldTimer.iMarginEnd != timer.iMarginEnd ||
+      oldTimer.iPriority != timer.iPriority ||
+      oldTimer.iMarginStart != timer.iMarginStart)
       createNewOverrideRule = true;
 
     CStdString title = timer.strTitle;
     if (createNewRule)
-      mt.SetSearchType(m_db.FindProgram(timer.startTime, timer.iClientChannelUid, title, NULL) ? MythTimer::NoSearch : MythTimer::ManualSearch);
-    if (createNewOverrideRule && r.SearchType() == MythTimer::ManualSearch)
-      mt.SetSearchType(MythTimer::ManualSearch);
+      rule.SetSearchType(m_db.FindProgram(timer.startTime, timer.iClientChannelUid, title, NULL) ? MythRecordingRule::NoSearch : MythRecordingRule::ManualSearch);
+    if (createNewOverrideRule && oldRule.SearchType() == MythRecordingRule::ManualSearch)
+      rule.SetSearchType(MythRecordingRule::ManualSearch);
 
-    if (r.Type() == MythTimer::DontRecord || r.Type() == MythTimer::OverrideRecord)
+    if (oldRule.Type() == MythRecordingRule::DontRecord || oldRule.Type() == MythRecordingRule::OverrideRecord)
       createNewOverrideRule = false;
 
-    if (createNewRule && r.Type() != MythTimer::SingleRecord)
+    if (createNewRule && oldRule.Type() != MythRecordingRule::SingleRecord)
     {
-      if (!m_db.AddTimer(mt))
+      if (!m_db.AddRecordingRule(rule))
         return PVR_ERROR_FAILED;
 
-      MythTimer mtold;
-      PVRtoMythTimer(oldPvrTimer, mtold);
-      mtold.SetType(MythTimer::DontRecord);
+      MythRecordingRule mtold;
+      PVRtoMythRecordingRule(oldTimer, mtold);
+      mtold.SetType(MythRecordingRule::DontRecord);
       mtold.SetInactive(false);
-      mtold.SetRecordID(r.RecordID());
-      int id = r.RecordID();
-      if (r.Type() == MythTimer::DontRecord || r.Type() == MythTimer::OverrideRecord)
-        m_db.UpdateTimer(mtold);
+      mtold.SetRecordID(oldRule.RecordID());
+      int id = oldRule.RecordID();
+      if (oldRule.Type() == MythRecordingRule::DontRecord || oldRule.Type() == MythRecordingRule::OverrideRecord)
+        m_db.UpdateRecordingRule(mtold);
       else
-        id=m_db.AddTimer(mtold); // Blocks old record rule
+        id = m_db.AddRecordingRule(mtold); // Blocks old record rule
       m_con.UpdateSchedules(id);
     }
-    else if (createNewOverrideRule &&  r.Type() != MythTimer::SingleRecord )
+    else if (createNewOverrideRule &&  oldRule.Type() != MythRecordingRule::SingleRecord )
     {
-      if (mt.Type() != MythTimer::DontRecord && mt.Type() != MythTimer::OverrideRecord)
-        mt.SetType(MythTimer::OverrideRecord);
-      if (!m_db.AddTimer(mt))
+      if (rule.Type() != MythRecordingRule::DontRecord && rule.Type() != MythRecordingRule::OverrideRecord)
+        rule.SetType(MythRecordingRule::OverrideRecord);
+      if (!m_db.AddRecordingRule(rule))
         return PVR_ERROR_FAILED;
     }
     else
     {
-      if (!m_db.UpdateTimer(mt))
+      if (!m_db.UpdateRecordingRule(rule))
         return PVR_ERROR_FAILED;
     }
-    m_con.UpdateSchedules(mt.RecordID());
+    m_con.UpdateSchedules(rule.RecordID());
   }
 
-  if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s - Done", __FUNCTION__);
+  XBMC->Log(LOG_DEBUG,"%s - Done", __FUNCTION__);
   return PVR_ERROR_NO_ERROR;
 }
 
 bool PVRClientMythTV::OpenLiveStream(const PVR_CHANNEL &channel)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG,"%s - chanID: %i, channumber: %i", __FUNCTION__, channel.iUniqueId, channel.iChannelNumber);
+    XBMC->Log(LOG_DEBUG,"%s - chanID: %u, channumber: %u", __FUNCTION__, channel.iUniqueId, channel.iChannelNumber);
+
+  // Check event connection
+  if (!m_pEventHandler->IsListening())
+  {
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30302)); // MythTV backend unavailable
+    return false;
+  }
 
   CLockObject lock(m_lock);
   if (m_rec.IsNull())
   {
+    LoadChannelsAndChannelGroups();
+
     // Suspend fileOps to avoid connection hang
     if (m_fileOps->IsRunning())
       m_fileOps->Suspend();
 
     // Enable playback mode: Keep quiet on connection
-    if (m_pEventHandler)
+    m_pEventHandler->EnablePlayback();
+
+    // First we have to get the channum of the selected channel
+    // Due to the merged view (same channum+callsign) this might not yet be the preferred channel on the preferred source to switch to
+    ChannelIdMap::iterator channelByIdIt = m_channelsById.find(channel.iUniqueId);
+    if (channelByIdIt == m_channelsById.end())
     {
-      m_pEventHandler->EnablePlayback();
+      XBMC->Log(LOG_ERROR,"%s - Channel not found", __FUNCTION__);
+      return false;
     }
 
-    MythChannel chan = m_channels.at(channel.iUniqueId);
-    for (std::vector<int>::iterator it = m_sources.at(chan.SourceID()).begin(); it != m_sources.at(chan.SourceID()).end(); it++)
-    {
-      m_rec = m_con.GetRecorder(*it);
-      if (m_rec.ID() > 0 && !m_rec.IsRecording() && m_rec.IsTunable(chan))
+    // Retreive a list of recorders and sources for the given channum (ordered by LiveTV priority)
+    RecorderSourceList recorderSourceList = m_db.GetLiveTVRecorderSourceList(channelByIdIt->second.Number());
+    for (RecorderSourceList::iterator recorderSourceIt = recorderSourceList.begin(); recorderSourceIt != recorderSourceList.end(); ++recorderSourceIt)
+    {
+      // Get the recorder from the recorder source list and check if it's available
+      m_rec = m_con.GetRecorder(recorderSourceIt->first);
+      if (m_rec.IsNull() || m_rec.ID() <= 0)
       {
-        if (g_bExtraDebug)
-          XBMC->Log(LOG_DEBUG,"%s: Opening new recorder %i", __FUNCTION__, m_rec.ID());
+        XBMC->Log(LOG_ERROR,"%s - Recorder not found: %u", __FUNCTION__, recorderSourceIt->first);
+        continue;
+      }
+      if (m_rec.IsRecording())
+      {
+        XBMC->Log(LOG_ERROR,"%s - Recorder is busy: %u", __FUNCTION__, recorderSourceIt->first);
+        continue;
+      }
 
-        if (m_pEventHandler)
+      // Get the channel that matches the channum and the source id
+      std::pair<ChannelNumberMap::iterator, ChannelNumberMap::iterator> channelsByNumber = m_channelsByNumber.equal_range(channelByIdIt->second.Number());
+      for (ChannelNumberMap::iterator channelByNumberIt = channelsByNumber.first; channelByNumberIt != channelsByNumber.second; ++channelByNumberIt)
+      {
+        if ((*channelByNumberIt).second.SourceID() == recorderSourceIt->second)
         {
-          m_pEventHandler->SetRecorder(m_rec);
+          // Check if the recorder is able to tune to that channel (virtual recorders might be locked to a multiplex ID)
+          if (m_rec.IsTunable((*channelByNumberIt).second))
+          {
+            XBMC->Log(LOG_DEBUG,"%s: Opening new recorder %u", __FUNCTION__, m_rec.ID());
+
+            m_pEventHandler->SetRecorder(m_rec);
+
+            if (m_rec.SpawnLiveTV((*channelByNumberIt).second))
+              return true;
+          }
         }
-        if (m_rec.SpawnLiveTV(chan))
-          return true;
-      }
-      m_rec = MythRecorder();
-      if (m_pEventHandler)
-      {
-        m_pEventHandler->SetRecorder(m_rec); // Redundant
       }
     }
 
+    // Failed to open live stream (channel unavailable)
+    m_rec = MythRecorder();
+    m_pEventHandler->SetRecorder(m_rec);
+
     // Disable playback mode: Allow all
-    if (m_pEventHandler)
-    {
-      m_pEventHandler->DisablePlayback();
-    }
+    m_pEventHandler->DisablePlayback();
 
     // Resume fileOps
     m_fileOps->Resume();
 
-    if (g_bExtraDebug)
-      XBMC->Log(LOG_DEBUG,"%s - Done", __FUNCTION__);
+    XBMC->Log(LOG_ERROR,"%s - Failed to open live stream", __FUNCTION__);
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30305)); // Channel unavailable
 
     return false;
   }
@@ -1130,19 +1344,15 @@
 
   CLockObject lock(m_lock);
 
-  if (m_pEventHandler)
-    m_pEventHandler->PreventLiveChainUpdate();
+  m_pEventHandler->PreventLiveChainUpdate();
 
   if (!m_rec.Stop())
     XBMC->Log(LOG_NOTICE, "%s - Stop live stream failed", __FUNCTION__);
   m_rec = MythRecorder();
 
-  if (m_pEventHandler)
-  {
-    m_pEventHandler->SetRecorder(m_rec);
-    m_pEventHandler->DisablePlayback();
-    m_pEventHandler->AllowLiveChainUpdate();
-  }
+  m_pEventHandler->SetRecorder(m_rec);
+  m_pEventHandler->DisablePlayback();
+  m_pEventHandler->AllowLiveChainUpdate();
 
   // Resume fileOps
   m_fileOps->Resume();
@@ -1156,7 +1366,7 @@
 int PVRClientMythTV::ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - size: %i", __FUNCTION__, iBufferSize);
+    XBMC->Log(LOG_DEBUG, "%s - size: %u", __FUNCTION__, iBufferSize);
 
   CLockObject lock(m_lock);
 
@@ -1165,7 +1375,7 @@
 
   int dataread = m_rec.ReadLiveTV(pBuffer, iBufferSize);
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s: Read %i Bytes", __FUNCTION__, dataread);
+    XBMC->Log(LOG_DEBUG, "%s: Read %d Bytes", __FUNCTION__, dataread);
   else if (dataread==0)
     XBMC->Log(LOG_INFO, "%s: Read 0 Bytes!", __FUNCTION__);
   return dataread;
@@ -1188,23 +1398,20 @@
 bool PVRClientMythTV::SwitchChannel(const PVR_CHANNEL &channelinfo)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - chanID: %i", __FUNCTION__, channelinfo.iUniqueId);
+    XBMC->Log(LOG_DEBUG, "%s - chanID: %u", __FUNCTION__, channelinfo.iUniqueId);
 
-  bool retval = false;
+  bool retval;
 
   //Close current live stream for reopening
   //Keep playback mode enabled
-  if (m_pEventHandler)
-    m_pEventHandler->PreventLiveChainUpdate();
+  m_pEventHandler->PreventLiveChainUpdate();
 
   retval = m_rec.Stop();
+
   m_rec = MythRecorder();
+  m_pEventHandler->SetRecorder(m_rec);
+  m_pEventHandler->AllowLiveChainUpdate();
 
-  if (m_pEventHandler)
-  {
-    m_pEventHandler->SetRecorder(m_rec);
-    m_pEventHandler->AllowLiveChainUpdate();
-  }
   //Try to reopen live stream
   if (retval)
     retval = OpenLiveStream(channelinfo);
@@ -1224,7 +1431,7 @@
 long long PVRClientMythTV::SeekLiveStream(long long iPosition, int iWhence)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - pos: %i, whence: %i", __FUNCTION__, iPosition, iWhence);
+    XBMC->Log(LOG_DEBUG, "%s - pos: %lld, whence: %d", __FUNCTION__, iPosition, iWhence);
 
   CLockObject lock(m_lock);
 
@@ -1242,7 +1449,7 @@
   long long retval = m_rec.LiveTVSeek(iPosition, whence);
 
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done - pos: %i", __FUNCTION__, retval);
+    XBMC->Log(LOG_DEBUG, "%s - Done - pos: %lld", __FUNCTION__, retval);
 
   return retval;
 }
@@ -1260,7 +1467,7 @@
   long long retval = m_rec.LiveTVDuration();
 
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done - duration: %i", __FUNCTION__, retval);
+    XBMC->Log(LOG_DEBUG, "%s - Done - duration: %lld", __FUNCTION__, retval);
 
   return retval;
 }
@@ -1270,11 +1477,12 @@
   if (g_bExtraDebug)
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
+  // Check event connection
+  if (!m_pEventHandler->IsListening())
+    return PVR_ERROR_SERVER_ERROR;
+
   MythSignal signal;
-  if (m_pEventHandler)
-  {
-    signal = m_pEventHandler->GetSignal();
-  }
+  signal = m_pEventHandler->GetSignal();
 
   signalStatus.dAudioBitrate = 0;
   signalStatus.dDolbyBitrate = 0;
@@ -1285,7 +1493,7 @@
   signalStatus.iUNC = signal.UNC();
 
   CStdString ID;
-  ID.Format("Myth Recorder %i", signal.ID());
+  ID.Format("Myth Recorder %u", signal.ID());
 
   CStdString strAdapterStatus = signal.AdapterStatus();
   strcpy(signalStatus.strAdapterName, ID.Buffer());
@@ -1300,8 +1508,16 @@
 bool PVRClientMythTV::OpenRecordedStream(const PVR_RECORDING &recording)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - title: %s, ID: %s, duration: %i", __FUNCTION__, recording.strTitle, recording.strRecordingId, recording.iDuration);
+    XBMC->Log(LOG_DEBUG, "%s - title: %s, ID: %s, duration: %d", __FUNCTION__, recording.strTitle, recording.strRecordingId, recording.iDuration);
+
+  // Check event connection
+  if (!m_pEventHandler->IsListening())
+  {
+    XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30302)); // MythTV backend unavailable
+    return false;
+  }
 
+  CLockObject lock(m_recordingsLock);
   ProgramInfoMap::iterator it = m_recordings.find(recording.strRecordingId);
   if (it != m_recordings.end())
   {
@@ -1309,12 +1525,10 @@
     m_fileOps->Suspend();
 
     // Enable playback mode: Keep quiet on connection
-    if (m_pEventHandler)
-      m_pEventHandler->EnablePlayback();
+    m_pEventHandler->EnablePlayback();
 
     m_file = m_con.ConnectFile(it->second);
-    if (m_pEventHandler)
-      m_pEventHandler->SetRecordingListener(recording.strRecordingId, m_file);
+    m_pEventHandler->SetRecordingListener(recording.strRecordingId, m_file);
 
     // Resume fileOps
     if (m_file.IsNull())
@@ -1322,20 +1536,16 @@
       m_fileOps->Resume();
 
       // Disable playback mode: Allow all
-      if (m_pEventHandler)
-        m_pEventHandler->DisablePlayback();
+      m_pEventHandler->DisablePlayback();
     }
 
     if (g_bExtraDebug)
-      XBMC->Log(LOG_DEBUG, "%s - Done - %i", __FUNCTION__, !m_file.IsNull());
+      XBMC->Log(LOG_DEBUG, "%s - Done - %s", __FUNCTION__, (m_file.IsNull() ? "false" : "true"));
 
     return !m_file.IsNull();
   }
-  else
-  {
-    XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
-    return false;
-  }
+  XBMC->Log(LOG_DEBUG, "%s - Recording %s does not exist", __FUNCTION__, recording.strRecordingId);
+  return false;
 }
 
 void PVRClientMythTV::CloseRecordedStream()
@@ -1345,8 +1555,7 @@
 
   m_file = MythFile();
 
-  if (m_pEventHandler)
-    m_pEventHandler->DisablePlayback();
+  m_pEventHandler->DisablePlayback();
 
   // Resume fileOps
   m_fileOps->Resume();
@@ -1358,11 +1567,11 @@
 int PVRClientMythTV::ReadRecordedStream(unsigned char *pBuffer, unsigned int iBufferSize)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - size: %i curPos: %lld", __FUNCTION__, iBufferSize, (long long)m_file.Position());
+    XBMC->Log(LOG_DEBUG, "%s - size: %u curPos: %lld", __FUNCTION__, iBufferSize, (long long)m_file.Position());
 
   int dataread = m_file.Read(pBuffer, iBufferSize);
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s: Read %i Bytes", __FUNCTION__, dataread);
+    XBMC->Log(LOG_DEBUG, "%s: Read %d Bytes", __FUNCTION__, dataread);
   else if (dataread == 0)
     XBMC->Log(LOG_INFO, "%s: Read 0 Bytes!", __FUNCTION__);
   return dataread;
@@ -1371,7 +1580,7 @@
 long long PVRClientMythTV::SeekRecordedStream(long long iPosition, int iWhence)
 {
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - pos: %i, whence: %i", __FUNCTION__, iPosition, iWhence);
+    XBMC->Log(LOG_DEBUG, "%s - pos: %lld, whence: %d", __FUNCTION__, iPosition, iWhence);
 
   int whence;
   if (iWhence == SEEK_SET)
@@ -1384,7 +1593,7 @@
   long long retval = m_file.Seek(iPosition, whence);
 
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done - pos: %i", __FUNCTION__, retval);
+    XBMC->Log(LOG_DEBUG, "%s - Done - pos: %lld", __FUNCTION__, retval);
 
   return retval;
 }
@@ -1396,7 +1605,7 @@
 
   long long retval = m_file.Length();
   if (g_bExtraDebug)
-    XBMC->Log(LOG_DEBUG, "%s - Done - duration: %i", __FUNCTION__, retval);
+    XBMC->Log(LOG_DEBUG, "%s - Done - duration: %lld", __FUNCTION__, retval);
   return retval;
 }
 
@@ -1410,7 +1619,7 @@
 {
   if (!m_con.IsNull())
   {
-    CStdString value = m_con.GetSetting(m_con.GetHostname(), "LiveTVPriority");
+    CStdString value = m_con.GetSettingOnHost("LiveTVPriority", m_con.GetHostname());
     if (value.compare("1") == 0)
       return true;
     else
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.h	2013-03-12 10:51:22.000000000 +0000
@@ -25,19 +25,19 @@
 #include <xbmc_pvr_types.h>
 #include <platform/threads/mutex.h>
 
-class RecordingRule : public MythTimer, public std::vector<std::pair<PVR_TIMER, MythProgramInfo> >
+class RecordingRule : public MythRecordingRule, public std::vector<std::pair<PVR_TIMER, MythProgramInfo> >
 {
 public:
-  RecordingRule(const MythTimer &timer);
-  RecordingRule& operator=(const MythTimer &timer);
-  bool operator==(const int &id);
+  RecordingRule(const MythRecordingRule &rule);
+  RecordingRule& operator=(const MythRecordingRule &rule);
+  bool operator==(const unsigned int &id);
 
   RecordingRule* GetParent() const;
   void SetParent(RecordingRule &parent);
 
-  bool HasModifiers() const;
-  std::vector<RecordingRule*> GetModifiers() const;
-  void AddModifier(RecordingRule &modifier);
+  bool HasOverrideRules() const;
+  std::vector<RecordingRule*> GetOverrideRules() const;
+  void AddOverrideRule(RecordingRule &overrideRule);
 
   bool SameTimeslot(RecordingRule &rule) const;
 
@@ -47,23 +47,23 @@
   void SaveTimerString(PVR_TIMER &timer);
 
   RecordingRule* m_parent;
-  std::vector<RecordingRule*> m_modifiers;
+  std::vector<RecordingRule*> m_overrideRules;
   std::vector<boost::shared_ptr<CStdString> > m_stringStore;
 };
 
 typedef std::vector<RecordingRule> RecordingRuleList;
 
-class PVRClientMythTV
+class PVRClientMythTV : public MythEventObserver
 {
 public:
   PVRClientMythTV();
-  ~PVRClientMythTV();
+  virtual ~PVRClientMythTV();
 
   // Server
   bool Connect();
   const char *GetBackendName();
-  const char *GetBackendVersion() const;
-  const char *GetConnectionString() const;
+  const char *GetBackendVersion();
+  const char *GetConnectionString();
   bool GetDriveSpace(long long *iTotal, long long *iUsed);
 
   // EPG
@@ -74,7 +74,7 @@
   PVR_ERROR GetChannels(ADDON_HANDLE handle, bool bRadio);
 
   // Channel groups
-  int GetChannelGroupsAmount() const;
+  int GetChannelGroupsAmount();
   PVR_ERROR GetChannelGroups(ADDON_HANDLE handle, bool bRadio);
   PVR_ERROR GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group);
 
@@ -127,30 +127,29 @@
   PLATFORM::CMutex m_lock;
   MythFile m_file;
 
-  CStdString m_protocolVersion;
+  CStdString m_backendName;
+  CStdString m_backendVersion;
   CStdString m_connectionString;
 
   // Categories
   Categories m_categories;
 
-  // EPG
-  time_t m_EPGstart;
-  time_t m_EPGend;
-  ProgramList m_EPG;
-
   // Channels
-  ChannelMap m_channels;
-  SourceMap m_sources;
+  ChannelIdMap m_channelsById;
+  ChannelNumberMap m_channelsByNumber;
   ChannelGroupMap m_channelGroups;
+  void LoadChannelsAndChannelGroups();
 
   // Recordings
   ProgramInfoMap m_recordings;
-  static bool IsRecordingVisible(MythProgramInfo &recording);
-  float GetRecordingFrameRate(MythProgramInfo &recording);
+  PLATFORM::CMutex m_recordingsLock;
+  void EventUpdateRecordings();
+  void ForceUpdateRecording(ProgramInfoMap::iterator it);
+  int FillRecordings();
 
   // Timers
   RecordingRuleList m_recordingRules;
-  void PVRtoMythTimer(const PVR_TIMER timer, MythTimer &mt);
+  void PVRtoMythRecordingRule(const PVR_TIMER timer, MythRecordingRule &rule);
 
   CStdString GetArtWork(FileOps::FileType storageGroup, const CStdString &shwTitle);
 };
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/HISTORY xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/HISTORY
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/HISTORY	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/HISTORY	2013-03-12 10:51:22.000000000 +0000
@@ -4,3 +4,11 @@
 2010-03-23: Version 0.0.1
 
 - Initial revision.
+
+2013-02-03: Version 0.9.1
+
+- most parts of the plugin rewritten
+- revised parsers
+- proper handling of PMT changes
+- suffix plugin with version of protocol: vnsiserver3
+- this version is compatible with XBMC 12.0
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile	2013-01-05 01:00:27.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile	2013-03-12 10:51:22.000000000 +0000
@@ -6,8 +6,8 @@
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
-PLUGIN = vnsiserver
+
+PLUGIN = vnsiserver3
 
 ### The version number of this plugin (taken from the main source file):
 
@@ -17,8 +17,9 @@
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR ?= $(DESTDIR)$(call PKGCFG,libdir)
-LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+LIBDIR ?= $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -55,8 +56,12 @@
 endif
 
 export CXXFLAGS
-endif
+else
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+endif
 
 ### The name of the distribution archive:
 
@@ -81,10 +86,11 @@
 
 ### The object files (add further files here):
 
-OBJS = vnsi.o bitstream.o vnsiclient.o config.o cxsocket.o demuxer.o demuxer_AAC.o \
-       demuxer_AC3.o demuxer_DTS.o demuxer_h264.o demuxer_MPEGAudio.o demuxer_MPEGVideo.o \
-       demuxer_Subtitle.o demuxer_Teletext.o receiver.o recplayer.o requestpacket.o responsepacket.o \
-       vnsiserver.o hash.o recordingscache.o setup.o
+OBJS = vnsi.o bitstream.o vnsiclient.o config.o cxsocket.o parser.o parser_AAC.o \
+       parser_AC3.o parser_DTS.o parser_h264.o parser_MPEGAudio.o parser_MPEGVideo.o \
+       parser_Subtitle.o parser_Teletext.o streamer.o recplayer.o requestpacket.o responsepacket.o \
+       vnsiserver.o hash.o recordingscache.o setup.o vnsiosd.o demuxer.o videobuffer.o \
+       videoinput.o
 
 ### The main target:
 
@@ -93,18 +99,19 @@
 else
 all: $(SOFILE)
 endif
+#
 
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -113,20 +120,20 @@
 PODIR     = po
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
-$(I18Npot): $(wildcard *.cc)
+$(I18Npot): $(wildcard *.c)
 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	install -D -m644 $< $@
 
 .PHONY: i18n
@@ -140,7 +147,7 @@
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib install-i18n
 
@@ -154,6 +161,6 @@
 
 clean:
 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
 
 compile: $(SOFILE)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.c	2012-12-24 01:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.c	2013-03-12 10:51:22.000000000 +0000
@@ -31,6 +31,7 @@
   m_data   = data;
   m_offset = 0;
   m_len    = bits;
+  m_error  = false;
 }
 
 void cBitstream::setBitstream(uint8_t *data, int bits)
@@ -38,6 +39,7 @@
   m_data   = data;
   m_offset = 0;
   m_len    = bits;
+  m_error  = false;
 }
 
 void cBitstream::skipBits(int num)
@@ -52,7 +54,10 @@
   while(num > 0)
   {
     if(m_offset >= m_len)
+    {
+      m_error = true;
       return 0;
+    }
 
     num--;
 
@@ -72,7 +77,10 @@
   while(num > 0)
   {
     if(offs >= m_len)
+    {
+      m_error = true;
       return 0;
+    }
 
     num--;
 
@@ -122,7 +130,10 @@
 {
   while(num > 0) {
     if(m_offset >= m_len)
+    {
+      m_error = true;
       return;
+    }
 
     num--;
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.h	2012-12-24 01:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/bitstream.h	2013-03-12 10:51:22.000000000 +0000
@@ -31,6 +31,7 @@
   uint8_t *m_data;
   int      m_offset;
   int      m_len;
+  bool     m_error;
 
 public:
   cBitstream(uint8_t *data, int bits);
@@ -45,6 +46,7 @@
   unsigned int remainingBits();
   void         putBits(int val, int num);
   int          length() { return m_len; }
+  bool         isError() { return m_error; }
 };
 
 #endif // VNSI_BITSTREAM_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.c	2013-03-12 10:51:22.000000000 +0000
@@ -41,6 +41,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/tcp.h>
+#include <net/if.h>
 
 #include <vdr/config.h>
 #include <vdr/tools.h>
@@ -62,11 +63,22 @@
   }
 }
 
+void cxSocket::LockWrite()
+{
+  m_MutexWrite.Lock();
+}
+
+void cxSocket::UnlockWrite()
+{
+  m_MutexWrite.Unlock();
+}
+
 ssize_t cxSocket::write(const void *buffer, size_t size, int timeout_ms, bool more_data)
 {
-  cMutexLock CmdLock((cMutex*)&m_MutexWrite);
+  cMutexLock CmdLock(&m_MutexWrite);
 
-  if(m_fd == -1) return -1;
+  if(m_fd == -1)
+    return -1;
 
   ssize_t written = (ssize_t)size;
   const unsigned char *ptr = (const unsigned char *)buffer;
@@ -79,7 +91,7 @@
       return written-size;
     }
 
-    ssize_t p = ::send(m_fd, ptr, size, MSG_NOSIGNAL | (more_data ? MSG_MORE : 0));
+    ssize_t p = ::send(m_fd, ptr, size, (more_data ? MSG_MORE : 0));
 
     if (p <= 0)
     {
@@ -102,11 +114,10 @@
 
 ssize_t cxSocket::read(void *buffer, size_t size, int timeout_ms)
 {
-  cMutexLock CmdLock((cMutex*)&m_MutexRead);
-
   int retryCounter = 0;
 
-  if(m_fd == -1) return -1;
+  if(m_fd == -1)
+    return -1;
 
   ssize_t missing = (ssize_t)size;
   unsigned char *ptr = (unsigned char *)buffer;
@@ -146,7 +157,7 @@
   return size;
 }
 
-void cxSocket::set_handle(int h) {
+void cxSocket::SetHandle(int h) {
   if(h != m_fd) {
     close();
     m_fd = h;
@@ -157,9 +168,6 @@
   }
 }
 
-#include <sys/ioctl.h>
-#include <net/if.h>
-
 char *cxSocket::ip2txt(uint32_t ip, unsigned int port, char *str)
 {
   // inet_ntoa is not thread-safe (?)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/cxsocket.h	2013-03-12 10:51:22.000000000 +0000
@@ -33,32 +33,23 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-class cxSocket {
+class cxSocket
+{
  private:
   int m_fd;
   cMutex m_MutexWrite;
-  cMutex m_MutexRead;
-
   cPoller *m_pollerRead;
   cPoller *m_pollerWrite;
 
-  cxSocket(const cxSocket& s);
-  cxSocket &operator=(const cxSocket &S);
-
  public:
-
   cxSocket() : m_fd(-1), m_pollerRead(NULL), m_pollerWrite(NULL) {}
-
   ~cxSocket();
-
-  void set_handle(int h);
-
+  void SetHandle(int h);
   void close(void);
-
+  void LockWrite();
+  void UnlockWrite();
   ssize_t read(void *buffer, size_t size, int timeout_ms = -1);
-
   ssize_t write(const void *buffer, size_t size, int timeout_ms = -1, bool more_data = false);
-
   static char *ip2txt(uint32_t ip, unsigned int port, char *str);
 };
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.c	2012-12-20 01:00:33.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.c	2013-03-12 10:51:22.000000000 +0000
@@ -1,8 +1,5 @@
 /*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
+ *      Copyright (C) 2005-2012 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -16,348 +13,375 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
-#include <stdlib.h>
-#include <assert.h>
-#include <vdr/remux.h>
-#include <vdr/channels.h>
+
 #include "config.h"
-#include "receiver.h"
 #include "demuxer.h"
-#include "demuxer_AAC.h"
-#include "demuxer_AC3.h"
-#include "demuxer_DTS.h"
-#include "demuxer_h264.h"
-#include "demuxer_MPEGAudio.h"
-#include "demuxer_MPEGVideo.h"
-#include "demuxer_Subtitle.h"
-#include "demuxer_Teletext.h"
+#include "parser.h"
+#include "videobuffer.h"
 
-#define PTS_MASK 0x1ffffffffLL
-//#define PTS_MASK 0x7ffffLL
-
-#ifndef INT64_MIN
-#define INT64_MIN       (-0x7fffffffffffffffLL-1)
-#endif
+#include <vdr/channels.h>
+#include <libsi/si.h>
 
-int64_t PesGetPTS(const uint8_t *buf, int len)
+cVNSIDemuxer::cVNSIDemuxer()
 {
-  /* assume mpeg2 pes header ... */
-  if (PesIsVideoPacket(buf) || PesIsAudioPacket(buf)) {
+  m_OldPmtVersion = -1;
+}
 
-    if ((buf[6] & 0xC0) != 0x80)
-      return DVD_NOPTS_VALUE;
-    if ((buf[6] & 0x30) != 0)
-      return DVD_NOPTS_VALUE;
+cVNSIDemuxer::~cVNSIDemuxer()
+{
 
-    if ((len > 13) && (buf[7] & 0x80)) { /* pts avail */
-      int64_t pts;
-      pts  = ((int64_t)(buf[ 9] & 0x0E)) << 29 ;
-      pts |= ((int64_t) buf[10])         << 22 ;
-      pts |= ((int64_t)(buf[11] & 0xFE)) << 14 ;
-      pts |= ((int64_t) buf[12])         <<  7 ;
-      pts |= ((int64_t)(buf[13] & 0xFE)) >>  1 ;
-      return pts;
-    }
-  }
-  return DVD_NOPTS_VALUE;
 }
 
-int64_t PesGetDTS(const uint8_t *buf, int len)
+void cVNSIDemuxer::Open(const cChannel &channel, cVideoBuffer *videoBuffer)
 {
-  if (PesIsVideoPacket(buf) || PesIsAudioPacket(buf))
-  {
-    if ((buf[6] & 0xC0) != 0x80)
-      return DVD_NOPTS_VALUE;
-    if ((buf[6] & 0x30) != 0)
-      return DVD_NOPTS_VALUE;
+  m_CurrentChannel = channel;
+  m_VideoBuffer = videoBuffer;
+  m_OldPmtVersion = -1;
 
-    if (len > 18 && (buf[7] & 0x40)) { /* dts avail */
-      int64_t dts;
-      dts  = ((int64_t)( buf[14] & 0x0E)) << 29 ;
-      dts |=  (int64_t)( buf[15]         << 22 );
-      dts |=  (int64_t)((buf[16] & 0xFE) << 14 );
-      dts |=  (int64_t)( buf[17]         <<  7 );
-      dts |=  (int64_t)((buf[18] & 0xFE) >>  1 );
-      return dts;
-    }
-  }
-  return DVD_NOPTS_VALUE;
+  if (m_CurrentChannel.Vpid())
+    m_WaitIFrame = true;
+  else
+    m_WaitIFrame = false;
 }
 
-// --- cParser -------------------------------------------------
-
-cParser::cParser(cLiveStreamer *streamer, int pID)
- : m_Streamer(streamer)
- , m_pID(pID)
- , m_FoundFrame(false)
+void cVNSIDemuxer::Close()
 {
-  m_curPTS    = DVD_NOPTS_VALUE;
-  m_curDTS    = DVD_NOPTS_VALUE;
-  m_LastDTS   = DVD_NOPTS_VALUE;
-  m_epochDTS  = 0;
-  m_badDTS    = 0;
+  for (std::list<cTSStream*>::iterator it = m_Streams.begin(); it != m_Streams.end(); ++it)
+  {
+    DEBUGLOG("Deleting stream parser for pid=%i and type=%i", (*it)->GetPID(), (*it)->Type());
+    delete (*it);
+  }
+  m_Streams.clear();
+  m_StreamInfos.clear();
 }
 
-int64_t cParser::Rescale(int64_t a)
+int cVNSIDemuxer::Read(sStreamPacket *packet)
 {
-  uint64_t b = DVD_TIME_BASE;
-  uint64_t c = 90000;
-  uint64_t r = c/2;
+  uint8_t *buf;
+  int len;
+  cTSStream *stream;
 
-  if (b<=INT_MAX && c<=INT_MAX){
-    if (a<=INT_MAX)
-      return (a * b + r)/c;
-    else
-      return a/c*b + (a%c*b + r)/c;
+  // clear packet
+  if (!packet)
+    return -1;
+  packet->data = NULL;
+  packet->streamChange = false;
+  packet->pmtChange = false;
+
+  // read TS Packet from buffer
+  len = m_VideoBuffer->Read(&buf, TS_SIZE);
+  if (len != TS_SIZE)
+    return -1;
+
+  int ts_pid = TsPid(buf);
+
+  // parse PAT/PMT
+  if (ts_pid == PATPID)
+  {
+    m_PatPmtParser.ParsePat(buf, TS_SIZE);
   }
-  else
+#if APIVERSNUM >= 10733
+  else if (m_PatPmtParser.IsPmtPid(ts_pid))
+#else
+  else if (ts_pid == m_PatPmtParser.PmtPid())
+#endif
   {
-    uint64_t a0= a&0xFFFFFFFF;
-    uint64_t a1= a>>32;
-    uint64_t b0= b&0xFFFFFFFF;
-    uint64_t b1= b>>32;
-    uint64_t t1= a0*b1 + a1*b0;
-    uint64_t t1a= t1<<32;
-
-    a0 = a0*b0 + t1a;
-    a1 = a1*b1 + (t1>>32) + (a0<t1a);
-    a0 += r;
-    a1 += a0<r;
-
-    for (int i=63; i>=0; i--)
-    {
-      a1+= a1 + ((a0>>i)&1);
-      t1+=t1;
-      if (c <= a1)
+    int patVersion, pmtVersion;
+    m_PatPmtParser.ParsePmt(buf, TS_SIZE);
+    if (m_PatPmtParser.GetVersions(patVersion, pmtVersion))
+    {
+      if (pmtVersion != m_OldPmtVersion)
       {
-        a1 -= c;
-        t1++;
+        cChannel pmtChannel(m_CurrentChannel);
+        SetChannelPids(&pmtChannel, &m_PatPmtParser);
+        SetChannelStreams(&pmtChannel);
+        m_PatPmtParser.Reset();
+        m_OldPmtVersion = pmtVersion;
+        if (EnsureParsers())
+        {
+          packet->pmtChange = true;
+            return 1;
+        }
       }
     }
-    return t1;
   }
+  else if (stream = FindStream(ts_pid))
+  {
+    if (stream->ProcessTSPacket(buf, packet, m_WaitIFrame))
+    {
+      m_WaitIFrame = false;
+      return 1;
+    }
+  }
+  else
+    return -1;
+
+  return 0;
 }
 
-/*
- * Extract DTS and PTS and update current values in stream
- */
-int cParser::ParsePESHeader(uint8_t *buf, size_t len)
+cTSStream *cVNSIDemuxer::GetFirstStream()
 {
-  /* parse PES header */
-  unsigned int hdr_len = PesHeaderLength(buf);
+  m_StreamsIterator = m_Streams.begin();
+  if (m_StreamsIterator != m_Streams.end())
+    return *m_StreamsIterator;
+  else
+    return NULL;
+}
 
-  /* parse PTS */
-  int64_t pts = PesGetPTS(buf, len);
-  int64_t dts = PesGetDTS(buf, len);
-  if (dts == DVD_NOPTS_VALUE)
-    dts = pts;
-  
-  dts = dts & PTS_MASK;
-  pts = pts & PTS_MASK;
-  
-  if(pts != 0) m_curDTS = dts;
-  if(dts != 0) m_curPTS = pts;
-  
-  return hdr_len;
-}
-
-void cParser::BufferPacket(sStreamPacket *pkt)
-{
-  // create new packet
-  sStreamPacket* p = new sStreamPacket(*pkt);
-
-  // copy payload
-  p->data = (uint8_t*)malloc(pkt->size);
-  memcpy(p->data, pkt->data, pkt->size);
-
-  // push to queue
-  m_queue.push(p);
-}
-
-void cParser::SendPacket(sStreamPacket *pkt)
-{
-  if(pkt->dts == DVD_NOPTS_VALUE) return;
-  if(pkt->pts == DVD_NOPTS_VALUE) return;
-
-  int64_t dts = pkt->dts;
-  int64_t pts = pkt->pts;
-
-  // Rescale for XBMC
-  pkt->dts      = Rescale(dts);
-  pkt->pts      = Rescale(pts);
-  pkt->duration = Rescale(pkt->duration);
-
-  // buffer packets if we are not ready to send
-  if (m_Streamer->IsStarting()) {
-    BufferPacket(pkt);
-    return;
-  }
-
-  // stream packet if queue is empty
-  if(m_queue.size() == 0) {
-    m_Streamer->sendStreamPacket(pkt);
-    return;
-  }
-
-  BufferPacket(pkt);
-
-  // send buffered data first
-  INFOLOG("sending %i buffered packets", (int)m_queue.size());
-
-  while(m_queue.size() > 0) {
-    sStreamPacket* p = m_queue.front();
-    if(p != NULL) {
-      m_Streamer->sendStreamPacket(p);
-      free(p->data);
-      delete p;
-    }
-    m_queue.pop();
-  }
-}
-
-
-// --- cTSDemuxer ----------------------------------------------------
-
-cTSDemuxer::cTSDemuxer(cLiveStreamer *streamer, eStreamType type, int pid)
-  : m_Streamer(streamer)
-  , m_streamType(type)
-  , m_pID(pid)
-{
-  m_pesError        = false;
-  m_pesParser       = NULL;
-  m_language[0]     = 0;
-  m_FpsScale        = 0;
-  m_FpsRate         = 0;
-  m_Height          = 0;
-  m_Width           = 0;
-  m_Aspect          = 0.0f;
-  m_Channels        = 0;
-  m_SampleRate      = 0;
-  m_BitRate         = 0;
-  m_BitsPerSample   = 0;
-  m_BlockAlign      = 0;
-
-  if (m_streamType == stMPEG2VIDEO)
-    m_pesParser = new cParserMPEG2Video(this, m_Streamer, m_pID);
-  else if (m_streamType == stH264)
-    m_pesParser = new cParserH264(this, m_Streamer, m_pID);
-  else if (m_streamType == stMPEG2AUDIO)
-    m_pesParser = new cParserMPEG2Audio(this, m_Streamer, m_pID);
-  else if (m_streamType == stAACADST)
-    m_pesParser = new cParserAAC(this, m_Streamer, m_pID);
-  else if (m_streamType == stAACLATM)
-    m_pesParser = new cParserAAC(this, m_Streamer, m_pID);
-  else if (m_streamType == stAC3)
-    m_pesParser = new cParserAC3(this, m_Streamer, m_pID);
-  else if (m_streamType == stDTS)
-    m_pesParser = new cParserDTS(this, m_Streamer, m_pID);
-  else if (m_streamType == stEAC3)
-    m_pesParser = new cParserAC3(this, m_Streamer, m_pID);
-  else if (m_streamType == stTELETEXT)
-    m_pesParser = new cParserTeletext(this, m_Streamer, m_pID);
-  else if (m_streamType == stDVBSUB)
-    m_pesParser = new cParserSubtitle(this, m_Streamer, m_pID);
+cTSStream *cVNSIDemuxer::GetNextStream()
+{
+  ++m_StreamsIterator;
+  if (m_StreamsIterator != m_Streams.end())
+    return *m_StreamsIterator;
   else
-  {
-    ERRORLOG("Unrecognised type %i inside stream %i", m_streamType, m_pID);
-    return;
-  }
+    return NULL;
 }
 
-cTSDemuxer::~cTSDemuxer()
+cTSStream *cVNSIDemuxer::FindStream(int Pid)
 {
-  if (m_pesParser)
+  for (std::list<cTSStream*>::iterator it = m_Streams.begin(); it != m_Streams.end(); ++it)
   {
-    delete m_pesParser;
-    m_pesParser = NULL;
+    if (Pid == (*it)->GetPID())
+      return *it;
   }
+  return NULL;
 }
 
-bool cTSDemuxer::ProcessTSPacket(unsigned char *data)
+void cVNSIDemuxer::AddStreamInfo(sStreamInfo &stream)
 {
-  if (!data)
-    return false;
-
-  bool pusi  = TsPayloadStart(data);
-  int  bytes = TS_SIZE - TsPayloadOffset(data);
+  m_StreamInfos.push_back(stream);
+}
 
-  if(bytes < 0 || bytes > TS_SIZE)
-    return false;
+bool cVNSIDemuxer::EnsureParsers()
+{
+  bool streamChange = false;
 
-  if (TsError(data))
+  std::list<cTSStream*>::iterator it = m_Streams.begin();
+  while (it != m_Streams.end())
   {
-    ERRORLOG("transport error");
-    return false;
+    std::list<sStreamInfo>::iterator its;
+    for (its = m_StreamInfos.begin(); its != m_StreamInfos.end(); ++its)
+    {
+      if ((its->pID == (*it)->GetPID()) && (its->type == (*it)->Type()))
+      {
+        break;
+      }
+    }
+    if (its == m_StreamInfos.end())
+    {
+      INFOLOG("Deleting stream for pid=%i and type=%i", (*it)->GetPID(), (*it)->Type());
+      m_Streams.erase(it);
+      it = m_Streams.begin();
+      streamChange = true;
+    }
+    else
+      ++it;
   }
 
-  if (!TsHasPayload(data))
+  for (std::list<sStreamInfo>::iterator it = m_StreamInfos.begin(); it != m_StreamInfos.end(); ++it)
   {
-    DEBUGLOG("no payload, size %d", bytes);
-    return true;
+    cTSStream *stream = FindStream(it->pID);
+    if (stream)
+    {
+      // TODO: check for change in lang
+      stream->SetLanguage(it->language);
+      continue;
+    }
+
+    if (it->type == stH264)
+    {
+      stream = new cTSStream(stH264, it->pID);
+    }
+    else if (it->type == stMPEG2VIDEO)
+    {
+      stream = new cTSStream(stMPEG2VIDEO, it->pID);
+    }
+    else if (it->type == stMPEG2AUDIO)
+    {
+      stream = new cTSStream(stMPEG2AUDIO, it->pID);
+      stream->SetLanguage(it->language);
+    }
+    else if (it->type == stAACADTS)
+    {
+      stream = new cTSStream(stAACADTS, it->pID);
+      stream->SetLanguage(it->language);
+    }
+    else if (it->type == stAACLATM)
+    {
+      stream = new cTSStream(stAACLATM, it->pID);
+      stream->SetLanguage(it->language);
+    }
+    else if (it->type == stAC3)
+    {
+      stream = new cTSStream(stAC3, it->pID);
+      stream->SetLanguage(it->language);
+    }
+    else if (it->type == stEAC3)
+    {
+      stream = new cTSStream(stEAC3, it->pID);
+      stream->SetLanguage(it->language);
+    }
+    else if (it->type == stDVBSUB)
+    {
+      stream = new cTSStream(stDVBSUB, it->pID);
+      stream->SetLanguage(it->language);
+#if APIVERSNUM >= 10709
+      stream->SetSubtitlingDescriptor(it->subtitlingType, it->compositionPageId, it->ancillaryPageId);
+#endif
+    }
+    else if (it->type == stTELETEXT)
+    {
+      stream = new cTSStream(stTELETEXT, it->pID);
+    }
+    else
+      continue;
+
+    m_Streams.push_back(stream);
+    INFOLOG("Created stream for pid=%i and type=%i", stream->GetPID(), stream->Type());
+    streamChange = true;
   }
+  m_StreamInfos.clear();
+
+  return streamChange;
+}
 
-  /* drop broken PES packets */
-  if (m_pesError && !pusi)
+void cVNSIDemuxer::SetChannelStreams(const cChannel *channel)
+{
+  sStreamInfo newStream;
+  if (channel->Vpid())
   {
-    return false;
+    newStream.pID = channel->Vpid();
+#if APIVERSNUM >= 10701
+    if (channel->Vtype() == 0x1B)
+      newStream.type = stH264;
+    else
+#endif
+      newStream.type = stMPEG2VIDEO;
+
+    AddStreamInfo(newStream);
   }
 
-  /* strip ts header */
-  data += TS_SIZE - bytes;
+  const int *APids = channel->Apids();
+  for ( ; *APids; APids++)
+  {
+    int index = 0;
+    if (!FindStream(*APids))
+    {
+      newStream.pID = *APids;
+      newStream.type = stMPEG2AUDIO;
+#if APIVERSNUM >= 10715
+      if (channel->Atype(index) == 0x0F)
+        newStream.type = stAACADTS;
+      else if (channel->Atype(index) == 0x11)
+        newStream.type = stAACLATM;
+#endif
+      newStream.SetLanguage(channel->Alang(index));
+      AddStreamInfo(newStream);
+    }
+    index++;
+  }
 
-  /* handle new payload unit */
-  if (pusi)
+  const int *DPids = channel->Dpids();
+  for ( ; *DPids; DPids++)
   {
-    if (!PesIsHeader(data))
+    int index = 0;
+    if (!FindStream(*DPids))
     {
-      m_pesError = true;
-      return false;
+      newStream.pID = *DPids;
+      newStream.type = stAC3;
+#if APIVERSNUM >= 10715
+      if (channel->Dtype(index) == SI::EnhancedAC3DescriptorTag)
+        newStream.type = stEAC3;
+#endif
+      newStream.SetLanguage(channel->Dlang(index));
+      AddStreamInfo(newStream);
     }
-    m_pesError = false;
+    index++;
   }
 
-  /* Parse the data */
-  if (m_pesParser)
-    m_pesParser->Parse(data, bytes, pusi);
+  const int *SPids = channel->Spids();
+  if (SPids)
+  {
+    int index = 0;
+    for ( ; *SPids; SPids++)
+    {
+      if (!FindStream(*SPids))
+      {
+        newStream.pID = *SPids;
+        newStream.type = stDVBSUB;
+        newStream.SetLanguage(channel->Slang(index));
+#if APIVERSNUM >= 10709
+        newStream.subtitlingType = channel->SubtitlingType(index);
+        newStream.compositionPageId = channel->CompositionPageId(index);
+        newStream.ancillaryPageId = channel->AncillaryPageId(index);
+#endif
+        AddStreamInfo(newStream);
+      }
+      index++;
+    }
+  }
 
-  return true;
+  if (channel->Tpid())
+  {
+    newStream.pID = channel->Tpid();
+    newStream.type = stTELETEXT;
+    AddStreamInfo(newStream);
+  }
 }
 
-void cTSDemuxer::SetLanguage(const char *language)
-{
-  m_language[0] = language[0];
-  m_language[1] = language[1];
-  m_language[2] = language[2];
-  m_language[3] = 0;
-}
+void cVNSIDemuxer::SetChannelPids(cChannel *channel, cPatPmtParser *patPmtParser)
+{
+  int Apids[MAXAPIDS + 1] = { 0 };
+  int Atypes[MAXAPIDS + 1] = { 0 };
+  int Dpids[MAXDPIDS + 1] = { 0 };
+  int Dtypes[MAXDPIDS + 1] = { 0 };
+  int Spids[MAXSPIDS + 1] = { 0 };
+  char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
+  char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
+  char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+  int index = 0;
+
+  const int *aPids = patPmtParser->Apids();
+  index = 0;
+  for ( ; *aPids; aPids++)
+  {
+    Apids[index] = patPmtParser->Apid(index);
+    Atypes[index] = patPmtParser->Atype(index);
+    strn0cpy(ALangs[index], patPmtParser->Alang(index), MAXLANGCODE2);
+    index++;
+  }
 
-void cTSDemuxer::SetVideoInformation(int FpsScale, int FpsRate, int Height, int Width, float Aspect)
-{
-  m_FpsScale        = FpsScale;
-  m_FpsRate         = FpsRate;
-  m_Height          = Height;
-  m_Width           = Width;
-  m_Aspect          = Aspect;
-}
+  const int *dPids = patPmtParser->Dpids();
+  index = 0;
+  for ( ; *dPids; dPids++)
+  {
+    Dpids[index] = patPmtParser->Dpid(index);
+    Dtypes[index] = patPmtParser->Dtype(index);
+    strn0cpy(DLangs[index], patPmtParser->Dlang(index), MAXLANGCODE2);
+    index++;
+  }
 
-void cTSDemuxer::SetAudioInformation(int Channels, int SampleRate, int BitRate, int BitsPerSample, int BlockAlign)
-{
-  m_Channels        = Channels;
-  m_SampleRate      = SampleRate;
-  m_BlockAlign      = BlockAlign;
-  m_BitRate         = BitRate;
-  m_BitsPerSample   = BitsPerSample;
-}
+  const int *sPids = patPmtParser->Spids();
+  index = 0;
+  for ( ; *sPids; sPids++)
+  {
+    Spids[index] = patPmtParser->Spid(index);
+    strn0cpy(SLangs[index], patPmtParser->Slang(index), MAXLANGCODE2);
+    index++;
+  }
 
-void cTSDemuxer::SetSubtitlingDescriptor(unsigned char SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId)
-{
-  m_subtitlingType    = SubtitlingType;
-  m_compositionPageId = CompositionPageId;
-  m_ancillaryPageId   = AncillaryPageId;
+  int Vpid = patPmtParser->Vpid();
+  int Ppid = patPmtParser->Ppid();
+  int VType = patPmtParser->Vtype();
+  int Tpid = m_CurrentChannel.Tpid();
+  channel->SetPids(Vpid, Ppid, VType,
+                   Apids, Atypes, ALangs,
+                   Dpids, Dtypes, DLangs,
+                   Spids, SLangs,
+                   Tpid);
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.h	2012-12-20 01:00:33.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.h	2013-03-12 10:51:22.000000000 +0000
@@ -1,8 +1,5 @@
 /*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
+ *      Copyright (C) 2005-2012 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -16,291 +13,63 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
-#ifndef VNSI_DEMUXER_H
-#define VNSI_DEMUXER_H
-
-#include <vdr/device.h>
-#include <queue>
-
-#define DVD_TIME_BASE 1000000
-#define DVD_NOPTS_VALUE    (-1LL<<52) // should be possible to represent in both double and __int64
-
-/* PES PIDs */
-#define PRIVATE_STREAM1   0xBD
-#define PADDING_STREAM    0xBE
-#define PRIVATE_STREAM2   0xBF
-#define PRIVATE_STREAM3   0xFD
-#define AUDIO_STREAM_S    0xC0      /* 1100 0000 */
-#define AUDIO_STREAM_E    0xDF      /* 1101 1111 */
-#define VIDEO_STREAM_S    0xE0      /* 1110 0000 */
-#define VIDEO_STREAM_E    0xEF      /* 1110 1111 */
-
-#define AUDIO_STREAM_MASK 0x1F  /* 0001 1111 */
-#define VIDEO_STREAM_MASK 0x0F  /* 0000 1111 */
-#define AUDIO_STREAM      0xC0  /* 1100 0000 */
-#define VIDEO_STREAM      0xE0  /* 1110 0000 */
-
-#define ECM_STREAM        0xF0
-#define EMM_STREAM        0xF1
-#define DSM_CC_STREAM     0xF2
-#define ISO13522_STREAM   0xF3
-#define PROG_STREAM_DIR   0xFF
-
-inline bool PesIsHeader(const uchar *p)
-{
-  return !(p)[0] && !(p)[1] && (p)[2] == 1;
-}
-
-inline int PesHeaderLength(const uchar *p)
-{
-  return 8 + (p)[8] + 1;
-}
-
-inline bool PesIsVideoPacket(const uchar *p)
-{
-  return (((p)[3] & ~VIDEO_STREAM_MASK) == VIDEO_STREAM);
-}
-
-inline bool PesIsMPEGAudioPacket(const uchar *p)
-{
-  return (((p)[3] & ~AUDIO_STREAM_MASK) == AUDIO_STREAM);
-}
-
-inline bool PesIsPS1Packet(const uchar *p)
-{
-  return ((p)[3] == PRIVATE_STREAM1 || (p)[3] == PRIVATE_STREAM3 );
-}
-
-inline bool PesIsPaddingPacket(const uchar *p)
-{
-  return ((p)[3] == PADDING_STREAM);
-}
-
-inline bool PesIsAudioPacket(const uchar *p)
-{
-  return (PesIsMPEGAudioPacket(p) || PesIsPS1Packet(p));
-}
-
-#if APIVERSNUM < 10701
-
-#define TS_ERROR              0x80
-#define TS_PAYLOAD_START      0x40
-#define TS_TRANSPORT_PRIORITY 0x20
-#define TS_PID_MASK_HI        0x1F
-#define TS_SCRAMBLING_CONTROL 0xC0
-#define TS_ADAPT_FIELD_EXISTS 0x20
-#define TS_PAYLOAD_EXISTS     0x10
-#define TS_CONT_CNT_MASK      0x0F
-#define TS_ADAPT_DISCONT      0x80
-#define TS_ADAPT_RANDOM_ACC   0x40 // would be perfect for detecting independent frames, but unfortunately not used by all broadcasters
-#define TS_ADAPT_ELEM_PRIO    0x20
-#define TS_ADAPT_PCR          0x10
-#define TS_ADAPT_OPCR         0x08
-#define TS_ADAPT_SPLICING     0x04
-#define TS_ADAPT_TP_PRIVATE   0x02
-#define TS_ADAPT_EXTENSION    0x01
-
-inline bool TsHasPayload(const uchar *p)
-{
-  return p[3] & TS_PAYLOAD_EXISTS;
-}
-
-inline bool TsHasAdaptationField(const uchar *p)
-{
-  return p[3] & TS_ADAPT_FIELD_EXISTS;
-}
-
-inline bool TsPayloadStart(const uchar *p)
-{
-  return p[1] & TS_PAYLOAD_START;
-}
-
-inline bool TsError(const uchar *p)
-{
-  return p[1] & TS_ERROR;
-}
-
-inline int TsPid(const uchar *p)
-{
-  return (p[1] & TS_PID_MASK_HI) * 256 + p[2];
-}
-
-inline bool TsIsScrambled(const uchar *p)
-{
-  return p[3] & TS_SCRAMBLING_CONTROL;
-}
-
-inline int TsPayloadOffset(const uchar *p)
-{
-  return (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
-}
-
-inline int TsGetPayload(const uchar **p)
-{
-  int o = TsPayloadOffset(*p);
-  *p += o;
-  return TS_SIZE - o;
-}
-
-inline int TsContinuityCounter(const uchar *p)
-{
-  return p[3] & TS_CONT_CNT_MASK;
-}
-
-inline int TsGetAdaptationField(const uchar *p)
-{
-  return TsHasAdaptationField(p) ? p[5] : 0x00;
-}
-#endif
+#pragma once
 
-enum eStreamContent
-{
-  scVIDEO,
-  scAUDIO,
-  scSUBTITLE,
-  scTELETEXT,
-  scPROGRAMM
-};
-
-enum eStreamType
-{
-  stNone,
-  stAC3,
-  stMPEG2AUDIO,
-  stEAC3,
-  stAACADST,
-  stAACLATM,
-  stDTS,
-  stMPEG2VIDEO,
-  stH264,
-  stDVBSUB,
-  stTEXTSUB,
-  stTELETEXT,
-};
+#include <list>
+#include "parser.h"
 
-#define PKT_I_FRAME 1
-#define PKT_P_FRAME 2
-#define PKT_B_FRAME 3
-#define PKT_NTYPES  4
-struct sStreamPacket
-{
-  sStreamPacket() {
-    frametype = 0;
+struct sStreamPacket;
+class cTSStream;
+class cChannel;
+class cPatPmtParser;
+class cVideoBuffer;
+
+struct sStreamInfo
+{
+  int pID;
+  eStreamType type;
+  eStreamContent content;
+  char language[MAXLANGCODE2];
+  int subtitlingType;
+  int compositionPageId;
+  int ancillaryPageId;
+  void SetLanguage(const char* lang)
+  {
+    language[0] = lang[0];
+    language[1] = lang[1];
+    language[2] = lang[2];
+    language[3] = 0;
   }
-
-  int64_t   id;
-  int64_t   dts;
-  int64_t   pts;
-  int       duration;
-
-  uint8_t   commercial;
-  uint8_t   componentindex;
-  uint8_t   frametype;
-
-  uint8_t  *data;
-  int       size;
 };
 
-class cLiveStreamer;
-
-class cParser
+class cVNSIDemuxer
 {
 public:
-  cParser(cLiveStreamer *streamer, int pID);
-  virtual ~cParser() {};
-
-  virtual void Parse(unsigned char *data, int size, bool pusi) = 0;
-
-  int ParsePESHeader(uint8_t *buf, size_t len);
-  void SendPacket(sStreamPacket *pkt);
-  void BufferPacket(sStreamPacket *pkt);
-  int64_t Rescale(int64_t a);
-
-  cLiveStreamer *m_Streamer;
-
-  int64_t     m_LastDTS;
-  int64_t     m_curPTS;
-  int64_t     m_curDTS;
-  int64_t     m_epochDTS;
-
-  int         m_badDTS;
-  int         m_pID;
+  cVNSIDemuxer();
+  virtual ~cVNSIDemuxer();
+  int Read(sStreamPacket *packet);
+  cTSStream *GetFirstStream();
+  cTSStream *GetNextStream();
+  void Open(const cChannel &channel, cVideoBuffer *videoBuffer);
+  void Close();
 
 protected:
-  bool        m_FoundFrame;
-
-  std::queue<sStreamPacket*> m_queue;
+  bool EnsureParsers();
+  void SetChannelStreams(const cChannel *channel);
+  void SetChannelPids(cChannel *channel, cPatPmtParser *patPmtParser);
+  cTSStream *FindStream(int Pid);
+  void AddStreamInfo(sStreamInfo &stream);
+  std::list<cTSStream*> m_Streams;
+  std::list<cTSStream*>::iterator m_StreamsIterator;
+  std::list<sStreamInfo> m_StreamInfos;
+  cChannel m_CurrentChannel;
+  cPatPmtParser m_PatPmtParser;
+  int m_OldPmtVersion;
+  bool m_WaitIFrame;
+  cVideoBuffer *m_VideoBuffer;
 };
-
-
-class cTSDemuxer
-{
-private:
-  cLiveStreamer        *m_Streamer;
-  eStreamType           m_streamType;
-  const int             m_pID;
-  eStreamContent        m_streamContent;
-
-  bool                  m_pesError;
-  cParser              *m_pesParser;
-
-  char                  m_language[4];  // ISO 639 3-letter language code (empty string if undefined)
-
-  int                   m_FpsScale;     // scale of 1000 and a rate of 29970 will result in 29.97 fps
-  int                   m_FpsRate;
-  int                   m_Height;       // height of the stream reported by the demuxer
-  int                   m_Width;        // width of the stream reported by the demuxer
-  float                 m_Aspect;       // display aspect of stream
-
-  int                   m_Channels;
-  int                   m_SampleRate;
-  int                   m_BitRate;
-  int                   m_BitsPerSample;
-  int                   m_BlockAlign;
-
-  unsigned char         m_subtitlingType;
-  uint16_t              m_compositionPageId;
-  uint16_t              m_ancillaryPageId;
-
-public:
-  cTSDemuxer(cLiveStreamer *streamer, eStreamType type, int pid);
-  virtual ~cTSDemuxer();
-
-  bool ProcessTSPacket(unsigned char *data);
-
-  void SetLanguage(const char *language);
-  const char *GetLanguage() { return m_language; }
-  const eStreamContent Content() const { return m_streamContent; }
-  const eStreamType Type() const { return m_streamType; }
-  const int GetPID() const { return m_pID; }
-
-  /* Video Stream Information */
-  void SetVideoInformation(int FpsScale, int FpsRate, int Height, int Width, float Aspect);
-  uint32_t GetFpsScale() const { return m_FpsScale; }
-  uint32_t GetFpsRate() const { return m_FpsRate; }
-  uint32_t GetHeight() const { return m_Height; }
-  uint32_t GetWidth() const { return m_Width; }
-  double GetAspect() const { return m_Aspect; }
-
-  /* Audio Stream Information */
-  void SetAudioInformation(int Channels, int SampleRate, int BitRate, int BitsPerSample, int BlockAlign);
-  uint32_t GetChannels() const { return m_Channels; }
-  uint32_t GetSampleRate() const { return m_SampleRate; }
-  uint32_t GetBlockAlign() const { return m_BlockAlign; }
-  uint32_t GetBitRate() const { return m_BitRate; }
-  uint32_t GetBitsPerSample() const { return m_BitsPerSample; }
-
-  /* Subtitle related stream information */
-  void SetSubtitlingDescriptor(unsigned char SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
-  unsigned char SubtitlingType() const { return m_subtitlingType; }
-  uint16_t CompositionPageId() const { return m_compositionPageId; }
-  uint16_t AncillaryPageId() const { return m_ancillaryPageId; }
-};
-
-#endif // VNSI_DEMUXER_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.c	2012-12-29 01:00:31.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-
-#include "demuxer_AAC.h"
-
-static int aac_sample_rates[16] =
-{
-  96000, 88200, 64000, 48000, 44100, 32000,
-  24000, 22050, 16000, 12000, 11025, 8000, 7350
-};
-
-
-cParserAAC::cParserAAC(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_demuxer                   = demuxer;
-  m_streamBuffer              = NULL;
-  m_streamBufferSize          = 0;
-  m_streamBufferDataSize      = 0;
-  m_streamParserPtr           = 0;
-  m_firstPUSIseen             = false;
-
-  m_Configured                = false;
-  m_FrameLengthType           = 0;
-  m_SampleRate                = 0;
-}
-
-cParserAAC::~cParserAAC()
-{
-  if (m_streamBuffer)
-    free(m_streamBuffer);
-}
-
-void cParserAAC::Parse(unsigned char *data, int size, bool pusi)
-{
-  if (pusi)
-  {
-    /* Payload unit start */
-    m_firstPUSIseen   = true;
-    m_streamBufferDataSize = 0;
-    m_streamParserPtr = 0;
-  }
-
-  if (!m_firstPUSIseen)
-    return;
-
-  if (m_streamBuffer == NULL)
-  {
-    m_streamBufferSize = 4000;
-    m_streamBuffer = (uint8_t*)malloc(m_streamBufferSize);
-  }
-
-  if(m_streamBufferDataSize + size >= m_streamBufferSize)
-  {
-    m_streamBufferSize += size * 4;
-    m_streamBuffer = (uint8_t*)realloc(m_streamBuffer, m_streamBufferSize);
-  }
-
-  memcpy(m_streamBuffer + m_streamBufferDataSize, data, size);
-  m_streamBufferDataSize += size;
-
-  if (m_streamParserPtr == 0)
-  {
-    if (m_streamBufferDataSize < 9)
-      return;
-
-    int hlen = ParsePESHeader(data, size);
-    if (hlen < 0)
-      return;
-
-    m_streamParserPtr += hlen;
-  }
-
-  int p = m_streamParserPtr;
-
-  int l;
-  if (m_demuxer->Type() == stAACLATM)
-  {
-    while ((l = m_streamBufferDataSize - p) > 3)
-    {
-      cBitstream bs(&m_streamBuffer[p], l * 8);
-      if(bs.readBits(11) == 0x2B7)
-      {
-        int muxlen = bs.readBits(13);
-
-        if(l < muxlen + 3)
-          break;
-
-        ParseLATMAudioMuxElement(m_streamBuffer + p + 3, muxlen);
-        p += muxlen + 3;
-      }
-      else
-      {
-        p++;
-      }
-    }
-  }
-  else if (m_demuxer->Type() == stAACADST)
-  {
-    while ((l = m_streamBufferDataSize - p) > 3)
-    {
-      if(m_streamBuffer[p] == 0xFF && (m_streamBuffer[p + 1] & 0xF0) == 0xF0)
-      {
-        // need at least 7 bytes for header
-        if (l < 7)
-          break;
-
-        cBitstream bs(&m_streamBuffer[p], l * 8);
-        bs.skipBits(15);
-
-        // check if CRC is present, means header is 9 byte long
-        int noCrc = bs.readBits(1);
-        if (!noCrc && (l < 9))
-          break;
-
-        bs.skipBits(2); // profile
-        m_SampleRateIndex = bs.readBits(4);
-        bs.skipBits(1); // private
-        m_ChannelConfig = bs.readBits(3);
-        bs.skipBits(4);
-
-        int frameLen = bs.readBits(13);
-
-        if (l < frameLen)
-          break;
-
-        m_SampleRate    = aac_sample_rates[m_SampleRateIndex & 0x0E];
-        if (m_SampleRate)
-          m_FrameDuration = 1024 * 90000 / m_SampleRate;
-
-        m_demuxer->SetAudioInformation(m_ChannelConfig, m_SampleRate, 0, 0, 0);
-
-        sStreamPacket pkt;
-        pkt.id       = m_pID;
-        pkt.size     = frameLen;
-        pkt.data     = &m_streamBuffer[p];
-        pkt.dts      = m_curDTS;
-        pkt.pts      = m_curDTS;
-        pkt.duration = m_FrameDuration;
-
-        m_curDTS += m_FrameDuration;
-        SendPacket(&pkt);
-
-        p += frameLen;
-      }
-      else
-      {
-        p++;
-      }
-    }
-  }
-  m_streamParserPtr = p;
-}
-
-void cParserAAC::ParseLATMAudioMuxElement(uint8_t *data, int len)
-{
-  cBitstream bs(data, len * 8);
-
-  if (!bs.readBits1())
-    ReadStreamMuxConfig(&bs);
-
-  if (!m_Configured)
-    return;
-
-  if (m_FrameLengthType != 0)
-    return;
-
-  int tmp;
-  unsigned int slotLen = 0;
-  do
-  {
-    tmp = bs.readBits(8);
-    slotLen += tmp;
-  } while (tmp == 255);
-
-  if (slotLen * 8 > bs.remainingBits())
-    return;
-
-  if (m_curDTS == DVD_NOPTS_VALUE)
-    return;
-
-  sStreamPacket pkt;
-  pkt.id       = m_pID;
-  pkt.size     = len + 3;
-  pkt.data     = data-3;
-  pkt.dts      = m_curDTS;
-  pkt.pts      = m_curDTS;
-  pkt.duration = m_FrameDuration;
-
-  m_curDTS += m_FrameDuration;
-
-  SendPacket(&pkt);
-  return;
-}
-
-void cParserAAC::ReadStreamMuxConfig(cBitstream *bs)
-{
-  int AudioMuxVersion = bs->readBits(1);
-  m_AudioMuxVersion_A = 0;
-  if (AudioMuxVersion)                       // audioMuxVersion
-    m_AudioMuxVersion_A = bs->readBits(1);
-
-  if(m_AudioMuxVersion_A)
-    return;
-
-  if (AudioMuxVersion)
-    LATMGetValue(bs);                      // taraFullness
-
-  bs->skipBits(1);                         // allStreamSameTimeFraming = 1
-  bs->skipBits(6);                         // numSubFrames = 0
-  bs->skipBits(4);                         // numPrograms = 0
-
-  // for each program (which there is only on in DVB)
-  bs->skipBits(3);                         // numLayer = 0
-
-  // for each layer (which there is only on in DVB)
-  if (!AudioMuxVersion)
-    ReadAudioSpecificConfig(bs);
-  else
-    return;
-
-  // these are not needed... perhaps
-  m_FrameLengthType = bs->readBits(3);
-  switch (m_FrameLengthType)
-  {
-    case 0:
-      bs->readBits(8);
-      break;
-    case 1:
-      bs->readBits(9);
-      break;
-    case 3:
-    case 4:
-    case 5:
-      bs->readBits(6);                 // celp_table_index
-      break;
-    case 6:
-    case 7:
-      bs->readBits(1);                 // hvxc_table_index
-      break;
-  }
-
-  if (bs->readBits(1))
-  {                   // other data?
-    if (AudioMuxVersion == 1)
-    {
-      LATMGetValue(bs);              // other_data_bits
-    }
-    else
-    {
-      int esc;
-      do
-      {
-        esc = bs->readBits(1);
-        bs->skipBits(8);
-      } while (esc);
-    }
-  }
-
-  if (bs->readBits(1))                   // crc present?
-    bs->skipBits(8);                     // config_crc
-  m_Configured = true;
-}
-
-void cParserAAC::ReadAudioSpecificConfig(cBitstream *bs)
-{
-  int aot = bs->readBits(5);
-  if (aot == 31)
-    aot = 32 + bs->readBits(6);
-
-  m_SampleRateIndex = bs->readBits(4);
-
-  if (m_SampleRateIndex == 0xf)
-    m_SampleRate = bs->readBits(24);
-  else
-    m_SampleRate = aac_sample_rates[m_SampleRateIndex & 0xf];
-
-  if (m_SampleRate)
-    m_FrameDuration = 1024 * 90000 / m_SampleRate;
-  m_ChannelConfig = bs->readBits(4);
-
-  if (aot == 5) { // AOT_SBR
-    if (bs->readBits(4) == 0xf) { // extensionSamplingFrequencyIndex
-      bs->skipBits(24);
-    }
-    aot = bs->readBits(5); // this is the main object type (i.e. non-extended)
-    if (aot == 31)
-      aot = 32 + bs->readBits(6);
-  }
-
-  if(aot != 2)
-    return;
-
-  bs->skipBits(1);      //framelen_flag
-  if (bs->readBits1())  // depends_on_coder
-    bs->skipBits(14);
-
-  if (bs->readBits(1))  // ext_flag
-    bs->skipBits(1);    // ext3_flag
-
-  m_demuxer->SetAudioInformation(m_ChannelConfig, m_SampleRate, 0, 0, 0);
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.h	2012-12-11 01:00:24.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AAC.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_AAC_H
-#define VNSI_DEMUXER_AAC_H
-
-#include "demuxer.h"
-#include "bitstream.h"
-
-// --- cParserAAC -------------------------------------------------
-
-class cParserAAC : public cParser
-{
-private:
-  cTSDemuxer *m_demuxer;
-  uint8_t    *m_streamBuffer;
-  int         m_streamBufferSize;
-  int         m_streamBufferDataSize;
-  int         m_streamParserPtr;
-  bool        m_firstPUSIseen;
-
-  bool        m_Configured;
-  int         m_AudioMuxVersion_A;
-  int         m_FrameLengthType;
-  int         m_SampleRateIndex;
-  int         m_ChannelConfig;
-  int         m_FrameDuration;
-  int         m_SampleRate;
-
-public:
-  cParserAAC(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserAAC();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-  void ParseLATMAudioMuxElement(uint8_t *data, int len);
-  void ReadStreamMuxConfig(cBitstream *bs);
-  void ReadAudioSpecificConfig(cBitstream *bs);
-  uint32_t LATMGetValue(cBitstream *bs) { return bs->readBits(bs->readBits(2) * 8); }
-};
-
-#endif // VNSI_DEMUXER_AAC_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.c	2012-12-15 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,316 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-
-#include "demuxer_AC3.h"
-#include "bitstream.h"
-
-#define AC3_HEADER_SIZE 7
-
-/** Channel mode (audio coding mode) */
-typedef enum
-{
-  AC3_CHMODE_DUALMONO = 0,
-  AC3_CHMODE_MONO,
-  AC3_CHMODE_STEREO,
-  AC3_CHMODE_3F,
-  AC3_CHMODE_2F1R,
-  AC3_CHMODE_3F1R,
-  AC3_CHMODE_2F2R,
-  AC3_CHMODE_3F2R
-} AC3ChannelMode;
-
-/* possible frequencies */
-const uint16_t AC3SampleRateTable[3] = { 48000, 44100, 32000 };
-
-/* possible bitrates */
-const uint16_t AC3BitrateTable[19] = {
-    32, 40, 48, 56, 64, 80, 96, 112, 128,
-    160, 192, 224, 256, 320, 384, 448, 512, 576, 640
-};
-
-const uint8_t AC3ChannelsTable[8] = {
-    2, 1, 2, 3, 3, 4, 4, 5
-};
-
-const uint16_t AC3FrameSizeTable[38][3] = {
-    { 64,   69,   96   },
-    { 64,   70,   96   },
-    { 80,   87,   120  },
-    { 80,   88,   120  },
-    { 96,   104,  144  },
-    { 96,   105,  144  },
-    { 112,  121,  168  },
-    { 112,  122,  168  },
-    { 128,  139,  192  },
-    { 128,  140,  192  },
-    { 160,  174,  240  },
-    { 160,  175,  240  },
-    { 192,  208,  288  },
-    { 192,  209,  288  },
-    { 224,  243,  336  },
-    { 224,  244,  336  },
-    { 256,  278,  384  },
-    { 256,  279,  384  },
-    { 320,  348,  480  },
-    { 320,  349,  480  },
-    { 384,  417,  576  },
-    { 384,  418,  576  },
-    { 448,  487,  672  },
-    { 448,  488,  672  },
-    { 512,  557,  768  },
-    { 512,  558,  768  },
-    { 640,  696,  960  },
-    { 640,  697,  960  },
-    { 768,  835,  1152 },
-    { 768,  836,  1152 },
-    { 896,  975,  1344 },
-    { 896,  976,  1344 },
-    { 1024, 1114, 1536 },
-    { 1024, 1115, 1536 },
-    { 1152, 1253, 1728 },
-    { 1152, 1254, 1728 },
-    { 1280, 1393, 1920 },
-    { 1280, 1394, 1920 },
-};
-
-const uint8_t EAC3Blocks[4] = {
-  1, 2, 3, 6
-};
-
-typedef enum {
-  EAC3_FRAME_TYPE_INDEPENDENT = 0,
-  EAC3_FRAME_TYPE_DEPENDENT,
-  EAC3_FRAME_TYPE_AC3_CONVERT,
-  EAC3_FRAME_TYPE_RESERVED
-} EAC3FrameType;
-
-cParserAC3::cParserAC3(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_PTS                       = 0;
-  m_DTS                       = 0;
-  m_FrameSize                 = 0;
-  m_SampleRate                = 0;
-  m_Channels                  = 0;
-  m_BitRate                   = 0;
-  m_demuxer                   = demuxer;
-  m_firstPUSIseen             = false;
-  m_PESStart                  = false;
-  m_NextDTS                   = 0;
-  m_AC3BufferPtr              = 0;
-  m_HeaderFound               = false;
-}
-
-cParserAC3::~cParserAC3()
-{
-}
-
-void cParserAC3::Parse(unsigned char *data, int size, bool pusi)
-{
-  if (pusi)
-  {
-    /* Payload unit start */
-    m_PESStart      = true;
-    m_firstPUSIseen = true;
-  }
-
-  /* Wait for first pusi */
-  if (!m_firstPUSIseen)
-    return;
-
-  if (m_PESStart)
-  {
-    if (!PesIsPS1Packet(data))
-    {
-      ERRORLOG("AC3 PES packet contains no valid private stream 1, ignored this packet");
-      m_firstPUSIseen = false;
-      return;
-    }
-
-    int hlen = ParsePESHeader(data, size);
-    if (hlen <= 0)
-      return;
-
-    data += hlen;
-    size -= hlen;
-
-    m_PESStart = false;
-
-    assert(size >= 0);
-    if(size == 0)
-      return;
-  }
-
-  while (size > 0)
-  {
-    uint8_t *outbuf;
-    int      outlen;
-
-    int rlen = FindHeaders(&outbuf, &outlen, data, size);
-    if (rlen < 0)
-      break;
-
-    if (outlen)
-    {
-      sStreamPacket pkt;
-      pkt.id       = m_pID;
-      pkt.data     = outbuf;
-      pkt.size     = outlen;
-      pkt.duration = 90000 * 1536 / m_SampleRate;
-      pkt.dts      = m_DTS;
-      pkt.pts      = pkt.dts;
-      m_NextDTS    = pkt.dts + pkt.duration;
-
-      m_demuxer->SetAudioInformation(m_Channels, m_SampleRate, m_BitRate, 0, 0);
-
-      SendPacket(&pkt);
-    }
-    data += rlen;
-    size -= rlen;
-  }
-}
-
-int cParserAC3::FindHeaders(uint8_t **poutbuf, int *poutbuf_size,
-                                   uint8_t *buf, int buf_size)
-{
-  *poutbuf      = NULL;
-  *poutbuf_size = 0;
-
-  uint8_t *buf_ptr = buf;
-  while (buf_size > 0)
-  {
-    if (!m_HeaderFound && (buf_size >= 9) &&
-        (buf_ptr[0] == 0x0b && buf_ptr[1] == 0x77))
-    {
-      cBitstream bs(buf_ptr + 2, AC3_HEADER_SIZE * 8);
-
-      /* read ahead to bsid to distinguish between AC-3 and E-AC-3 */
-      int bsid = bs.showBits(29) & 0x1F;
-      if (bsid > 16)
-        return -1;
-
-      if (bsid <= 10)
-      {
-        /* Normal AC-3 */
-        bs.skipBits(16);
-        int fscod       = bs.readBits(2);
-        int frmsizecod  = bs.readBits(6);
-        bs.skipBits(5); // skip bsid, already got it
-        bs.skipBits(3); // skip bitstream mode
-        int acmod       = bs.readBits(3);
-
-        if (fscod == 3 || frmsizecod > 37)
-          return -1;
-
-        if (acmod == AC3_CHMODE_STEREO)
-        {
-          bs.skipBits(2); // skip dsurmod
-        }
-        else
-        {
-          if ((acmod & 1) && acmod != AC3_CHMODE_MONO)
-            bs.skipBits(2);
-          if (acmod & 4)
-            bs.skipBits(2);
-        }
-        int lfeon = bs.readBits(1);
-
-        int srShift   = max(bsid, 8) - 8;
-        m_SampleRate  = AC3SampleRateTable[fscod] >> srShift;
-        m_BitRate     = (AC3BitrateTable[frmsizecod>>1] * 1000) >> srShift;
-        m_Channels    = AC3ChannelsTable[acmod] + lfeon;
-        m_FrameSize   = AC3FrameSizeTable[frmsizecod][fscod] * 2;
-      }
-      else
-      {
-        /* Enhanced AC-3 */
-        int frametype = bs.readBits(2);
-        if (frametype == EAC3_FRAME_TYPE_RESERVED)
-          return -1;
-
-        /*int substreamid =*/ bs.readBits(3);
-
-        m_FrameSize = (bs.readBits(11) + 1) << 1;
-        if (m_FrameSize < AC3_HEADER_SIZE)
-          return -1;
-
-        int numBlocks = 6;
-        int sr_code = bs.readBits(2);
-        if (sr_code == 3)
-        {
-          int sr_code2 = bs.readBits(2);
-          if (sr_code2 == 3)
-            return -1;
-          m_SampleRate = AC3SampleRateTable[sr_code2] / 2;
-        }
-        else
-        {
-          numBlocks = EAC3Blocks[bs.readBits(2)];
-          m_SampleRate = AC3SampleRateTable[sr_code];
-        }
-
-        int channelMode = bs.readBits(3);
-        int lfeon = bs.readBits(1);
-
-        m_BitRate  = (uint32_t)(8.0 * m_FrameSize * m_SampleRate / (numBlocks * 256.0));
-        m_Channels = AC3ChannelsTable[channelMode] + lfeon;
-      }
-      m_HeaderFound = true;
-      m_DTS = m_curDTS;
-      if (m_DTS == DVD_NOPTS_VALUE)
-        m_DTS = m_NextDTS;
-      m_curDTS = DVD_NOPTS_VALUE;
-    }
-
-    if (m_HeaderFound)
-    {
-      if (m_AC3BufferPtr > AC3_MAX_CODED_FRAME_SIZE - 1)
-      {
-        ERRORLOG("error in AC3 frame size");
-        m_AC3BufferPtr = 0;
-        m_HeaderFound = false;
-      }
-      else
-        m_AC3Buffer[m_AC3BufferPtr++] = buf_ptr[0];
-    }
-
-    if (m_FrameSize && m_AC3BufferPtr >= m_FrameSize)
-    {
-      *poutbuf        = m_AC3Buffer;
-      *poutbuf_size   = m_AC3BufferPtr;
-
-      m_AC3BufferPtr  = 0;
-      m_HeaderFound   = false;
-      break;
-    }
-
-    buf_ptr++;
-    buf_size--;
-  }
-  return (buf_ptr - buf);
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.h	2012-12-15 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_AC3.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_AC3_H
-#define VNSI_DEMUXER_AC3_H
-
-#include "demuxer.h"
-
-// --- cParserAC3 -------------------------------------------------
-
-class cParserAC3 : public cParser
-{
-private:
-  cTSDemuxer *m_demuxer;
-  bool        m_firstPUSIseen;
-  bool        m_PESStart;
-  int         m_SampleRate;
-  int         m_Channels;
-  int         m_BitRate;
-
-  int64_t     m_PTS;                /* pts of the current frame */
-  int64_t     m_DTS;                /* dts of the current frame */
-  int64_t     m_NextDTS;
-
-  int         m_FrameSize;
-  bool        m_HeaderFound;
-
-#define AC3_MAX_CODED_FRAME_SIZE 1920*2
-  uint8_t     m_AC3Buffer[AC3_MAX_CODED_FRAME_SIZE];    /* input buffer */
-  int         m_AC3BufferSize;
-  int         m_AC3BufferPtr;
-
-  int FindHeaders(uint8_t **poutbuf, int *poutbuf_size,
-                  uint8_t *buf, int buf_size);
-
-public:
-  cParserAC3(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserAC3();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-
-#endif // VNSI_DEMUXER_AC3_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-
-#include "demuxer_DTS.h"
-#include "bitstream.h"
-
-cParserDTS::cParserDTS(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_demuxer                   = demuxer;
-}
-
-cParserDTS::~cParserDTS()
-{
-}
-
-void cParserDTS::Parse(unsigned char *data, int size, bool pusi)
-{
-
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_DTS.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_DTS_H
-#define VNSI_DEMUXER_DTS_H
-
-#include "demuxer.h"
-
-// --- cParserDTS -------------------------------------------------
-
-class cParserDTS : public cParser
-{
-private:
-  cTSDemuxer *m_demuxer;
-
-public:
-  cParserDTS(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserDTS();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-
-#endif // VNSI_DEMUXER_DTS_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,396 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-
-#include "demuxer_MPEGAudio.h"
-
-cParserMPEG2Audio::cParserMPEG2Audio(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_FrameOffset               = 0;
-  m_CurrentOffset             = 0;
-  m_NextFrameOffset           = 0;
-  m_CurrentFrameStartIndex    = 0;
-  m_Offset                    = 0;
-  m_PTS                       = 0;
-  m_DTS                       = 0;
-  m_FrameSize                 = 0;
-  m_FrameFreeFormatFrameSize  = 0;
-  m_FrameFreeFormatNextHeader = 0;
-  m_FrameHeader               = 0;
-  m_HeaderCount               = 0;
-  m_SampleRate                = 0;
-  m_Channels                  = 0;
-  m_BitRate                   = 0;
-  m_demuxer                   = demuxer;
-  m_firstPUSIseen             = false;
-  m_PESStart                  = false;
-  m_FetchTimestamp            = true;
-  m_FrameInBufferPtr          = m_FrameInBuffer;
-  m_NextDTS                   = 0;
-
-  for (int i = 0; i < AV_PARSER_PTS_NB; i++)
-  {
-    m_CurrentFrameDTS[i] = DVD_NOPTS_VALUE;
-    m_CurrentFramePTS[i] = DVD_NOPTS_VALUE;
-    m_CurrentFrameEnd[i] = 0;
-    m_CurrentFrameOffset[i] = 0;
-  }
-
-  for (int i = 0; i < MPA_MAX_CODED_FRAME_SIZE; i++)
-  {
-    m_FrameInBuffer[i] = 0;
-  }
-}
-
-cParserMPEG2Audio::~cParserMPEG2Audio()
-{
-}
-
-void cParserMPEG2Audio::Parse(unsigned char *data, int size, bool pusi)
-{
-  if (pusi)
-  {
-    /* Payload unit start */
-    m_PESStart      = true;
-    m_firstPUSIseen = true;
-  }
-
-  /* Wait for first pusi */
-  if (!m_firstPUSIseen)
-    return;
-
-  if (m_PESStart)
-  {
-    int hlen = ParsePESHeader(data, size);
-    if (hlen <= 0)
-      return;
-
-    data += hlen;
-    size -= hlen;
-
-    m_PESStart = false;
-
-    assert(size >= 0);
-    if(size == 0)
-      return;
-  }
-
-  while (size > 0)
-  {
-    uint8_t *outbuf;
-    int      outlen;
-
-    int rlen = FindHeaders(&outbuf, &outlen, data, size, m_curPTS, m_curDTS);
-    if (rlen < 0)
-      break;
-
-    m_curPTS = DVD_NOPTS_VALUE;
-    m_curDTS = DVD_NOPTS_VALUE;
-
-    if (outlen)
-    {
-      sStreamPacket pkt;
-      pkt.id       = m_pID;
-      pkt.data     = outbuf;
-      pkt.size     = outlen;
-      pkt.duration = 90000 * 1152 / m_SampleRate;
-      pkt.dts      = m_DTS;
-      if (pkt.dts == DVD_NOPTS_VALUE)
-        pkt.dts = m_NextDTS;
-      pkt.pts      = pkt.dts;
-      m_NextDTS    = pkt.dts + pkt.duration;
-
-      SendPacket(&pkt);
-    }
-    data += rlen;
-    size -= rlen;
-  }
-}
-
-int cParserMPEG2Audio::FindHeaders(uint8_t **poutbuf, int *poutbuf_size,
-                                   uint8_t *buf, int buf_size,
-                                   int64_t pts, int64_t dts)
-{
-  *poutbuf      = NULL;
-  *poutbuf_size = 0;
-
-  /* add a new packet descriptor */
-  if (pts != DVD_NOPTS_VALUE || dts != DVD_NOPTS_VALUE)
-  {
-    int i = (m_CurrentFrameStartIndex + 1) & (AV_PARSER_PTS_NB - 1);
-    m_CurrentFrameStartIndex  = i;
-    m_CurrentFrameOffset[i]   = m_CurrentOffset;
-    m_CurrentFrameEnd[i]      = m_CurrentOffset + buf_size;
-    m_CurrentFramePTS[i]      = pts;
-    m_CurrentFrameDTS[i]      = dts;
-  }
-
-  if (m_FetchTimestamp)
-  {
-    m_FetchTimestamp  = false;
-    FetchTimestamp(0, false);
-  }
-
-  const uint8_t *buf_ptr = buf;
-  while (buf_size > 0)
-  {
-    int len = m_FrameInBufferPtr - m_FrameInBuffer;
-    if (m_FrameSize == 0)
-    {
-      /* special case for next header for first frame in free
-         format case (XXX: find a simpler method) */
-      if (m_FrameFreeFormatNextHeader != 0)
-      {
-        m_FrameInBuffer[3] = m_FrameFreeFormatNextHeader;
-        m_FrameInBuffer[2] = m_FrameFreeFormatNextHeader>>8;
-        m_FrameInBuffer[1] = m_FrameFreeFormatNextHeader>>16;
-        m_FrameInBuffer[0] = m_FrameFreeFormatNextHeader>>24;
-        m_FrameInBufferPtr = m_FrameInBuffer + 4;
-        m_FrameFreeFormatNextHeader = 0;
-        goto got_header;
-      }
-      /* no header seen : find one. We need at least MPA_HEADER_SIZE
-         bytes to parse it */
-      len = min(MPA_HEADER_SIZE - len, buf_size);
-      if (len > 0)
-      {
-        memcpy(m_FrameInBufferPtr, buf_ptr, len);
-        buf_ptr            += len;
-        buf_size           -= len;
-        m_FrameInBufferPtr += len;
-      }
-      if ((m_FrameInBufferPtr - m_FrameInBuffer) >= MPA_HEADER_SIZE)
-      {
-      got_header:
-        MPADecodeHeader s;
-        uint32_t header = ((m_FrameInBuffer[0] << 24) | (m_FrameInBuffer[1] << 16) | (m_FrameInBuffer[2] <<  8) | m_FrameInBuffer[3]);
-        if (CheckHeader(header) && DecodeHeader(&s, header))
-        {
-          if ((header&SAME_HEADER_MASK) != (m_FrameHeader&SAME_HEADER_MASK) && m_FrameHeader)
-            m_HeaderCount = -3;
-          m_FrameHeader = header;
-          m_FrameSize   = s.frame_size;
-          m_SampleRate  = s.sample_rate;
-          m_Channels    = s.nb_channels;
-          m_BitRate     = s.bit_rate;
-          m_HeaderCount++;
-        }
-        else
-        {
-          m_HeaderCount = -2;
-          /* no sync found : move by one byte (inefficient, but simple!) */
-          memmove(m_FrameInBuffer, m_FrameInBuffer + 1, m_FrameInBufferPtr - m_FrameInBuffer - 1);
-          m_FrameInBufferPtr--;
-          //LOGDBG("skip %x", header);
-          /* reset free format frame size to give a chance
-             to get a new bitrate */
-          m_FrameFreeFormatFrameSize = 0;
-        }
-      }
-    }
-    else if (len < m_FrameSize)
-    {
-      if (m_FrameSize > MPA_MAX_CODED_FRAME_SIZE)
-        m_FrameSize = MPA_MAX_CODED_FRAME_SIZE;
-      len                 = min(m_FrameSize - len, buf_size);
-      memcpy(m_FrameInBufferPtr, buf_ptr, len);
-      buf_ptr            += len;
-      m_FrameInBufferPtr += len;
-      buf_size           -= len;
-    }
-
-    if(m_FrameSize > 0 && buf_ptr - buf == m_FrameInBufferPtr - m_FrameInBuffer && buf_size + buf_ptr - buf >= m_FrameSize)
-    {
-      if(m_HeaderCount > 0)
-      {
-        *poutbuf      = buf;
-        *poutbuf_size = m_FrameSize;
-      }
-      buf_ptr             = buf + m_FrameSize;
-      m_FrameInBufferPtr  = m_FrameInBuffer;
-      m_FrameSize         = 0;
-      break;
-    }
-
-    //    next_data:
-    if (m_FrameSize > 0 && (m_FrameInBufferPtr - m_FrameInBuffer) >= m_FrameSize)
-    {
-      if (m_HeaderCount > 0)
-      {
-        *poutbuf      = m_FrameInBuffer;
-        *poutbuf_size = m_FrameInBufferPtr - m_FrameInBuffer;
-      }
-      m_FrameInBufferPtr = m_FrameInBuffer;
-      m_FrameSize = 0;
-      break;
-    }
-  }
-  int index = buf_ptr - buf;
-
-  /* update the file pointer */
-  if (*poutbuf_size)
-  {
-    /* fill the data for the current frame */
-    m_FrameOffset     = m_NextFrameOffset;
-
-    /* offset of the next frame */
-    m_NextFrameOffset = m_CurrentOffset + index;
-    m_FetchTimestamp  = true;
-  }
-  if (index < 0)
-    index = 0;
-  m_CurrentOffset += index;
-  return index;
-}
-
-void cParserMPEG2Audio::FetchTimestamp(int off, bool remove)
-{
-  m_DTS = DVD_NOPTS_VALUE;
-  m_PTS = DVD_NOPTS_VALUE;
-  m_Offset = 0;
-  for (int i = 0; i < AV_PARSER_PTS_NB; i++)
-  {
-    if (   m_NextFrameOffset + off >= m_CurrentFrameOffset[i]
-        &&(m_FrameOffset           <  m_CurrentFrameOffset[i] || !m_FrameOffset)
-        && m_CurrentFrameEnd[i])
-    {
-      m_DTS    = m_CurrentFrameDTS[i];
-      m_PTS    = m_CurrentFramePTS[i];
-      m_Offset = m_NextFrameOffset - m_CurrentFrameOffset[i];
-      if (remove)
-        m_CurrentFrameOffset[i] = -1;
-    }
-  }
-}
-
-bool cParserMPEG2Audio::DecodeHeader(MPADecodeHeader *s, uint32_t header)
-{
-  const uint16_t FrequencyTable[3] = { 44100, 48000, 32000 };
-  const uint16_t BitrateTable[2][3][15] =
-  {
-    {
-      {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448 },
-      {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384 },
-      {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320 }
-    },
-    {
-      {0, 32, 48, 56, 64,  80,  96,  112, 128, 144, 160, 176, 192, 224, 256},
-      {0, 8,  16, 24, 32,  40,  48,  56,  64,  80,  96,  112, 128, 144, 160},
-      {0, 8,  16, 24, 32,  40,  48,  56,  64,  80,  96,  112, 128, 144, 160}
-    }
-  };
-
-  int sample_rate, frame_size, mpeg25, padding;
-  int sample_rate_index, bitrate_index;
-  if (header & (1<<20))
-  {
-    s->lsf = (header & (1<<19)) ? 0 : 1;
-    mpeg25 = 0;
-  }
-  else
-  {
-    s->lsf = 1;
-    mpeg25 = 1;
-  }
-
-  s->layer              = 4 - ((header >> 17) & 3);
-  /* extract frequency */
-  sample_rate_index     = (header >> 10) & 3;
-  sample_rate           = FrequencyTable[sample_rate_index] >> (s->lsf + mpeg25);
-  sample_rate_index    += 3 * (s->lsf + mpeg25);
-  s->sample_rate_index  = sample_rate_index;
-  s->error_protection   = ((header >> 16) & 1) ^ 1;
-  s->sample_rate        = sample_rate;
-
-  bitrate_index         = (header >> 12) & 0xf;
-  padding               = (header >> 9) & 1;
-  //extension           = (header >> 8) & 1;
-  s->mode               = (header >> 6) & 3;
-  s->mode_ext           = (header >> 4) & 3;
-  //copyright           = (header >> 3) & 1;
-  //original            = (header >> 2) & 1;
-  //emphasis            = header & 3;
-
-  if (s->mode == MPA_MONO)
-    s->nb_channels = 1;
-  else
-    s->nb_channels = 2;
-
-  if (bitrate_index != 0)
-  {
-    frame_size  = BitrateTable[s->lsf][s->layer - 1][bitrate_index];
-    s->bit_rate = frame_size * 1000;
-    switch(s->layer)
-    {
-    case 1:
-      frame_size = (frame_size * 12000) / sample_rate;
-      frame_size = (frame_size + padding) * 4;
-      break;
-    case 2:
-      frame_size = (frame_size * 144000) / sample_rate;
-      frame_size += padding;
-      break;
-    default:
-    case 3:
-      frame_size = (frame_size * 144000) / (sample_rate << s->lsf);
-      frame_size += padding;
-      break;
-    }
-    s->frame_size = frame_size;
-  }
-  else
-  {
-    /* if no frame size computed, signal it */
-    return false;
-  }
-
-  m_demuxer->SetAudioInformation(s->nb_channels, s->sample_rate, s->bit_rate, 0, 0);
-
-#if defined(DEBUG)
-#define MODE_EXT_MS_STEREO 2
-#define MODE_EXT_I_STEREO  1
-  printf("layer%d, %d Hz, %d kbits/s, ", s->layer, s->sample_rate, s->bit_rate);
-  if (s->nb_channels == 2)
-  {
-    if (s->layer == 3)
-    {
-      if (s->mode_ext & MODE_EXT_MS_STEREO)
-        printf("ms-");
-      if (s->mode_ext & MODE_EXT_I_STEREO)
-        printf("i-");
-    }
-    printf("stereo");
-  }
-  else
-  {
-    printf("mono");
-  }
-  printf("\n");
-#endif
-  return true;
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_MPEGAUDIO_H
-#define VNSI_DEMUXER_MPEGAUDIO_H
-
-#include "demuxer.h"
-
-// --- cParserMPEG2Audio -------------------------------------------------
-
-class cParserMPEG2Audio : public cParser
-{
-private:
-  typedef struct MPADecodeHeader
-  {
-    int frame_size;
-    int error_protection;
-    int layer;
-    int sample_rate;
-    int sample_rate_index; /* between 0 and 8 */
-    int bit_rate;
-    int nb_channels;
-    int mode;
-    int mode_ext;
-    int lsf;
-  } MPADecodeHeader;
-
-  cTSDemuxer *m_demuxer;
-  bool        m_firstPUSIseen;
-  bool        m_PESStart;
-
-  bool        m_FetchTimestamp;
-  int64_t     m_FrameOffset;        /* offset of the current frame */
-  int64_t     m_CurrentOffset;      /* current offset (incremented by each av_parser_parse()) */
-  int64_t     m_NextFrameOffset;    /* offset of the next frame */
-
-#define AV_PARSER_PTS_NB 4
-  int         m_CurrentFrameStartIndex;
-  int64_t     m_CurrentFrameOffset[AV_PARSER_PTS_NB];
-  int64_t     m_CurrentFramePTS[AV_PARSER_PTS_NB];
-  int64_t     m_CurrentFrameDTS[AV_PARSER_PTS_NB];
-  int64_t     m_CurrentFrameEnd[AV_PARSER_PTS_NB];
-  int64_t     m_Offset;             /* byte offset from starting packet start */
-  int64_t     m_PTS;                /* pts of the current frame */
-  int64_t     m_DTS;                /* dts of the current frame */
-  int64_t     m_NextDTS;
-
-#define SAME_HEADER_MASK (0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19))
-#define MPA_HEADER_SIZE 4
-#define MPA_MAX_CODED_FRAME_SIZE 1792
-#define MPA_STEREO  0
-#define MPA_JSTEREO 1
-#define MPA_DUAL    2
-#define MPA_MONO    3
-  int         m_FrameSize;
-  int         m_FrameFreeFormatFrameSize;
-  int         m_FrameFreeFormatNextHeader;
-  uint32_t    m_FrameHeader;
-  int         m_HeaderCount;
-  int         m_SampleRate;
-  int         m_Channels;
-  int         m_BitRate;
-  uint8_t     m_FrameInBuffer[MPA_MAX_CODED_FRAME_SIZE];    /* input buffer */
-  uint8_t    *m_FrameInBufferPtr;
-
-  /* fast header check for resync */
-  void FetchTimestamp(int off, bool remove);
-  int FindHeaders(uint8_t **poutbuf, int *poutbuf_size,
-                  uint8_t *buf, int buf_size,
-                  int64_t pts, int64_t dts);
-  static inline bool CheckHeader(uint32_t header)
-  {
-    /* header */
-    if ((header & 0xffe00000) != 0xffe00000)
-      return false;
-    /* layer check */
-    if ((header & (3<<17)) == 0)
-      return false;
-    /* bit rate */
-    if ((header & (0xf<<12)) == 0xf<<12)
-      return false;
-    /* frequency */
-    if ((header & (3<<10)) == 3<<10)
-      return false;
-    return true;
-  }
-  bool DecodeHeader(MPADecodeHeader *s, uint32_t header);
-
-public:
-  cParserMPEG2Audio(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserMPEG2Audio();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-
-#endif // VNSI_DEMUXER_MPEGAUDIO_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,414 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-#include "bitstream.h"
-#include "receiver.h"
-
-#include "demuxer_MPEGVideo.h"
-
-using namespace std;
-
-#define MPEG_PICTURE_START      0x00000100
-#define MPEG_SEQUENCE_START     0x000001b3
-#define MPEG_SEQUENCE_EXTENSION 0x000001b5
-#define MPEG_SLICE_S            0x00000101
-#define MPEG_SLICE_E            0x000001af
-
-/**
- * MPEG2VIDEO frame duration table (in 90kHz clock domain)
- */
-const unsigned int mpeg2video_framedurations[16] = {
-  0,
-  3753,
-  3750,
-  3600,
-  3003,
-  3000,
-  1800,
-  1501,
-  1500,
-};
-
-cParserMPEG2Video::cParserMPEG2Video(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_pictureBuffer     = NULL;
-  m_pictureBufferSize = 0;
-  m_pictureBufferPtr  = 0;
-  m_StartCond         = 0;
-  m_StartCode         = 0;
-  m_StartCodeOffset   = 0;
-  m_FrameDuration     = 0;
-  m_vbvDelay          = -1;
-  m_vbvSize           = 0;
-  m_Height            = 0;
-  m_Width             = 0;
-  m_StreamPacket      = NULL;
-  m_demuxer           = demuxer;
-}
-
-cParserMPEG2Video::~cParserMPEG2Video()
-{
-  while (!m_PTSQueue.empty())
-  {
-    sStreamPacket* pkt = m_PTSQueue.front();
-    m_PTSQueue.pop_front();
-    free(pkt->data);
-    delete pkt;
-  }
-  while (!m_DurationQueue.empty())
-  {
-    sStreamPacket* pkt = m_DurationQueue.front();
-    m_DurationQueue.pop_front();
-    free(pkt->data);
-    delete pkt;
-  }
-  if (m_pictureBuffer)
-  {
-    free(m_pictureBuffer);
-    m_pictureBuffer = NULL;
-  }
-}
-
-void cParserMPEG2Video::Parse(unsigned char *data, int size, bool pusi)
-{
-  uint32_t startcode = m_StartCond;
-
-  /* Parse PES header here for MPEG PS streams like from pvrinput */
-  if (pusi && m_Streamer->IsMPEGPS())
-  {
-    int hlen;
-
-    hlen = ParsePESHeader(data, size);
-  #if 0
-    int i;
-    for(i = 0; i < 16; i++)
-      printf("%02x.", data[i]);
-    printf(" %d\n", hlen);
-  #endif
-    data += hlen;
-    size  -= hlen;
-
-    if(size < 1)
-      return;
-  }
-
-  if (m_pictureBuffer == NULL)
-  {
-    m_pictureBufferSize   = 4000;
-    m_pictureBuffer       = (uint8_t*)malloc(m_pictureBufferSize);
-  }
-
-  if (m_pictureBufferPtr + size + 4 >= m_pictureBufferSize)
-  {
-    m_pictureBufferSize  += size * 4;
-    m_pictureBuffer       = (uint8_t*)realloc(m_pictureBuffer, m_pictureBufferSize);
-  }
-
-  for (int i = 0; i < size; i++)
-  {
-    if (!m_pictureBuffer)
-      break;
-
-    m_pictureBuffer[m_pictureBufferPtr++] = data[i];
-    startcode = startcode << 8 | data[i];
-
-    if ((startcode & 0xffffff00) != 0x00000100)
-      continue;
-
-    bool reset = true;
-    if (m_pictureBufferPtr - 4 > 0 && m_StartCode != 0)
-    {
-      reset = Parse_MPEG2Video(m_pictureBufferPtr - 4, startcode, m_StartCodeOffset);
-    }
-
-    if (reset)
-    {
-      /* Reset packet parser upon length error or if parser tells us so */
-      m_pictureBufferPtr = 0;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 24;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 16;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 8;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 0;
-    }
-    m_StartCode = startcode;
-    m_StartCodeOffset = m_pictureBufferPtr - 4;
-  }
-  m_StartCond = startcode;
-}
-
-bool cParserMPEG2Video::Parse_MPEG2Video(size_t len, uint32_t next_startcode, int sc_offset)
-{
-  int frametype;
-  uint8_t *buf = m_pictureBuffer + sc_offset;
-  cBitstream bs(buf + 4, (len - 4) * 8);
-
-  switch (m_StartCode)
-  {
-    case 0x000001e0 ... 0x000001ef:
-      /* System start codes for video */
-      if (len >= 9)
-        ParsePESHeader(buf, len);
-      return true;
-
-    case 0x00000100:
-      /* Picture start code */
-      if (m_FrameDuration == 0 || m_curDTS == DVD_NOPTS_VALUE)
-        return true;
-
-      if (Parse_MPEG2Video_PicStart(&frametype, &bs))
-        return true;
-
-      if (m_StreamPacket != NULL)
-      {
-        ERRORLOG("MPEG2 Video got a new picture start code with already openend steam packed");
-      }
-
-      m_StreamPacket = new sStreamPacket;
-      m_StreamPacket->id        = m_pID;
-      m_StreamPacket->pts       = m_curPTS;
-      m_StreamPacket->dts       = m_curDTS;
-      m_StreamPacket->frametype = frametype;
-      m_StreamPacket->duration  = 0;
-      m_FoundFrame = true;
-      break;
-
-    case 0x000001b3:
-      /* Sequence start code */
-      if (Parse_MPEG2Video_SeqStart(&bs))
-        return true;
-
-      break;
-
-    case 0x000001b5:
-      if(len < 5)
-        return true;
-      switch(buf[4] >> 4) {
-      case 0x1:
-        /* sequence extension */
-        //      printf("Sequence extension, len = %d\n", len);
-        if(len < 10)
-          return true;
-        //      printf("Profile = %d\n", buf[4] & 0x7);
-        //      printf("  Level = %d\n", buf[5] >> 4);
-        break;
-      }
-      break;
-
-    case 0x00000101 ... 0x000001af:
-      /* Slices */
-
-      if (next_startcode == 0x100 || next_startcode > 0x1af)
-      {
-        /* Last picture slice (because next not a slice) */
-        if(m_StreamPacket == NULL)
-        {
-          /* no packet, may've been discarded by sanity checks here */
-          return true;
-        }
-
-        m_StreamPacket->data      = m_pictureBuffer;
-        m_StreamPacket->size      = m_pictureBufferPtr - 4;
-        m_StreamPacket->duration  = m_FrameDuration;
-
-        Parse_ComputePTS(m_StreamPacket);
-        m_StreamPacket = NULL;
-
-        m_pictureBuffer = (uint8_t*)malloc(m_pictureBufferSize);
-
-        /* If we know the frame duration, increase DTS accordingly */
-        m_curDTS += m_FrameDuration;
-
-        /* PTS cannot be extrapolated (it's not linear) */
-        m_curPTS = DVD_NOPTS_VALUE;
-        return true;
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  return false;
-}
-
-bool cParserMPEG2Video::Parse_MPEG2Video_SeqStart(cBitstream *bs)
-{
-  if (bs->length() < 61)
-    return true;
-
-  m_Width         = bs->readBits(12);
-  m_Height        = bs->readBits(12);
-
-  // figure out Display Aspect Ratio
-  double DAR = 0;
-  uint8_t aspect = bs->readBits(4);
-
-  switch(aspect)
-  {
-    case 0:
-    default:
-      ERRORLOG("invalid / forbidden DAR in sequence header !");
-      break;
-    case 1:
-      DAR = 1.0;
-      break;
-    case 2:
-      DAR = 4.0/3.0;
-      break;
-    case 3:
-      DAR = 16.0/9.0;
-      break;
-    case 4:
-      DAR = 2.21;
-      break;
-  }
-
-  DEBUGLOG("MPEG2 DAR: %.2f", DAR);
-
-  m_FrameDuration = mpeg2video_framedurations[bs->readBits(4)];
-  bs->skipBits(18);
-  bs->skipBits(1);
-
-  if (m_Width > 0)
-    m_Streamer->SetReady();
-
-  m_vbvSize = bs->readBits(10) * 16 * 1024 / 8;
-  m_demuxer->SetVideoInformation(0,0, m_Height, m_Width, DAR);
-
-  return false;
-}
-
-bool cParserMPEG2Video::Parse_MPEG2Video_PicStart(int *frametype, cBitstream *bs)
-{
-  if (bs->length() < 29)
-    return true;
-
-  bs->skipBits(10); /* temporal reference */
-
-  int pct = bs->readBits(3);
-  if (pct < PKT_I_FRAME || pct > PKT_B_FRAME)
-    return true; /* Illegal picture_coding_type */
-
-  *frametype = pct;
-
-  int vbvDelay = bs->readBits(16); /* vbv_delay */
-  if (vbvDelay  == 0xffff)
-    m_vbvDelay = -1;
-  else
-    m_vbvDelay = Rescale(vbvDelay);
-
-  return false;
-}
-
-void cParserMPEG2Video::Parse_ComputePTS(sStreamPacket *pkt)
-{
-  bool validpts = pkt->pts != DVD_NOPTS_VALUE && m_PTSQueue.size() == 0;
-
-  /* PTS known and no other packets in queue, deliver at once */
-  if (validpts && pkt->duration)
-  {
-    if (m_Width > 0)
-      SendPacket(pkt);
-    free(pkt->data);
-    delete pkt;
-    return;
-  }
-
-  if (validpts)
-    return Parse_ComputeDuration(pkt);
-
-  m_PTSQueue.push_back(pkt);
-
-  while (!m_PTSQueue.empty())
-  {
-    pkt = m_PTSQueue.front();
-
-    switch (pkt->frametype)
-    {
-      case PKT_B_FRAME:
-        /* B-frames have same PTS as DTS, pass them on */
-        pkt->pts = pkt->dts;
-        break;
-
-      case PKT_I_FRAME:
-      case PKT_P_FRAME:
-        /* Presentation occures at DTS of next I or P frame, try to find it */
-        deque<sStreamPacket*>::iterator it;
-        it = m_PTSQueue.begin()+1;
-        while (1)
-        {
-          if (it >= m_PTSQueue.end())
-            return; /* not arrived yet, wait */
-
-          sStreamPacket* pkt2 = *it++;
-          if (pkt2->frametype <= PKT_P_FRAME)
-          {
-            pkt->pts = pkt2->dts;
-            break;
-          }
-        }
-        break;
-    }
-
-    m_PTSQueue.pop_front();
-
-    if (pkt->duration == 0)
-    {
-      Parse_ComputeDuration(pkt);
-    }
-    else
-    {
-      if (m_Width > 0)
-        SendPacket(pkt);
-      free(pkt->data);
-      delete pkt;
-    }
-  }
-}
-
-void cParserMPEG2Video::Parse_ComputeDuration(sStreamPacket *pkt)
-{
-  m_DurationQueue.push_back(pkt);
-
-  pkt = m_DurationQueue.front();
-  if (m_DurationQueue.size() <= 1)
-    return;
-
-  sStreamPacket *next = m_DurationQueue[1];
-
-  int64_t duration = next->dts - pkt->dts;
-  m_DurationQueue.pop_front();
-
-  if (duration >= 10)
-  {
-    pkt->duration = duration;
-    if (m_Width > 0)
-      SendPacket(pkt);
-  }
-  free(pkt->data);
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_MPEGVIDEO_H
-#define VNSI_DEMUXER_MPEGVIDEO_H
-
-#include <deque>
-#include "demuxer.h"
-
-class cBitstream;
-
-// --- cParserMPEG2Video -------------------------------------------------
-
-class cParserMPEG2Video : public cParser
-{
-private:
-  std::deque<sStreamPacket*> m_DurationQueue;
-  std::deque<sStreamPacket*> m_PTSQueue;
-
-  cTSDemuxer     *m_demuxer;
-  uint8_t        *m_pictureBuffer;
-  int             m_pictureBufferSize;
-  int             m_pictureBufferPtr;
-  int             m_FrameDuration;
-  uint32_t        m_StartCond;
-  uint32_t        m_StartCode;
-  int             m_StartCodeOffset;
-  sStreamPacket  *m_StreamPacket;
-  int             m_vbvDelay;       /* -1 if CBR */
-  int             m_vbvSize;        /* Video buffer size (in bytes) */
-  int             m_Width;
-  int             m_Height;
-
-  bool Parse_MPEG2Video(size_t len, uint32_t next_startcode, int sc_offset);
-  bool Parse_MPEG2Video_SeqStart(cBitstream *bs);
-  bool Parse_MPEG2Video_PicStart(int *frametype, cBitstream *bs);
-  void Parse_ComputePTS(sStreamPacket* pkt);
-  void Parse_ComputeDuration(sStreamPacket* pkt);
-
-public:
-  cParserMPEG2Video(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserMPEG2Video();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-#endif // VNSI_DEMUXER_MPEGVIDEO_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-
-#include "demuxer_Subtitle.h"
-
-cParserSubtitle::cParserSubtitle(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_firstPUSIseen       = false;
-  m_PESStart            = false;
-  m_subtitleBuffer      = NULL;
-  m_subtitleBufferSize  = 0;
-  m_subtitleBufferPtr   = 0;
-  m_lastDTS             = DVD_NOPTS_VALUE;
-  m_lastPTS             = DVD_NOPTS_VALUE;
-  m_lastLength          = 0;
-  m_curLength           = 0;
-}
-
-cParserSubtitle::~cParserSubtitle()
-{
-  if (m_subtitleBuffer)
-    free(m_subtitleBuffer);
-}
-
-void cParserSubtitle::Parse(unsigned char *data, int size, bool pusi)
-{
-  if (pusi)
-  {
-    /* Payload unit start */
-    m_subtitleBufferPtr = 0;
-    m_firstPUSIseen = true;
-  }
-
-  /* Wait for first pusi */
-  if (!m_firstPUSIseen)
-    return;
-
-  if (m_subtitleBuffer == NULL)
-  {
-    m_subtitleBufferSize  = 4000;
-    m_subtitleBuffer      = (uint8_t*)malloc(m_subtitleBufferSize);
-  }
-
-  if (m_subtitleBufferPtr + size + 4 >= m_subtitleBufferSize)
-  {
-    m_subtitleBufferSize  += size * 4;
-    m_subtitleBuffer       = (uint8_t*)realloc(m_subtitleBuffer, m_subtitleBufferSize);
-  }
-
-  memcpy(m_subtitleBuffer+m_subtitleBufferPtr, data, size);
-  m_subtitleBufferPtr += size;
-
-  if (m_subtitleBufferPtr < 6)
-    return;
-
-  uint32_t startcode =
-    (m_subtitleBuffer[0] << 24) |
-    (m_subtitleBuffer[1] << 16) |
-    (m_subtitleBuffer[2] << 8) |
-    (m_subtitleBuffer[3]);
-
-  if (startcode == 0x1be)
-  {
-    m_firstPUSIseen = false;
-    return;
-  }
-
-  int psize = m_subtitleBuffer[4] << 8 | m_subtitleBuffer[5];
-
-  if (m_subtitleBufferPtr != psize + 6)
-    return;
-
-  m_firstPUSIseen = false;
-
-  int hlen = ParsePESHeader(m_subtitleBuffer, m_subtitleBufferPtr);
-  if (hlen < 0)
-    return;
-
-  if (m_lastDTS == DVD_NOPTS_VALUE)
-  {
-    m_lastDTS = m_curDTS;
-    m_lastPTS = m_curPTS;
-  }
-
-  psize -= hlen - 6;
-  uint8_t *buf = m_subtitleBuffer + hlen;
-
-  if (psize < 2 || buf[0] != 0x20 || buf[1] != 0x00)
-    return;
-
-  psize -= 2;
-  buf += 2;
-
-  if (psize >= 6)
-  {
-    // end_of_PES_data_field_marker
-    if (buf[psize - 1] == 0xff)
-    {
-      sStreamPacket pkt;
-      pkt.id       = m_pID;
-      pkt.data     = buf;
-      pkt.size     = psize - 1;
-      pkt.duration = m_curDTS-m_lastDTS;
-      pkt.dts      = m_curPTS;
-      pkt.pts      = m_curPTS;
-      SendPacket(&pkt);
-
-      m_lastDTS = m_curDTS;
-      m_lastPTS = m_curPTS;
-    }
-  }
-
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_SUBTITLE_H
-#define VNSI_DEMUXER_SUBTITLE_H
-
-#include "demuxer.h"
-
-// --- cParserSubtitle -------------------------------------------------
-
-class cParserSubtitle : public cParser
-{
-private:
-  bool        m_firstPUSIseen;
-  bool        m_PESStart;
-  uint8_t    *m_subtitleBuffer;
-  int         m_subtitleBufferSize;
-  int         m_subtitleBufferPtr;
-  int64_t     m_lastDTS;
-  int64_t     m_lastPTS;
-  int         m_lastLength;
-  int         m_curLength;
-
-public:
-  cParserSubtitle(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserSubtitle();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-
-#endif // VNSI_DEMUXER_SUBTITLE_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include "config.h"
-
-#include "demuxer_Teletext.h"
-
-cParserTeletext::cParserTeletext(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_firstPUSIseen       = false;
-  m_PESStart            = false;
-  m_teletextBuffer      = NULL;
-  m_teletextBufferSize  = 0;
-  m_teletextBufferPtr   = 0;
-  m_lastDTS             = DVD_NOPTS_VALUE;
-  m_lastPTS             = DVD_NOPTS_VALUE;
-}
-
-cParserTeletext::~cParserTeletext()
-{
-  if (m_teletextBuffer)
-    free(m_teletextBuffer);
-}
-
-void cParserTeletext::Parse(unsigned char *data, int size, bool pusi)
-{
-  if (pusi)
-  {
-    /* Payload unit start */
-    m_PESStart      = true;
-    m_firstPUSIseen = true;
-  }
-
-  /* Wait for first pusi */
-  if (!m_firstPUSIseen)
-    return;
-
-  if (m_PESStart)
-  {
-    if (!PesIsPS1Packet(data))
-    {
-      ERRORLOG("Teletext PES packet contains no valid private stream 1, ignored this packet");
-      m_firstPUSIseen = false;
-      return;
-    }
-
-    m_lastDTS = m_curDTS;
-    m_lastPTS = m_curPTS;
-    int hlen = ParsePESHeader(data, size);
-
-    m_PESStart = false;
-    data      += hlen;
-    size      -= hlen;
-
-    if (data[0] < 0x10 || data[0] > 0x1F)
-    {
-      ERRORLOG("Teletext PES packet contains no valid identifier, ignored this packet");
-      m_firstPUSIseen = false;
-      return;
-    }
-
-    if (m_teletextBuffer && m_teletextBufferPtr > 0)
-    {
-      sStreamPacket pkt;
-      pkt.id       = m_pID;
-      pkt.data     = m_teletextBuffer;
-      pkt.size     = m_teletextBufferPtr;
-      pkt.duration = m_curDTS-m_lastDTS;
-      pkt.dts      = m_lastDTS;
-      pkt.pts      = m_lastPTS;
-      SendPacket(&pkt);
-      m_teletextBufferPtr = 0;
-    }
-  }
-
-  if (m_teletextBuffer == NULL)
-  {
-    m_teletextBufferSize  = 4000;
-    m_teletextBuffer      = (uint8_t*)malloc(m_teletextBufferSize);
-  }
-
-  if (m_teletextBufferPtr + size + 4 >= m_teletextBufferSize)
-  {
-    m_teletextBufferSize  += size * 4;
-    m_teletextBuffer       = (uint8_t*)realloc(m_teletextBuffer, m_teletextBufferSize);
-  }
-
-  memcpy(m_teletextBuffer+m_teletextBufferPtr, data, size);
-  m_teletextBufferPtr += size;
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_TELETEXT_H
-#define VNSI_DEMUXER_TELETEXT_H
-
-#include "demuxer.h"
-
-// --- cParserTeletext -------------------------------------------------
-
-class cParserTeletext : public cParser
-{
-private:
-  bool        m_firstPUSIseen;
-  bool        m_PESStart;
-  uint8_t    *m_teletextBuffer;
-  int         m_teletextBufferSize;
-  int         m_teletextBufferPtr;
-  int64_t     m_lastDTS;
-  int64_t     m_lastPTS;
-
-public:
-  cParserTeletext(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserTeletext();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-#endif // VNSI_DEMUXER_TELETEXT_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.c	2012-12-24 01:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,428 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <assert.h>
-#include "config.h"
-#include "bitstream.h"
-#include "receiver.h"
-
-#include "demuxer_h264.h"
-
-static const int h264_lev2cpbsize[][2] =
-{
-  {10, 175},
-  {11, 500},
-  {12, 1000},
-  {13, 2000},
-  {20, 2000},
-  {21, 4000},
-  {22, 4000},
-  {30, 10000},
-  {31, 14000},
-  {32, 20000},
-  {40, 25000},
-  {41, 62500},
-  {42, 62500},
-  {50, 135000},
-  {51, 240000},
-  {-1, -1},
-};
-
-cParserH264::cParserH264(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID)
- : cParser(streamer, pID)
-{
-  m_pictureBuffer     = NULL;
-  m_pictureBufferSize = 0;
-  m_pictureBufferPtr  = 0;
-  m_StartCond         = 0;
-  m_StartCode         = 0;
-  m_StartCodeOffset   = 0;
-  m_PrevDTS           = DVD_NOPTS_VALUE;
-  m_Height            = 0;
-  m_Width             = 0;
-  m_FrameDuration     = 0;
-  m_demuxer           = demuxer;
-  m_vbvDelay          = -1;
-  m_vbvSize           = 0;
-  m_firstIFrame       = false;
-  m_PixelAspect.den   = 1;
-  m_PixelAspect.num   = 0;
-  memset(&m_streamData, 0, sizeof(m_streamData));
-}
-
-cParserH264::~cParserH264()
-{
-  if (m_pictureBuffer)
-    free(m_pictureBuffer);
-}
-
-void cParserH264::Parse(unsigned char *data, int size, bool pusi)
-{
-  uint32_t startcode = m_StartCond;
-
-  if (m_pictureBuffer == NULL)
-  {
-    m_pictureBufferSize   = 80000;
-    m_pictureBuffer       = (uint8_t*)malloc(m_pictureBufferSize);
-  }
-
-  if (m_pictureBufferPtr + size + 4 >= m_pictureBufferSize)
-  {
-    m_pictureBufferSize  += size * 4;
-    m_pictureBuffer       = (uint8_t*)realloc(m_pictureBuffer, m_pictureBufferSize);
-  }
-
-  for (int i = 0; i < size; i++)
-  {
-    m_pictureBuffer[m_pictureBufferPtr++] = data[i];
-    startcode = startcode << 8 | data[i];
-
-    if ((startcode & 0xffffff00) != 0x00000100)
-      continue;
-
-    bool reset = true;
-    if (m_pictureBufferPtr - 4 > 0 && m_StartCode != 0)
-    {
-      reset = Parse_H264(m_pictureBufferPtr - 4, startcode, m_StartCodeOffset);
-    }
-
-    if (reset)
-    {
-      /* Reset packet parser upon length error or if parser tells us so */
-      m_pictureBufferPtr = 0;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 24;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 16;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 8;
-      m_pictureBuffer[m_pictureBufferPtr++] = startcode >> 0;
-    }
-    m_StartCode = startcode;
-    m_StartCodeOffset = m_pictureBufferPtr - 4;
-  }
-  m_StartCond = startcode;
-}
-
-bool cParserH264::Parse_H264(size_t len, uint32_t next_startcode, int sc_offset)
-{
-  int pkttype;
-  uint8_t *buf = m_pictureBuffer + sc_offset;
-  uint32_t startcode = m_StartCode;
-
-  if (startcode == 0x10c)
-  {
-    /* RBSP padding, we don't want this */
-    int length = len - sc_offset;
-    memcpy(buf, buf + length, 4); /* Move down new start code */
-    m_pictureBufferPtr -= length;  /* Drop buffer */
-  }
-
-  if (startcode >= 0x000001e0 && startcode <= 0x000001ef)
-  {
-    /* System start codes for video */
-    if (len >= 9)
-      ParsePESHeader(buf, len);
-
-    if (m_PrevDTS != DVD_NOPTS_VALUE)
-    {
-      int64_t duration = (m_curDTS - m_PrevDTS) & 0x1ffffffffLL;
-
-      if (duration < 90000)
-        m_FrameDuration = duration;
-    }
-    m_PrevDTS = m_curDTS;
-    return true;
-  }
-
-  switch(startcode & 0x1f)
-  {
-  case NAL_SPS:
-  {
-    if (!Parse_SPS(buf+4, len-4))
-      return true;
-
-    double PAR = (double)m_PixelAspect.num/(double)m_PixelAspect.den;
-    double DAR = (PAR * m_Width) / m_Height;
-    DEBUGLOG("H.264 SPS: PAR %i:%i", m_PixelAspect.num, m_PixelAspect.den);
-    DEBUGLOG("H.264 SPS: DAR %.2f", DAR);
-
-    m_demuxer->SetVideoInformation(0,0, m_Height, m_Width, DAR);
-    break;
-  }
-
-  case NAL_PPS:
-  {
-    if (!Parse_PPS(buf-4, len-4))
-      return true;
-
-    break;
-  }
-
-  case 5: /* IDR+SLICE */
-  case NAL_SLH:
-  {
-    if (m_FoundFrame || m_FrameDuration == 0 || m_curDTS == DVD_NOPTS_VALUE)
-      break;
-
-    if (!Parse_SLH(buf+4, len-4, &pkttype))
-      return true;
-
-    m_StreamPacket.id         = m_pID;
-    m_StreamPacket.pts        = m_curPTS;
-    m_StreamPacket.dts        = m_curDTS;
-    m_StreamPacket.frametype  = pkttype;
-    m_StreamPacket.duration   = m_FrameDuration;
-    m_FoundFrame = true;
-
-    if (pkttype == PKT_I_FRAME)
-      m_firstIFrame = true;
-
-    break;
-  }
-
-  default:
-    break;
-  }
-
-  if (next_startcode >= 0x000001e0 && next_startcode <= 0x000001ef)
-  {
-    /* Complete frame */
-    if (!m_FoundFrame)
-      return true;
-
-    m_FoundFrame = false;
-
-    /* Discard Packets until we have the picture size (XBMC can't enable VDPAU without it) */
-    if (!m_firstIFrame || m_Width <= 0)
-      return true;
-
-    // send packet (will be cached if the stream isn't ready yet)
-    m_StreamPacket.data = m_pictureBuffer;
-    m_StreamPacket.size = m_pictureBufferPtr;
-    SendPacket(&m_StreamPacket);
-
-    // signal stream is ready
-    m_Streamer->SetReady();
-    return true;
-  }
-
-  return false;
-}
-
-bool cParserH264::Parse_PPS(uint8_t *buf, int len)
-{
-  cBitstream bs(buf, len*8);
-
-  int pps_id = bs.readGolombUE();
-  int sps_id = bs.readGolombUE();
-  m_streamData.pps[pps_id].sps = sps_id;
-  return true;
-}
-
-bool cParserH264::Parse_SLH(uint8_t *buf, int len, int *pkttype)
-{
-  cBitstream bs(buf, len*8);
-
-  bs.readGolombUE(); /* first_mb_in_slice */
-  int slice_type = bs.readGolombUE();
-
-  if (slice_type > 4)
-    slice_type -= 5;  /* Fixed slice type per frame */
-
-  switch (slice_type)
-  {
-  case 0:
-    *pkttype = PKT_P_FRAME;
-    break;
-  case 1:
-    *pkttype = PKT_B_FRAME;
-    break;
-  case 2:
-    *pkttype = PKT_I_FRAME;
-    break;
-  default:
-    return false;
-  }
-
-  int pps_id = bs.readGolombUE();
-  int sps_id = m_streamData.pps[pps_id].sps;
-  if (m_streamData.sps[sps_id].cbpsize == 0)
-    return false;
-
-  m_vbvSize = m_streamData.sps[sps_id].cbpsize;
-  m_vbvDelay = -1;
-  return true;
-}
-
-bool cParserH264::Parse_SPS(uint8_t *buf, int len)
-{
-  cBitstream bs(buf, len*8);
-  unsigned int tmp, frame_mbs_only;
-  int cbpsize = -1;
-
-  int profile_idc = bs.readBits(8);
-  /* constraint_set0_flag = bs.readBits1();    */
-  /* constraint_set1_flag = bs.readBits1();    */
-  /* constraint_set2_flag = bs.readBits1();    */
-  /* constraint_set3_flag = bs.readBits1();    */
-  /* reserved             = bs.readBits(4);    */
-  bs.skipBits(8);
-  int level_idc = bs.readBits(8);
-  unsigned int seq_parameter_set_id = bs.readGolombUE(9);
-
-  unsigned int i = 0;
-  while (h264_lev2cpbsize[i][0] != -1)
-  {
-    if (h264_lev2cpbsize[i][0] >= level_idc)
-    {
-      cbpsize = h264_lev2cpbsize[i][1];
-      break;
-    }
-    i++;
-  }
-  if (cbpsize < 0)
-    return false;
-
-  m_streamData.sps[seq_parameter_set_id].cbpsize = cbpsize * 125; /* Convert from kbit to bytes */
-
-  if (profile_idc >= 100)       /* high profile                   */
-  {
-    int chroma_format_idc = bs.readGolombUE(9); /* chroma_format_idc              */
-    if(chroma_format_idc == 3)
-      bs.skipBits(1);           /* residual_colour_transform_flag */
-    bs.readGolombUE();          /* bit_depth_luma - 8             */
-    bs.readGolombUE();          /* bit_depth_chroma - 8           */
-    bs.skipBits(1);             /* transform_bypass               */
-    if (bs.readBits1())         /* seq_scaling_matrix_present     */
-    {
-      for (int i = 0; i < ((chroma_format_idc != 3) ? 8 : 12); i++)
-      {
-        if (bs.readBits1())     /* seq_scaling_list_present       */
-        {
-          int last = 8, next = 8, size = (i<6) ? 16 : 64;
-          for (int j = 0; j < size; j++)
-          {
-            if (next)
-              next = (last + bs.readGolombSE()) & 0xff;
-            last = !next ? last: next;
-          }
-        }
-      }
-    }
-  }
-
-  bs.readGolombUE();           /* log2_max_frame_num - 4 */
-  int pic_order_cnt_type = bs.readGolombUE(9);
-  if (pic_order_cnt_type == 0)
-    bs.readGolombUE();         /* log2_max_poc_lsb - 4 */
-  else if (pic_order_cnt_type == 1)
-  {
-    bs.skipBits(1);            /* delta_pic_order_always_zero     */
-    bs.readGolombSE();         /* offset_for_non_ref_pic          */
-    bs.readGolombSE();         /* offset_for_top_to_bottom_field  */
-    tmp = bs.readGolombUE();   /* num_ref_frames_in_pic_order_cnt_cycle */
-    for (unsigned int i = 0; i < tmp; i++)
-      bs.readGolombSE();       /* offset_for_ref_frame[i]         */
-  }
-  else if(pic_order_cnt_type != 2)
-  {
-    /* Illegal poc */
-    return false;
-  }
-
-  bs.readGolombUE(9);          /* ref_frames                      */
-  bs.skipBits(1);             /* gaps_in_frame_num_allowed       */
-  m_Width  /* mbs */ = bs.readGolombUE() + 1;
-  m_Height /* mbs */ = bs.readGolombUE() + 1;
-  frame_mbs_only     = bs.readBits1();
-  DEBUGLOG("H.264 SPS: pic_width:  %u mbs", (unsigned) m_Width);
-  DEBUGLOG("H.264 SPS: pic_height: %u mbs", (unsigned) m_Height);
-  DEBUGLOG("H.264 SPS: frame only flag: %d", frame_mbs_only);
-
-  m_Width  *= 16;
-  m_Height *= 16 * (2-frame_mbs_only);
-
-  if (!frame_mbs_only)
-  {
-    if (bs.readBits1())     /* mb_adaptive_frame_field_flag */
-      DEBUGLOG("H.264 SPS: MBAFF");
-  }
-  bs.skipBits(1);           /* direct_8x8_inference_flag    */
-  if (bs.readBits1())       /* frame_cropping_flag */
-  {
-    uint32_t crop_left   = bs.readGolombUE();
-    uint32_t crop_right  = bs.readGolombUE();
-    uint32_t crop_top    = bs.readGolombUE();
-    uint32_t crop_bottom = bs.readGolombUE();
-    DEBUGLOG("H.264 SPS: cropping %d %d %d %d", crop_left, crop_top, crop_right, crop_bottom);
-
-    m_Width -= 2*(crop_left + crop_right);
-    if (frame_mbs_only)
-      m_Height -= 2*(crop_top + crop_bottom);
-    else
-      m_Height -= 4*(crop_top + crop_bottom);
-  }
-
-  /* VUI parameters */
-  m_PixelAspect.num = 0;
-  if (bs.readBits1())    /* vui_parameters_present flag */
-  {
-    if (bs.readBits1())  /* aspect_ratio_info_present */
-    {
-      uint32_t aspect_ratio_idc = bs.readBits(8);
-      DEBUGLOG("H.264 SPS: aspect_ratio_idc %d", aspect_ratio_idc);
-
-      if (aspect_ratio_idc == 255 /* Extended_SAR */)
-      {
-        m_PixelAspect.num = bs.readBits(16); /* sar_width */
-        m_PixelAspect.den = bs.readBits(16); /* sar_height */
-        DEBUGLOG("H.264 SPS: -> sar %dx%d", m_PixelAspect.num, m_PixelAspect.den);
-      }
-      else
-      {
-        static const mpeg_rational_t aspect_ratios[] =
-        { /* page 213: */
-          /* 0: unknown */
-          {0, 1},
-          /* 1...16: */
-          { 1,  1}, {12, 11}, {10, 11}, {16, 11}, { 40, 33}, {24, 11}, {20, 11}, {32, 11},
-          {80, 33}, {18, 11}, {15, 11}, {64, 33}, {160, 99}, { 4,  3}, { 3,  2}, { 2,  1}
-        };
-
-        if (aspect_ratio_idc < sizeof(aspect_ratios)/sizeof(aspect_ratios[0]))
-        {
-          memcpy(&m_PixelAspect, &aspect_ratios[aspect_ratio_idc], sizeof(mpeg_rational_t));
-          DEBUGLOG("H.264 SPS: PAR %d / %d", m_PixelAspect.num, m_PixelAspect.den);
-        }
-        else
-        {
-          DEBUGLOG("H.264 SPS: aspect_ratio_idc out of range !");
-        }
-      }
-    }
-  }
-
-  DEBUGLOG("H.264 SPS: -> video size %dx%d, aspect %d:%d", m_Width, m_Height, m_PixelAspect.num, m_PixelAspect.den);
-  return true;
-}
-
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.h	2012-12-24 01:00:29.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer_h264.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_DEMUXER_H264_H
-#define VNSI_DEMUXER_H264_H
-
-#include "demuxer.h"
-
-class cBitstream;
-
-// --- cParserH264 -------------------------------------------------
-
-class cParserH264 : public cParser
-{
-private:
-  typedef struct h264_private
-  {
-    struct
-    {
-      int frame_duration;
-      int cbpsize;
-    } sps[256];
-
-    struct
-    {
-      int sps;
-    } pps[256];
-
-  } h264_private_t;
-
-  typedef struct mpeg_rational_s {
-    int num;
-    int den;
-  } mpeg_rational_t;
-
-  enum
-  {
-    NAL_SLH     = 0x01, // Slice Header
-    NAL_SEI     = 0x06, // Supplemental Enhancement Information
-    NAL_SPS     = 0x07, // Sequence Parameter Set
-    NAL_PPS     = 0x08, // Picture Parameter Set
-    NAL_AUD     = 0x09, // Access Unit Delimiter
-    NAL_END_SEQ = 0x0A  // End of Sequence
-  };
-
-  cTSDemuxer     *m_demuxer;
-  uint8_t        *m_pictureBuffer;
-  int             m_pictureBufferSize;
-  int             m_pictureBufferPtr;
-  uint32_t        m_StartCond;
-  uint32_t        m_StartCode;
-  int             m_StartCodeOffset;
-  int             m_Width;
-  int             m_Height;
-  mpeg_rational_t m_PixelAspect;
-  int64_t         m_PrevDTS;
-  int             m_FrameDuration;
-  sStreamPacket   m_StreamPacket;
-  h264_private    m_streamData;
-  int             m_vbvDelay;       /* -1 if CBR */
-  int             m_vbvSize;        /* Video buffer size (in bytes) */
-  bool            m_firstIFrame;
-
-  bool Parse_H264(size_t len, uint32_t next_startcode, int sc_offset);
-  bool Parse_PPS(uint8_t *buf, int len);
-  bool Parse_SLH(uint8_t *buf, int len, int *pkttype);
-  bool Parse_SPS(uint8_t *buf, int len);
-
-public:
-  cParserH264(cTSDemuxer *demuxer, cLiveStreamer *streamer, int pID);
-  virtual ~cParserH264();
-
-  virtual void Parse(unsigned char *data, int size, bool pusi);
-};
-
-
-#endif // VNSI_DEMUXER_H264_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,500 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include <vdr/remux.h>
+#include <vdr/channels.h>
+#include "config.h"
+#include "parser.h"
+#include "parser_AAC.h"
+#include "parser_AC3.h"
+#include "parser_DTS.h"
+#include "parser_h264.h"
+#include "parser_MPEGAudio.h"
+#include "parser_MPEGVideo.h"
+#include "parser_Subtitle.h"
+#include "parser_Teletext.h"
+
+#define PTS_MASK 0x1ffffffffLL
+//#define PTS_MASK 0x7ffffLL
+
+#ifndef INT64_MIN
+#define INT64_MIN       (-0x7fffffffffffffffLL-1)
+#endif
+
+// --- cParser -------------------------------------------------
+
+cParser::cParser(int pID, cTSStream *stream)
+ : m_pID(pID)
+{
+  m_curPTS    = DVD_NOPTS_VALUE;
+  m_curDTS    = DVD_NOPTS_VALUE;
+  m_prevDTS   = DVD_NOPTS_VALUE;
+  m_PesBuffer = NULL;
+  m_IsError = false;
+  m_Stream = stream;
+  m_IsVideo = false;
+  m_PesBufferInitialSize = 1024;
+  Reset();
+}
+
+cParser::~cParser()
+{
+  if (m_PesBuffer)
+    free(m_PesBuffer);
+}
+
+
+/*
+ * Extract DTS and PTS and update current values in stream
+ */
+int cParser::ParsePESHeader(uint8_t *buf, size_t len)
+{
+  if (len < 6)
+    return -1;
+
+  m_PesPacketLength = buf[4] << 8 | buf[5];
+
+  if (!PesIsVideoPacket(buf) && !PesIsAudioPacket(buf))
+    return 6;
+
+  if (len < 9)
+    return -1;
+
+  unsigned int hdr_len = PesHeaderLength(buf);
+
+  if (m_PesPacketLength > 0)
+    m_PesPacketLength -= (hdr_len-6);
+
+  // scrambled
+  if ((buf[6] & 0x30) != 0)
+    return hdr_len;
+
+  // parse PTS
+  if ((hdr_len >= 13) &&
+      ((((buf[7] & 0xC0) == 0x80) && ((buf[9] & 0xF0) == 0x20)) ||
+        ((buf[7] & 0xC0) == 0xC0) && ((buf[9] & 0xF0) == 0x30)))
+  {
+    int64_t pts;
+    pts  = ((int64_t)(buf[ 9] & 0x0E)) << 29 ;
+    pts |= ((int64_t) buf[10])         << 22 ;
+    pts |= ((int64_t)(buf[11] & 0xFE)) << 14 ;
+    pts |= ((int64_t) buf[12])         <<  7 ;
+    pts |= ((int64_t)(buf[13] & 0xFE)) >>  1 ;
+    m_curPTS = pts;
+  }
+  else
+    return hdr_len;
+
+  m_prevDTS = m_curDTS;
+
+  // parse DTS
+  if ((hdr_len >= 18) &&
+      ((buf[7] & 0xC0) == 0xC0) && ((buf[14] & 0xF0) == 0x10))
+  {
+    int64_t dts;
+    dts  = ((int64_t)( buf[14] & 0x0E)) << 29 ;
+    dts |=  (int64_t)( buf[15]          << 22 );
+    dts |=  (int64_t)((buf[16] & 0xFE)  << 14 );
+    dts |=  (int64_t)( buf[17]          <<  7 );
+    dts |=  (int64_t)((buf[18] & 0xFE)  >>  1 );
+    m_curDTS = dts;
+  }
+  else
+    m_curDTS = m_curPTS;
+
+  return hdr_len;
+}
+
+int cParser::ParsePacketHeader(uint8_t *data)
+{
+  m_IsPusi  = TsPayloadStart(data);
+  int  bytes = TS_SIZE - TsPayloadOffset(data);
+
+  if(bytes < 0 || bytes > TS_SIZE)
+    return -1;
+
+  if (TsError(data))
+  {
+    ERRORLOG("transport error");
+    return -1;
+  }
+
+  if (!TsHasPayload(data))
+  {
+    DEBUGLOG("no payload, size %d", bytes);
+    return 0;
+  }
+
+  /* drop broken PES packets */
+  if (m_IsError && !m_IsPusi)
+  {
+    return -1;
+  }
+
+  /* handle new payload unit */
+  if (m_IsPusi)
+  {
+    if (!PesIsHeader(data+TS_SIZE-bytes))
+    {
+      m_IsError = true;
+//      ERRORLOG("--------------- no header");
+      Reset();
+      return -1;
+    }
+    m_IsError = false;
+  }
+
+  return bytes;
+}
+
+bool cParser::AddPESPacket(uint8_t *data, int size)
+{
+  // check for beginning of a PES packet
+  if (m_IsPusi)
+  {
+    if (IsValidStartCode(data, size))
+    {
+      m_firstPUSIseen = true;
+      int hlen = ParsePESHeader(data, size);
+      if (hlen <= 0)
+      {
+        INFOLOG("--------- reset");
+        Reset();
+        return false;
+      }
+      data += hlen;
+      size -= hlen;
+    }
+    else
+    {
+      INFOLOG("--------- reset 2");
+      Reset();
+    }
+  }
+
+  if (!m_firstPUSIseen)
+    return false;
+
+  if (m_PesBuffer == NULL)
+  {
+    m_PesBufferSize = m_PesBufferInitialSize;
+    m_PesBuffer = (uint8_t*)malloc(m_PesBufferSize);
+    if (m_PesBuffer == NULL)
+    {
+      ERRORLOG("cParser::AddPESPacket - malloc failed");
+      Reset();
+      return false;
+    }
+  }
+
+  if (m_PesBufferPtr + size >= m_PesBufferSize)
+  {
+    if (m_PesBufferPtr + size >= 500000)
+    {
+      ERRORLOG("cParser::AddPESPacket - max buffer size reached");
+      Reset();
+      return false;
+    }
+    m_PesBufferSize += m_PesBufferInitialSize / 10;
+    m_PesBuffer = (uint8_t*)realloc(m_PesBuffer, m_PesBufferSize);
+    if (m_PesBuffer == NULL)
+    {
+      ERRORLOG("cParser::AddPESPacket - realloc failed");
+      Reset();
+      return false;
+    }
+  }
+
+  // copy first packet of new frame to front
+  if (m_PesNextFramePtr)
+  {
+    memmove(m_PesBuffer, m_PesBuffer+m_PesNextFramePtr, m_PesBufferPtr-m_PesNextFramePtr);
+    m_PesBufferPtr = m_PesBufferPtr-m_PesNextFramePtr;
+    m_PesNextFramePtr = 0;
+  }
+
+  // copy payload
+  memcpy(m_PesBuffer+m_PesBufferPtr, data, size);
+  m_PesBufferPtr += size;
+
+  return false;
+}
+
+inline bool cParser::IsValidStartCode(uint8_t *buf, int size)
+{
+  if (size < 4)
+    return false;
+
+  uint32_t startcode = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3];
+  if (m_Stream->Type() == stH264 || m_Stream->Type() == stMPEG2VIDEO)
+  {
+    if (startcode >= 0x000001e0 && startcode <= 0x000001ef)
+      return true;
+  }
+  else if (m_Stream->Type() == stAC3 ||
+      m_Stream->Type() == stEAC3)
+  {
+    if (PesIsPS1Packet(buf))
+      return true;
+  }
+  else if (m_Stream->Type() == stMPEG2AUDIO ||
+      m_Stream->Type() == stAACADTS ||
+      m_Stream->Type() == stAACLATM ||
+      m_Stream->Type() == stDTS)
+  {
+    if (startcode >= 0x000001c0 && startcode <= 0x000001df)
+      return true;
+  }
+  else if (m_Stream->Type() == stTELETEXT)
+  {
+    if (PesIsPS1Packet(buf))
+      return true;
+  }
+  else if (m_Stream->Type() == stDVBSUB ||
+      m_Stream->Type() == stTEXTSUB)
+  {
+    if (startcode == 0x000001bd ||
+        startcode == 0x000001bf ||
+        (startcode >= 0x000001f0 && startcode <= 0x000001f9))
+      return true;
+  }
+  return false;
+}
+
+void cParser::Reset()
+{
+  m_PesBufferPtr = 0;
+  m_PesParserPtr = 0;
+  m_firstPUSIseen = false;
+  m_PesNextFramePtr = 0;
+  m_FoundFrame = false;
+  m_PesPacketLength = 0;
+}
+
+// --- cTSStream ----------------------------------------------------
+
+cTSStream::cTSStream(eStreamType type, int pid)
+  : m_streamType(type)
+  , m_pID(pid)
+{
+  m_pesError        = false;
+  m_pesParser       = NULL;
+  m_language[0]     = 0;
+  m_FpsScale        = 0;
+  m_FpsRate         = 0;
+  m_Height          = 0;
+  m_Width           = 0;
+  m_Aspect          = 0.0f;
+  m_Channels        = 0;
+  m_SampleRate      = 0;
+  m_BitRate         = 0;
+  m_BitsPerSample   = 0;
+  m_BlockAlign      = 0;
+  m_IsStreamChange  = false;
+
+  if (m_streamType == stMPEG2VIDEO)
+    m_pesParser = new cParserMPEG2Video(m_pID, this);
+  else if (m_streamType == stH264)
+    m_pesParser = new cParserH264(m_pID, this);
+  else if (m_streamType == stMPEG2AUDIO)
+    m_pesParser = new cParserMPEG2Audio(m_pID, this);
+  else if (m_streamType == stAACADTS)
+    m_pesParser = new cParserAAC(m_pID, this);
+  else if (m_streamType == stAACLATM)
+    m_pesParser = new cParserAAC(m_pID, this);
+  else if (m_streamType == stAC3)
+    m_pesParser = new cParserAC3(m_pID, this);
+  else if (m_streamType == stEAC3)
+    m_pesParser = new cParserAC3(m_pID, this);
+  else if (m_streamType == stDTS)
+    m_pesParser = new cParserDTS(m_pID, this);
+  else if (m_streamType == stTELETEXT)
+    m_pesParser = new cParserTeletext(m_pID, this);
+  else if (m_streamType == stDVBSUB)
+    m_pesParser = new cParserSubtitle(m_pID, this);
+  else
+  {
+    ERRORLOG("Unrecognised type %i inside stream %i", m_streamType, m_pID);
+    return;
+  }
+}
+
+cTSStream::~cTSStream()
+{
+  if (m_pesParser)
+  {
+    delete m_pesParser;
+    m_pesParser = NULL;
+  }
+}
+
+bool cTSStream::ProcessTSPacket(uint8_t *data, sStreamPacket *pkt, bool iframe)
+{
+  if (!data)
+    return false;
+
+  if (!m_pesParser)
+    return false;
+
+  int payloadSize = m_pesParser->ParsePacketHeader(data);
+  if (payloadSize < 0)
+    return false;
+
+  m_pesParser->AddPESPacket(data+TS_SIZE-payloadSize, payloadSize);
+  m_pesParser->Parse(pkt);
+  if (iframe && !m_pesParser->IsVideo())
+    return false;
+
+  if (pkt->data)
+  {
+    int64_t dts = pkt->dts;
+    int64_t pts = pkt->pts;
+
+    if (dts == DVD_NOPTS_VALUE)
+      dts = pts;
+
+    // Rescale for XBMC
+    pkt->dts      = Rescale(dts);
+    pkt->pts      = Rescale(pts);
+    pkt->duration = Rescale(pkt->duration);
+    return true;
+  }
+
+  return false;
+}
+
+int64_t cTSStream::Rescale(int64_t a)
+{
+  uint64_t b = DVD_TIME_BASE;
+  uint64_t c = 90000;
+  uint64_t r = c/2;
+
+  if (b<=INT_MAX && c<=INT_MAX){
+    if (a<=INT_MAX)
+      return (a * b + r)/c;
+    else
+      return a/c*b + (a%c*b + r)/c;
+  }
+  else
+  {
+    uint64_t a0= a&0xFFFFFFFF;
+    uint64_t a1= a>>32;
+    uint64_t b0= b&0xFFFFFFFF;
+    uint64_t b1= b>>32;
+    uint64_t t1= a0*b1 + a1*b0;
+    uint64_t t1a= t1<<32;
+
+    a0 = a0*b0 + t1a;
+    a1 = a1*b1 + (t1>>32) + (a0<t1a);
+    a0 += r;
+    a1 += a0<r;
+
+    for (int i=63; i>=0; i--)
+    {
+      a1+= a1 + ((a0>>i)&1);
+      t1+=t1;
+      if (c <= a1)
+      {
+        a1 -= c;
+        t1++;
+      }
+    }
+    return t1;
+  }
+}
+
+void cTSStream::SetLanguage(const char *language)
+{
+  m_language[0] = language[0];
+  m_language[1] = language[1];
+  m_language[2] = language[2];
+  m_language[3] = 0;
+}
+
+bool cTSStream::SetVideoInformation(int FpsScale, int FpsRate, int Height, int Width, float Aspect)
+{
+  if ((m_FpsScale != FpsScale) ||
+      (m_FpsRate != FpsRate) ||
+      (m_Height != Height) ||
+      (m_Width != Width) ||
+      (m_Aspect != Aspect))
+    m_IsStreamChange = true;
+
+  m_FpsScale        = FpsScale;
+  m_FpsRate         = FpsRate;
+  m_Height          = Height;
+  m_Width           = Width;
+  m_Aspect          = Aspect;
+
+  return m_IsStreamChange;
+}
+
+void cTSStream::GetVideoInformation(uint32_t &FpsScale, uint32_t &FpsRate, uint32_t &Height, uint32_t &Width, double &Aspect)
+{
+  FpsScale = m_FpsScale;
+  FpsRate = m_FpsRate;
+  Height = m_Height;
+  Width = m_Width;
+  Aspect = m_Aspect;
+
+  m_IsStreamChange = false;
+}
+
+bool cTSStream::SetAudioInformation(int Channels, int SampleRate, int BitRate, int BitsPerSample, int BlockAlign)
+{
+  if ((m_Channels != Channels) ||
+      (m_SampleRate != SampleRate) ||
+      (m_BlockAlign != BlockAlign) ||
+      (m_BitRate != BitRate) ||
+      (m_BitsPerSample != BitsPerSample))
+    m_IsStreamChange = true;
+
+  m_Channels        = Channels;
+  m_SampleRate      = SampleRate;
+  m_BlockAlign      = BlockAlign;
+  m_BitRate         = BitRate;
+  m_BitsPerSample   = BitsPerSample;
+
+  return m_IsStreamChange;
+}
+
+void cTSStream::GetAudioInformation(uint32_t &Channels, uint32_t &SampleRate, uint32_t &BitRate, uint32_t &BitsPerSample, uint32_t &BlockAlign)
+{
+  Channels = m_Channels;
+  SampleRate = m_SampleRate;
+  BlockAlign = m_BlockAlign;
+  BitRate = m_BitRate;
+  BitsPerSample = m_BitsPerSample;
+
+  m_IsStreamChange = false;
+}
+
+void cTSStream::SetSubtitlingDescriptor(unsigned char SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId)
+{
+  m_subtitlingType    = SubtitlingType;
+  m_compositionPageId = CompositionPageId;
+  m_ancillaryPageId   = AncillaryPageId;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,308 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_H
+#define VNSI_DEMUXER_H
+
+#include <vdr/device.h>
+#include <queue>
+
+#define DVD_TIME_BASE 1000000
+#define DVD_NOPTS_VALUE    (-1LL<<52) // should be possible to represent in both double and __int64
+
+/* PES PIDs */
+#define PRIVATE_STREAM1   0xBD
+#define PADDING_STREAM    0xBE
+#define PRIVATE_STREAM2   0xBF
+#define PRIVATE_STREAM3   0xFD
+#define AUDIO_STREAM_S    0xC0      /* 1100 0000 */
+#define AUDIO_STREAM_E    0xDF      /* 1101 1111 */
+#define VIDEO_STREAM_S    0xE0      /* 1110 0000 */
+#define VIDEO_STREAM_E    0xEF      /* 1110 1111 */
+
+#define AUDIO_STREAM_MASK 0x1F  /* 0001 1111 */
+#define VIDEO_STREAM_MASK 0x0F  /* 0000 1111 */
+#define AUDIO_STREAM      0xC0  /* 1100 0000 */
+#define VIDEO_STREAM      0xE0  /* 1110 0000 */
+
+#define ECM_STREAM        0xF0
+#define EMM_STREAM        0xF1
+#define DSM_CC_STREAM     0xF2
+#define ISO13522_STREAM   0xF3
+#define PROG_STREAM_DIR   0xFF
+
+inline bool PesIsHeader(const uchar *p)
+{
+  return !(p)[0] && !(p)[1] && (p)[2] == 1;
+}
+
+inline int PesHeaderLength(const uchar *p)
+{
+  return 8 + (p)[8] + 1;
+}
+
+inline bool PesIsVideoPacket(const uchar *p)
+{
+  return (((p)[3] & ~VIDEO_STREAM_MASK) == VIDEO_STREAM);
+}
+
+inline bool PesIsMPEGAudioPacket(const uchar *p)
+{
+  return (((p)[3] & ~AUDIO_STREAM_MASK) == AUDIO_STREAM);
+}
+
+inline bool PesIsPS1Packet(const uchar *p)
+{
+  return ((p)[3] == PRIVATE_STREAM1 || (p)[3] == PRIVATE_STREAM3 );
+}
+
+inline bool PesIsPaddingPacket(const uchar *p)
+{
+  return ((p)[3] == PADDING_STREAM);
+}
+
+inline bool PesIsAudioPacket(const uchar *p)
+{
+  return (PesIsMPEGAudioPacket(p) || PesIsPS1Packet(p));
+}
+
+#if APIVERSNUM < 10701
+
+#define TS_ERROR              0x80
+#define TS_PAYLOAD_START      0x40
+#define TS_TRANSPORT_PRIORITY 0x20
+#define TS_PID_MASK_HI        0x1F
+#define TS_SCRAMBLING_CONTROL 0xC0
+#define TS_ADAPT_FIELD_EXISTS 0x20
+#define TS_PAYLOAD_EXISTS     0x10
+#define TS_CONT_CNT_MASK      0x0F
+#define TS_ADAPT_DISCONT      0x80
+#define TS_ADAPT_RANDOM_ACC   0x40 // would be perfect for detecting independent frames, but unfortunately not used by all broadcasters
+#define TS_ADAPT_ELEM_PRIO    0x20
+#define TS_ADAPT_PCR          0x10
+#define TS_ADAPT_OPCR         0x08
+#define TS_ADAPT_SPLICING     0x04
+#define TS_ADAPT_TP_PRIVATE   0x02
+#define TS_ADAPT_EXTENSION    0x01
+
+inline bool TsHasPayload(const uchar *p)
+{
+  return p[3] & TS_PAYLOAD_EXISTS;
+}
+
+inline bool TsHasAdaptationField(const uchar *p)
+{
+  return p[3] & TS_ADAPT_FIELD_EXISTS;
+}
+
+inline bool TsPayloadStart(const uchar *p)
+{
+  return p[1] & TS_PAYLOAD_START;
+}
+
+inline bool TsError(const uchar *p)
+{
+  return p[1] & TS_ERROR;
+}
+
+inline int TsPid(const uchar *p)
+{
+  return (p[1] & TS_PID_MASK_HI) * 256 + p[2];
+}
+
+inline bool TsIsScrambled(const uchar *p)
+{
+  return p[3] & TS_SCRAMBLING_CONTROL;
+}
+
+inline int TsPayloadOffset(const uchar *p)
+{
+  return (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
+}
+
+inline int TsGetPayload(const uchar **p)
+{
+  int o = TsPayloadOffset(*p);
+  *p += o;
+  return TS_SIZE - o;
+}
+
+inline int TsContinuityCounter(const uchar *p)
+{
+  return p[3] & TS_CONT_CNT_MASK;
+}
+
+inline int TsGetAdaptationField(const uchar *p)
+{
+  return TsHasAdaptationField(p) ? p[5] : 0x00;
+}
+#endif
+
+enum eStreamContent
+{
+  scVIDEO,
+  scAUDIO,
+  scSUBTITLE,
+  scTELETEXT,
+  scPROGRAMM
+};
+
+enum eStreamType
+{
+  stNone,
+  stAC3,
+  stMPEG2AUDIO,
+  stEAC3,
+  stAACADTS,
+  stAACLATM,
+  stDTS,
+  stMPEG2VIDEO,
+  stH264,
+  stDVBSUB,
+  stTEXTSUB,
+  stTELETEXT,
+};
+
+#define PKT_I_FRAME 1
+#define PKT_P_FRAME 2
+#define PKT_B_FRAME 3
+#define PKT_NTYPES  4
+struct sStreamPacket
+{
+  int64_t   id;
+  int64_t   dts;
+  int64_t   pts;
+  int       duration;
+
+  uint8_t   commercial;
+  uint8_t   componentindex;
+
+  uint8_t  *data;
+  int       size;
+  bool      streamChange;
+  bool      pmtChange;
+};
+
+class cTSStream;
+
+class cParser
+{
+public:
+  cParser(int pID, cTSStream *stream);
+  virtual ~cParser();
+
+  bool AddPESPacket(uint8_t *data, int size);
+  virtual void Parse(sStreamPacket *pkt) = 0;
+  void ClearFrame() {m_PesBufferPtr = 0;}
+  int ParsePacketHeader(uint8_t *data);
+  int ParsePESHeader(uint8_t *buf, size_t len);
+  virtual void Reset();
+  bool IsVideo() {return m_IsVideo; }
+
+protected:
+  virtual bool IsValidStartCode(uint8_t *buf, int size);
+
+  int         m_PesPacketLength;
+  uint8_t    *m_PesBuffer;
+  int         m_PesBufferSize;
+  int         m_PesBufferPtr;
+  size_t      m_PesBufferInitialSize;
+  size_t      m_PesParserPtr;
+  size_t      m_PesNextFramePtr;
+
+  bool        m_FoundFrame;
+
+  int         m_pID;
+  int64_t     m_curPTS;
+  int64_t     m_curDTS;
+  int64_t     m_prevDTS;
+
+  bool        m_IsPusi;
+  bool        m_firstPUSIseen;
+  bool        m_IsError;
+
+  cTSStream  *m_Stream;
+  bool        m_IsVideo;
+};
+
+
+class cTSStream
+{
+private:
+  eStreamType           m_streamType;
+  const int             m_pID;
+  eStreamContent        m_streamContent;
+  bool                  m_IsStreamChange;
+
+  bool                  m_pesError;
+  cParser              *m_pesParser;
+
+  char                  m_language[4];  // ISO 639 3-letter language code (empty string if undefined)
+
+  int                   m_FpsScale;     // scale of 1000 and a rate of 29970 will result in 29.97 fps
+  int                   m_FpsRate;
+  int                   m_Height;       // height of the stream reported by the demuxer
+  int                   m_Width;        // width of the stream reported by the demuxer
+  float                 m_Aspect;       // display aspect of stream
+
+  int                   m_Channels;
+  int                   m_SampleRate;
+  int                   m_BitRate;
+  int                   m_BitsPerSample;
+  int                   m_BlockAlign;
+
+  unsigned char         m_subtitlingType;
+  uint16_t              m_compositionPageId;
+  uint16_t              m_ancillaryPageId;
+
+public:
+  cTSStream(eStreamType type, int pid);
+  virtual ~cTSStream();
+
+  bool ProcessTSPacket(uint8_t *data, sStreamPacket *pkt, bool iframe);
+
+  void SetLanguage(const char *language);
+  const char *GetLanguage() { return m_language; }
+  const eStreamContent Content() const { return m_streamContent; }
+  const eStreamType Type() const { return m_streamType; }
+  const int GetPID() const { return m_pID; }
+
+  /* Video Stream Information */
+  bool SetVideoInformation(int FpsScale, int FpsRate, int Height, int Width, float Aspect);
+  void GetVideoInformation(uint32_t &FpsScale, uint32_t &FpsRate, uint32_t &Height, uint32_t &Width, double &Aspect);
+
+  /* Audio Stream Information */
+  bool SetAudioInformation(int Channels, int SampleRate, int BitRate, int BitsPerSample, int BlockAlign);
+  void GetAudioInformation(uint32_t &Channels, uint32_t &SampleRate, uint32_t &BitRate, uint32_t &BitsPerSample, uint32_t &BlockAlign);
+
+  /* Subtitle related stream information */
+  void SetSubtitlingDescriptor(unsigned char SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
+  unsigned char SubtitlingType() const { return m_subtitlingType; }
+  uint16_t CompositionPageId() const { return m_compositionPageId; }
+  uint16_t AncillaryPageId() const { return m_ancillaryPageId; }
+
+  int64_t Rescale(int64_t a);
+};
+
+#endif // VNSI_DEMUXER_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,269 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+
+#include "parser_AAC.h"
+
+static int aac_sample_rates[16] =
+{
+  96000, 88200, 64000, 48000, 44100, 32000,
+  24000, 22050, 16000, 12000, 11025, 8000, 7350
+};
+
+
+cParserAAC::cParserAAC(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_firstPUSIseen             = false;
+  m_Configured                = false;
+  m_FrameLengthType           = 0;
+  m_PTS                       = 0;
+  m_DTS                       = 0;
+  m_FrameSize                 = 0;
+  m_SampleRate                = 0;
+  m_Channels                  = 0;
+  m_BitRate                   = 0;
+  m_PesBufferInitialSize      = 1920*2;
+}
+
+cParserAAC::~cParserAAC()
+{
+
+}
+
+void cParserAAC::Parse(sStreamPacket *pkt)
+{
+  int p = m_PesParserPtr;
+  int l;
+  while ((l = m_PesBufferPtr - p) > 8)
+  {
+    if (FindHeaders(m_PesBuffer + p, l) < 0)
+      break;
+    p++;
+  }
+  m_PesParserPtr = p;
+
+  if (m_FoundFrame && l >= m_FrameSize)
+  {
+    bool streamChange = m_Stream->SetAudioInformation(m_Channels, m_SampleRate, m_BitRate, 0, 0);
+    pkt->id       = m_pID;
+    pkt->data     = &m_PesBuffer[p];
+    pkt->size     = m_FrameSize;
+    pkt->duration = 1024 * 90000 / m_SampleRate;
+    pkt->dts      = m_DTS;
+    pkt->pts      = m_PTS;
+    pkt->streamChange = streamChange;
+
+    m_PesNextFramePtr = p + m_FrameSize;
+    m_PesParserPtr = 0;
+    m_FoundFrame = false;
+  }
+}
+
+int cParserAAC::FindHeaders(uint8_t *buf, int buf_size)
+{
+  if (m_FoundFrame)
+    return -1;
+
+  uint8_t *buf_ptr = buf;
+
+  if (m_Stream->Type() == stAACLATM)
+  {
+    if ((buf_ptr[0] == 0x56 && (buf_ptr[1] & 0xE0) == 0xE0))
+    {
+      // TODO
+      if (buf_size < 16)
+        return -1;
+
+      cBitstream bs(buf_ptr, 16 * 8);
+      bs.skipBits(11);
+      m_FrameSize = bs.readBits(13) + 3;
+      if (!ParseLATMAudioMuxElement(&bs))
+        return 0;
+
+      m_FoundFrame = true;
+      m_DTS = m_curPTS;
+      m_PTS = m_curPTS;
+      m_curPTS += 90000 * 1024 / m_SampleRate;
+      return -1;
+    }
+  }
+  else if (m_Stream->Type() == stAACADTS)
+  {
+    if(buf_ptr[0] == 0xFF && (buf_ptr[1] & 0xF0) == 0xF0)
+    {
+      // need at least 7 bytes for header
+      if (buf_size < 7)
+        return -1;
+
+      cBitstream bs(buf_ptr, 9 * 8);
+      bs.skipBits(15);
+
+      // check if CRC is present, means header is 9 byte long
+      int noCrc = bs.readBits(1);
+      if (!noCrc && (buf_size < 9))
+        return -1;
+
+      bs.skipBits(2); // profile
+      int SampleRateIndex = bs.readBits(4);
+      bs.skipBits(1); // private
+      m_Channels = bs.readBits(3);
+      bs.skipBits(4);
+
+      m_FrameSize = bs.readBits(13);
+      m_SampleRate    = aac_sample_rates[SampleRateIndex & 0x0E];
+
+      m_FoundFrame = true;
+      m_DTS = m_curPTS;
+      m_PTS = m_curPTS;
+      m_curPTS += 90000 * 1024 / m_SampleRate;
+      return -1;
+    }
+  }
+  return 0;
+}
+
+bool cParserAAC::ParseLATMAudioMuxElement(cBitstream *bs)
+{
+  if (!bs->readBits1())
+    ReadStreamMuxConfig(bs);
+
+  if (!m_Configured)
+    return false;
+
+  return true;
+}
+
+void cParserAAC::ReadStreamMuxConfig(cBitstream *bs)
+{
+  int AudioMuxVersion = bs->readBits(1);
+  m_AudioMuxVersion_A = 0;
+  if (AudioMuxVersion)                       // audioMuxVersion
+    m_AudioMuxVersion_A = bs->readBits(1);
+
+  if(m_AudioMuxVersion_A)
+    return;
+
+  if (AudioMuxVersion)
+    LATMGetValue(bs);                      // taraFullness
+
+  bs->skipBits(1);                         // allStreamSameTimeFraming = 1
+  bs->skipBits(6);                         // numSubFrames = 0
+  bs->skipBits(4);                         // numPrograms = 0
+
+  // for each program (which there is only on in DVB)
+  bs->skipBits(3);                         // numLayer = 0
+
+  // for each layer (which there is only on in DVB)
+  if (!AudioMuxVersion)
+    ReadAudioSpecificConfig(bs);
+  else
+    return;
+
+  // these are not needed... perhaps
+  m_FrameLengthType = bs->readBits(3);
+  switch (m_FrameLengthType)
+  {
+    case 0:
+      bs->readBits(8);
+      break;
+    case 1:
+      bs->readBits(9);
+      break;
+    case 3:
+    case 4:
+    case 5:
+      bs->readBits(6);                 // celp_table_index
+      break;
+    case 6:
+    case 7:
+      bs->readBits(1);                 // hvxc_table_index
+      break;
+  }
+
+  if (bs->readBits(1))
+  {                   // other data?
+    if (AudioMuxVersion == 1)
+    {
+      LATMGetValue(bs);              // other_data_bits
+    }
+    else
+    {
+      int esc;
+      do
+      {
+        esc = bs->readBits(1);
+        bs->skipBits(8);
+      } while (esc);
+    }
+  }
+
+  if (bs->readBits(1))                   // crc present?
+    bs->skipBits(8);                     // config_crc
+  m_Configured = true;
+}
+
+void cParserAAC::ReadAudioSpecificConfig(cBitstream *bs)
+{
+  int aot = bs->readBits(5);
+  if (aot == 31)
+    aot = 32 + bs->readBits(6);
+
+  int SampleRateIndex = bs->readBits(4);
+
+  if (SampleRateIndex == 0xf)
+    m_SampleRate = bs->readBits(24);
+  else
+    m_SampleRate = aac_sample_rates[SampleRateIndex & 0xf];
+
+  m_Channels = bs->readBits(4);
+
+  if (aot == 5) { // AOT_SBR
+    if (bs->readBits(4) == 0xf) { // extensionSamplingFrequencyIndex
+      bs->skipBits(24);
+    }
+    aot = bs->readBits(5); // this is the main object type (i.e. non-extended)
+    if (aot == 31)
+      aot = 32 + bs->readBits(6);
+  }
+
+  if(aot != 2)
+    return;
+
+  bs->skipBits(1);      //framelen_flag
+  if (bs->readBits1())  // depends_on_coder
+    bs->skipBits(14);
+
+  if (bs->readBits(1))  // ext_flag
+    bs->skipBits(1);    // ext3_flag
+}
+
+void cParserAAC::Reset()
+{
+  cParser::Reset();
+  m_Configured = false;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AAC.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_AAC_H
+#define VNSI_DEMUXER_AAC_H
+
+#include "parser.h"
+#include "bitstream.h"
+
+// --- cParserAAC -------------------------------------------------
+
+class cParserAAC : public cParser
+{
+private:
+  int         m_SampleRate;
+  int         m_Channels;
+  int         m_BitRate;
+  int         m_FrameSize;
+
+  int64_t     m_PTS;                /* pts of the current frame */
+  int64_t     m_DTS;                /* dts of the current frame */
+
+  bool        m_Configured;
+  int         m_AudioMuxVersion_A;
+  int         m_FrameLengthType;
+
+  int FindHeaders(uint8_t *buf, int buf_size);
+  bool ParseLATMAudioMuxElement(cBitstream *bs);
+  void ReadStreamMuxConfig(cBitstream *bs);
+  void ReadAudioSpecificConfig(cBitstream *bs);
+  uint32_t LATMGetValue(cBitstream *bs) { return bs->readBits(bs->readBits(2) * 8); }
+
+public:
+  cParserAAC(int pID, cTSStream *stream);
+  virtual ~cParserAAC();
+  virtual void Parse(sStreamPacket *pkt);
+  virtual void Reset();
+};
+
+#endif // VNSI_DEMUXER_AAC_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,254 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+
+#include "parser_AC3.h"
+#include "bitstream.h"
+
+#define AC3_HEADER_SIZE 7
+
+/** Channel mode (audio coding mode) */
+typedef enum
+{
+  AC3_CHMODE_DUALMONO = 0,
+  AC3_CHMODE_MONO,
+  AC3_CHMODE_STEREO,
+  AC3_CHMODE_3F,
+  AC3_CHMODE_2F1R,
+  AC3_CHMODE_3F1R,
+  AC3_CHMODE_2F2R,
+  AC3_CHMODE_3F2R
+} AC3ChannelMode;
+
+/* possible frequencies */
+const uint16_t AC3SampleRateTable[3] = { 48000, 44100, 32000 };
+
+/* possible bitrates */
+const uint16_t AC3BitrateTable[19] = {
+    32, 40, 48, 56, 64, 80, 96, 112, 128,
+    160, 192, 224, 256, 320, 384, 448, 512, 576, 640
+};
+
+const uint8_t AC3ChannelsTable[8] = {
+    2, 1, 2, 3, 3, 4, 4, 5
+};
+
+const uint16_t AC3FrameSizeTable[38][3] = {
+    { 64,   69,   96   },
+    { 64,   70,   96   },
+    { 80,   87,   120  },
+    { 80,   88,   120  },
+    { 96,   104,  144  },
+    { 96,   105,  144  },
+    { 112,  121,  168  },
+    { 112,  122,  168  },
+    { 128,  139,  192  },
+    { 128,  140,  192  },
+    { 160,  174,  240  },
+    { 160,  175,  240  },
+    { 192,  208,  288  },
+    { 192,  209,  288  },
+    { 224,  243,  336  },
+    { 224,  244,  336  },
+    { 256,  278,  384  },
+    { 256,  279,  384  },
+    { 320,  348,  480  },
+    { 320,  349,  480  },
+    { 384,  417,  576  },
+    { 384,  418,  576  },
+    { 448,  487,  672  },
+    { 448,  488,  672  },
+    { 512,  557,  768  },
+    { 512,  558,  768  },
+    { 640,  696,  960  },
+    { 640,  697,  960  },
+    { 768,  835,  1152 },
+    { 768,  836,  1152 },
+    { 896,  975,  1344 },
+    { 896,  976,  1344 },
+    { 1024, 1114, 1536 },
+    { 1024, 1115, 1536 },
+    { 1152, 1253, 1728 },
+    { 1152, 1254, 1728 },
+    { 1280, 1393, 1920 },
+    { 1280, 1394, 1920 },
+};
+
+const uint8_t EAC3Blocks[4] = {
+  1, 2, 3, 6
+};
+
+typedef enum {
+  EAC3_FRAME_TYPE_INDEPENDENT = 0,
+  EAC3_FRAME_TYPE_DEPENDENT,
+  EAC3_FRAME_TYPE_AC3_CONVERT,
+  EAC3_FRAME_TYPE_RESERVED
+} EAC3FrameType;
+
+cParserAC3::cParserAC3(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_PTS                       = 0;
+  m_DTS                       = 0;
+  m_FrameSize                 = 0;
+  m_SampleRate                = 0;
+  m_Channels                  = 0;
+  m_BitRate                   = 0;
+  m_PesBufferInitialSize      = 1920*2;
+}
+
+cParserAC3::~cParserAC3()
+{
+}
+
+void cParserAC3::Parse(sStreamPacket *pkt)
+{
+  int p = m_PesParserPtr;
+  int l;
+  while ((l = m_PesBufferPtr - p) > 8)
+  {
+    if (FindHeaders(m_PesBuffer + p, l) < 0)
+      break;
+    p++;
+  }
+  m_PesParserPtr = p;
+
+  if (m_FoundFrame && l >= m_FrameSize)
+  {
+    bool streamChange = m_Stream->SetAudioInformation(m_Channels, m_SampleRate, m_BitRate, 0, 0);
+    pkt->id       = m_pID;
+    pkt->data     = &m_PesBuffer[p];
+    pkt->size     = m_FrameSize;
+    pkt->duration = 90000 * 1536 / m_SampleRate;
+    pkt->dts      = m_DTS;
+    pkt->pts      = m_PTS;
+    pkt->streamChange = streamChange;
+
+    m_PesNextFramePtr = p + m_FrameSize;
+    m_PesParserPtr = 0;
+    m_FoundFrame = false;
+  }
+}
+
+int cParserAC3::FindHeaders(uint8_t *buf, int buf_size)
+{
+  if (m_FoundFrame)
+    return -1;
+
+  if (buf_size < 9)
+    return -1;
+
+  uint8_t *buf_ptr = buf;
+
+  if ((buf_ptr[0] == 0x0b && buf_ptr[1] == 0x77))
+  {
+    cBitstream bs(buf_ptr + 2, AC3_HEADER_SIZE * 8);
+
+    // read ahead to bsid to distinguish between AC-3 and E-AC-3
+    int bsid = bs.showBits(29) & 0x1F;
+    if (bsid > 16)
+      return 0;
+
+    if (bsid <= 10)
+    {
+      // Normal AC-3
+      bs.skipBits(16);
+      int fscod       = bs.readBits(2);
+      int frmsizecod  = bs.readBits(6);
+      bs.skipBits(5); // skip bsid, already got it
+      bs.skipBits(3); // skip bitstream mode
+      int acmod       = bs.readBits(3);
+
+      if (fscod == 3 || frmsizecod > 37)
+        return 0;
+
+      if (acmod == AC3_CHMODE_STEREO)
+      {
+        bs.skipBits(2); // skip dsurmod
+      }
+      else
+      {
+        if ((acmod & 1) && acmod != AC3_CHMODE_MONO)
+          bs.skipBits(2);
+        if (acmod & 4)
+          bs.skipBits(2);
+      }
+      int lfeon = bs.readBits(1);
+
+      int srShift   = max(bsid, 8) - 8;
+      m_SampleRate  = AC3SampleRateTable[fscod] >> srShift;
+      m_BitRate     = (AC3BitrateTable[frmsizecod>>1] * 1000) >> srShift;
+      m_Channels    = AC3ChannelsTable[acmod] + lfeon;
+      m_FrameSize   = AC3FrameSizeTable[frmsizecod][fscod] * 2;
+    }
+    else
+    {
+      // Enhanced AC-3
+      int frametype = bs.readBits(2);
+      if (frametype == EAC3_FRAME_TYPE_RESERVED)
+        return 0;
+
+       bs.readBits(3); // int substreamid
+
+      m_FrameSize = (bs.readBits(11) + 1) << 1;
+      if (m_FrameSize < AC3_HEADER_SIZE)
+        return 0;
+
+      int numBlocks = 6;
+      int sr_code = bs.readBits(2);
+      if (sr_code == 3)
+      {
+        int sr_code2 = bs.readBits(2);
+        if (sr_code2 == 3)
+          return 0;
+        m_SampleRate = AC3SampleRateTable[sr_code2] / 2;
+      }
+      else
+      {
+        numBlocks = EAC3Blocks[bs.readBits(2)];
+        m_SampleRate = AC3SampleRateTable[sr_code];
+      }
+
+      int channelMode = bs.readBits(3);
+      int lfeon = bs.readBits(1);
+
+      m_BitRate  = (uint32_t)(8.0 * m_FrameSize * m_SampleRate / (numBlocks * 256.0));
+      m_Channels = AC3ChannelsTable[channelMode] + lfeon;
+    }
+    m_FoundFrame = true;
+    m_DTS = m_curPTS;
+    m_PTS = m_curPTS;
+    m_curPTS += 90000 * 1536 / m_SampleRate;
+    return -1;
+  }
+  return 0;
+}
+
+void cParserAC3::Reset()
+{
+  cParser::Reset();
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_AC3.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_AC3_H
+#define VNSI_DEMUXER_AC3_H
+
+#include "parser.h"
+
+// --- cParserAC3 -------------------------------------------------
+
+class cParserAC3 : public cParser
+{
+private:
+  int         m_SampleRate;
+  int         m_Channels;
+  int         m_BitRate;
+  int         m_FrameSize;
+
+  int64_t     m_PTS;                /* pts of the current frame */
+  int64_t     m_DTS;                /* dts of the current frame */
+
+  int FindHeaders(uint8_t *buf, int buf_size);
+
+public:
+  cParserAC3(int pID, cTSStream *stream);
+  virtual ~cParserAC3();
+
+  virtual void Parse(sStreamPacket *pkt);
+  virtual void Reset();
+};
+
+
+#endif // VNSI_DEMUXER_AC3_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+
+#include "parser_DTS.h"
+#include "bitstream.h"
+
+cParserDTS::cParserDTS(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+}
+
+cParserDTS::~cParserDTS()
+{
+}
+
+void cParserDTS::Parse(sStreamPacket *pkt)
+{
+
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_DTS.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_DTS_H
+#define VNSI_DEMUXER_DTS_H
+
+#include "parser.h"
+
+// --- cParserDTS -------------------------------------------------
+
+class cParserDTS : public cParser
+{
+private:
+
+public:
+  cParserDTS(int pID, cTSStream *stream);
+  virtual ~cParserDTS();
+
+  virtual void Parse(sStreamPacket *pkt);
+};
+
+
+#endif // VNSI_DEMUXER_DTS_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,149 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+
+#include "parser_MPEGAudio.h"
+#include "bitstream.h"
+
+const uint16_t FrequencyTable[3] = { 44100, 48000, 32000 };
+const uint16_t BitrateTable[2][3][15] =
+{
+  {
+    {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448 },
+    {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384 },
+    {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320 }
+  },
+  {
+    {0, 32, 48, 56, 64,  80,  96,  112, 128, 144, 160, 176, 192, 224, 256},
+    {0, 8,  16, 24, 32,  40,  48,  56,  64,  80,  96,  112, 128, 144, 160},
+    {0, 8,  16, 24, 32,  40,  48,  56,  64,  80,  96,  112, 128, 144, 160}
+  }
+};
+
+cParserMPEG2Audio::cParserMPEG2Audio(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_PTS                       = 0;
+  m_DTS                       = 0;
+  m_FrameSize                 = 0;
+  m_SampleRate                = 0;
+  m_Channels                  = 0;
+  m_BitRate                   = 0;
+  m_PesBufferInitialSize      = 2048;
+}
+
+cParserMPEG2Audio::~cParserMPEG2Audio()
+{
+}
+
+void cParserMPEG2Audio::Parse(sStreamPacket *pkt)
+{
+  int p = m_PesParserPtr;
+  int l;
+  while ((l = m_PesBufferPtr - p) > 3)
+  {
+    if (FindHeaders(m_PesBuffer + p, l) < 0)
+      break;
+    p++;
+  }
+  m_PesParserPtr = p;
+
+  if (m_FoundFrame && l >= m_FrameSize)
+  {
+    bool streamChange = m_Stream->SetAudioInformation(m_Channels, m_SampleRate, m_BitRate, 0, 0);
+    pkt->id       = m_pID;
+    pkt->data     = &m_PesBuffer[p];
+    pkt->size     = m_FrameSize;
+    pkt->duration = 90000 * 1152 / m_SampleRate;
+    pkt->dts      = m_DTS;
+    pkt->pts      = m_PTS;
+    pkt->streamChange = streamChange;
+
+    m_PesNextFramePtr = p + m_FrameSize;
+    m_PesParserPtr = 0;
+    m_FoundFrame = false;
+  }
+}
+
+int cParserMPEG2Audio::FindHeaders(uint8_t *buf, int buf_size)
+{
+  if (m_FoundFrame)
+    return -1;
+
+  if (buf_size < 4)
+    return -1;
+
+  uint8_t *buf_ptr = buf;
+
+  if ((buf_ptr[0] == 0xFF && (buf_ptr[1] & 0xE0) == 0xE0))
+  {
+    cBitstream bs(buf_ptr, 4 * 8);
+    bs.skipBits(11); // syncword
+
+    int audioVersion = bs.readBits(2);
+    if (audioVersion == 1)
+      return 0;
+    int mpeg2 = !(audioVersion & 1);
+    int mpeg25 = !(audioVersion & 3);
+
+    int layer = bs.readBits(2);
+    if (layer == 0)
+      return 0;
+
+    bs.skipBits(1); // protetion bit
+    int bitrate_index = bs.readBits(4);
+    if (bitrate_index == 15 || bitrate_index == 0)
+      return 0;
+    m_BitRate  = BitrateTable[mpeg2][layer - 1][bitrate_index] * 1000;
+
+    int sample_rate_index = bs.readBits(2);
+    if (sample_rate_index == 3)
+      return 0;
+    m_SampleRate = FrequencyTable[sample_rate_index] >> (mpeg2 + mpeg25);
+
+    int padding = bs.readBits1();
+    bs.skipBits(1); // private bit
+    int channel_mode = bs.readBits(2);
+
+    if (channel_mode == 11)
+      m_Channels = 1;
+    else
+      m_Channels = 2;
+
+    if (layer == 1)
+      m_FrameSize = (12 * m_BitRate / m_SampleRate + padding) * 4;
+    else
+      m_FrameSize = 144 * m_BitRate / m_SampleRate + padding;
+
+    m_FoundFrame = true;
+    m_DTS = m_curPTS;
+    m_PTS = m_curPTS;
+    m_curPTS += 90000 * 1152 / m_SampleRate;
+    return -1;
+  }
+  return 0;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGAudio.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_MPEGAUDIO_H
+#define VNSI_DEMUXER_MPEGAUDIO_H
+
+#include "parser.h"
+
+// --- cParserMPEG2Audio -------------------------------------------------
+
+class cParserMPEG2Audio : public cParser
+{
+private:
+  int         m_SampleRate;
+  int         m_Channels;
+  int         m_BitRate;
+  int         m_FrameSize;
+
+  int64_t     m_PTS;
+  int64_t     m_DTS;
+
+  int FindHeaders(uint8_t *buf, int buf_size);
+
+public:
+  cParserMPEG2Audio(int pID, cTSStream *stream);
+  virtual ~cParserMPEG2Audio();
+
+  virtual void Parse(sStreamPacket *pkt);
+};
+
+
+#endif // VNSI_DEMUXER_MPEGAUDIO_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,256 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+#include "bitstream.h"
+
+#include "parser_MPEGVideo.h"
+
+using namespace std;
+
+#define MPEG_PICTURE_START      0x00000100
+#define MPEG_SEQUENCE_START     0x000001b3
+#define MPEG_SEQUENCE_EXTENSION 0x000001b5
+#define MPEG_SLICE_S            0x00000101
+#define MPEG_SLICE_E            0x000001af
+
+/**
+ * MPEG2VIDEO frame duration table (in 90kHz clock domain)
+ */
+const unsigned int mpeg2video_framedurations[16] = {
+  0,
+  3753,
+  3750,
+  3600,
+  3003,
+  3000,
+  1800,
+  1501,
+  1500,
+};
+
+cParserMPEG2Video::cParserMPEG2Video(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_FrameDuration     = 0;
+  m_vbvDelay          = -1;
+  m_vbvSize           = 0;
+  m_Height            = 0;
+  m_Width             = 0;
+  m_Dar               = 0.0;
+  m_PesBufferInitialSize  = 80000;
+  m_IsVideo = true;
+  Reset();
+}
+
+cParserMPEG2Video::~cParserMPEG2Video()
+{
+}
+
+void cParserMPEG2Video::Parse(sStreamPacket *pkt)
+{
+  if (m_PesBufferPtr < 4)
+    return;
+
+  int p = m_PesParserPtr;
+  uint32_t startcode = m_StartCode;
+  bool frameComplete = false;
+  int l;
+  while ((l = m_PesBufferPtr - p) > 3)
+  {
+    if ((startcode & 0xffffff00) == 0x00000100)
+    {
+      if (Parse_MPEG2Video(startcode, p, frameComplete) < 0)
+      {
+        break;
+      }
+    }
+    startcode = startcode << 8 | m_PesBuffer[p++];
+  }
+  m_PesParserPtr = p;
+  m_StartCode = startcode;
+
+  if (frameComplete)
+  {
+    if (!m_NeedSPS && !m_NeedIFrame)
+    {
+      int fpsScale = m_Stream->Rescale(m_FrameDuration);
+      bool streamChange = m_Stream->SetVideoInformation(fpsScale,DVD_TIME_BASE, m_Height, m_Width, m_Dar);
+
+      pkt->id       = m_pID;
+      pkt->size     = m_PesNextFramePtr;
+      pkt->data     = m_PesBuffer;
+      pkt->dts      = m_DTS;
+      pkt->pts      = m_PTS;
+      pkt->duration = m_curDTS - m_prevDTS;
+      pkt->streamChange = streamChange;
+    }
+    m_StartCode = 0xffffffff;
+    m_PesParserPtr = 0;
+    m_FoundFrame = false;
+    m_PTS = m_curPTS;
+    m_DTS = m_curDTS;
+  }
+}
+
+void cParserMPEG2Video::Reset()
+{
+  cParser::Reset();
+  m_StartCode = 0xffffffff;
+  m_NeedIFrame = true;
+  m_NeedSPS = true;
+  m_DTS = DVD_NOPTS_VALUE;
+}
+
+int cParserMPEG2Video::Parse_MPEG2Video(uint32_t startcode, int buf_ptr, bool &complete)
+{
+  int len = m_PesBufferPtr - buf_ptr;
+  uint8_t *buf = m_PesBuffer + buf_ptr;
+
+  switch (startcode & 0xFF)
+  {
+  case 0: // picture start
+  {
+    if (m_NeedSPS)
+    {
+      m_FoundFrame = true;
+      return 0;
+    }
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    if (len < 4)
+      return -1;
+    if (!Parse_MPEG2Video_PicStart(buf))
+      return 0;
+
+    // if this is the first frame we see, set timestamp
+    if (m_DTS == DVD_NOPTS_VALUE)
+    {
+      m_PTS = m_curPTS;
+      m_DTS = m_curDTS;
+    }
+    m_FoundFrame = true;
+    break;
+  }
+
+  case 0xb3: // Sequence start code
+  {
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    if (len < 8)
+      return -1;
+    if (!Parse_MPEG2Video_SeqStart(buf))
+      return 0;
+
+    break;
+  }
+
+  case 0xb7: // sequence end
+  {
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr;
+      return -1;
+    }
+    break;
+  }
+
+  default:
+    break;
+  }
+
+  return 0;
+}
+
+bool cParserMPEG2Video::Parse_MPEG2Video_SeqStart(uint8_t *buf)
+{
+  cBitstream bs(buf, 8 * 8);
+
+  m_Width         = bs.readBits(12);
+  m_Height        = bs.readBits(12);
+
+  // figure out Display Aspect Ratio
+  uint8_t aspect = bs.readBits(4);
+
+  switch(aspect)
+  {
+    case 1:
+      m_Dar = 1.0;
+      break;
+    case 2:
+      m_Dar = 4.0/3.0;
+      break;
+    case 3:
+      m_Dar = 16.0/9.0;
+      break;
+    case 4:
+      m_Dar = 2.21;
+      break;
+    default:
+      ERRORLOG("invalid / forbidden DAR in sequence header !");
+      return false;
+  }
+
+  m_FrameDuration = mpeg2video_framedurations[bs.readBits(4)];
+  bs.skipBits(18);
+  bs.skipBits(1);
+
+  m_vbvSize = bs.readBits(10) * 16 * 1024 / 8;
+  m_NeedSPS = false;
+
+  return true;
+}
+
+bool cParserMPEG2Video::Parse_MPEG2Video_PicStart(uint8_t *buf)
+{
+  cBitstream bs(buf, 4 * 8);
+
+  bs.skipBits(10); /* temporal reference */
+
+  int pct = bs.readBits(3);
+  if (pct < PKT_I_FRAME || pct > PKT_B_FRAME)
+    return true; /* Illegal picture_coding_type */
+
+  if (pct == PKT_I_FRAME)
+    m_NeedIFrame = false;
+
+  int vbvDelay = bs.readBits(16); /* vbv_delay */
+  if (vbvDelay  == 0xffff)
+    m_vbvDelay = -1;
+  else
+    m_vbvDelay = vbvDelay;
+
+  return true;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_MPEGVIDEO_H
+#define VNSI_DEMUXER_MPEGVIDEO_H
+
+#include <deque>
+#include "parser.h"
+
+class cBitstream;
+
+// --- cParserMPEG2Video -------------------------------------------------
+
+class cParserMPEG2Video : public cParser
+{
+private:
+  uint32_t        m_StartCode;
+  bool            m_NeedIFrame;
+  bool            m_NeedSPS;
+  int             m_FrameDuration;
+  int             m_vbvDelay;       /* -1 if CBR */
+  int             m_vbvSize;        /* Video buffer size (in bytes) */
+  int             m_Width;
+  int             m_Height;
+  float           m_Dar;
+  int64_t         m_DTS;
+  int64_t         m_PTS;
+
+  int Parse_MPEG2Video(uint32_t startcode, int buf_ptr, bool &complete);
+  bool Parse_MPEG2Video_SeqStart(uint8_t *buf);
+  bool Parse_MPEG2Video_PicStart(uint8_t *buf);
+
+public:
+  cParserMPEG2Video(int pID, cTSStream *stream);
+  virtual ~cParserMPEG2Video();
+
+  virtual void Parse(sStreamPacket *pkt);
+  virtual void Reset();
+};
+
+#endif // VNSI_DEMUXER_MPEGVIDEO_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+
+#include "parser_Subtitle.h"
+
+cParserSubtitle::cParserSubtitle(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_PesBufferInitialSize = 4000;
+}
+
+cParserSubtitle::~cParserSubtitle()
+{
+
+}
+
+void cParserSubtitle::Parse(sStreamPacket *pkt)
+{
+  int l = m_PesBufferPtr;
+
+  if (l >= m_PesPacketLength)
+  {
+    if (l < 2 || m_PesBuffer[0] != 0x20 || m_PesBuffer[1] != 0x00)
+    {
+      Reset();
+      return;
+    }
+
+    if(m_PesBuffer[m_PesPacketLength-1] == 0xff)
+    {
+      pkt->id       = m_pID;
+      pkt->data     = m_PesBuffer+2;
+      pkt->size     = m_PesPacketLength-2;
+      pkt->duration = 0;
+      pkt->dts      = m_curDTS;
+      pkt->pts      = m_curPTS;
+    }
+
+    m_PesBufferPtr = 0;
+  }
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Subtitle.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_SUBTITLE_H
+#define VNSI_DEMUXER_SUBTITLE_H
+
+#include "parser.h"
+
+// --- cParserSubtitle -------------------------------------------------
+
+class cParserSubtitle : public cParser
+{
+public:
+  cParserSubtitle(int pID, cTSStream *stream);
+  virtual ~cParserSubtitle();
+
+  virtual void Parse(sStreamPacket *pkt);
+};
+
+
+#endif // VNSI_DEMUXER_SUBTITLE_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include "config.h"
+
+#include "parser_Teletext.h"
+
+cParserTeletext::cParserTeletext(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_PesBufferInitialSize      = 4000;
+}
+
+cParserTeletext::~cParserTeletext()
+{
+}
+
+void cParserTeletext::Parse(sStreamPacket *pkt)
+{
+  int l = m_PesBufferPtr;
+  if (l < 1)
+    return;
+
+  if (m_PesBuffer[0] < 0x10 || m_PesBuffer[0] > 0x1F)
+  {
+    Reset();
+    return;
+  }
+
+  if (l >= m_PesPacketLength)
+  {
+    pkt->id       = m_pID;
+    pkt->data     = m_PesBuffer;
+    pkt->size     = m_PesPacketLength;
+    pkt->duration = 0;
+    pkt->dts      = m_curDTS;
+    pkt->pts      = m_curPTS;
+
+    m_PesBufferPtr = 0;
+  }
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_Teletext.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_TELETEXT_H
+#define VNSI_DEMUXER_TELETEXT_H
+
+#include "parser.h"
+
+// --- cParserTeletext -------------------------------------------------
+
+class cParserTeletext : public cParser
+{
+private:
+  int64_t     m_lastDTS;
+  int64_t     m_lastPTS;
+
+public:
+  cParserTeletext(int pID, cTSStream *stream);
+  virtual ~cParserTeletext();
+
+  virtual void Parse(sStreamPacket *pkt);
+};
+
+#endif // VNSI_DEMUXER_TELETEXT_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,581 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+#include "bitstream.h"
+
+#include "parser_h264.h"
+
+static const int h264_lev2cpbsize[][2] =
+{
+  {10, 175},
+  {11, 500},
+  {12, 1000},
+  {13, 2000},
+  {20, 2000},
+  {21, 4000},
+  {22, 4000},
+  {30, 10000},
+  {31, 14000},
+  {32, 20000},
+  {40, 25000},
+  {41, 62500},
+  {42, 62500},
+  {50, 135000},
+  {51, 240000},
+  {-1, -1},
+};
+
+cParserH264::cParserH264(int pID, cTSStream *stream)
+ : cParser(pID, stream)
+{
+  m_Height            = 0;
+  m_Width             = 0;
+  m_FPS               = 25;
+  m_FpsScale          = 0;
+  m_FrameDuration     = 0;
+  m_vbvDelay          = -1;
+  m_vbvSize           = 0;
+  m_PixelAspect.den   = 1;
+  m_PixelAspect.num   = 0;
+  memset(&m_streamData, 0, sizeof(m_streamData));
+  m_PesBufferInitialSize      = 80000;
+
+  m_IsVideo = true;
+  Reset();
+}
+
+cParserH264::~cParserH264()
+{
+}
+
+void cParserH264::Parse(sStreamPacket *pkt)
+{
+  if (m_PesBufferPtr < 4)
+    return;
+
+  int p = m_PesParserPtr;
+  uint32_t startcode = m_StartCode;
+  bool frameComplete = false;
+  int l;
+  while ((l = m_PesBufferPtr - p) > 3)
+  {
+    if ((startcode & 0xffffff00) == 0x00000100)
+    {
+      if (Parse_H264(startcode, p, frameComplete) < 0)
+      {
+        break;
+      }
+    }
+    startcode = startcode << 8 | m_PesBuffer[p++];
+  }
+  m_PesParserPtr = p;
+  m_StartCode = startcode;
+
+  if (frameComplete)
+  {
+    if (!m_NeedSPS && !m_NeedIFrame)
+    {
+      double PAR = (double)m_PixelAspect.num/(double)m_PixelAspect.den;
+      double DAR = (PAR * m_Width) / m_Height;
+      DEBUGLOG("H.264 SPS: PAR %i:%i", m_PixelAspect.num, m_PixelAspect.den);
+      DEBUGLOG("H.264 SPS: DAR %.2f", DAR);
+//      int fpsScale = DVD_TIME_BASE / m_FPS;
+      if (m_FpsScale == 0)
+      {
+        m_FpsScale = m_Stream->Rescale(m_curDTS - m_prevDTS);
+      }
+      bool streamChange = m_Stream->SetVideoInformation(m_FpsScale,DVD_TIME_BASE, m_Height, m_Width, DAR);
+
+      pkt->id       = m_pID;
+      pkt->size     = m_PesNextFramePtr;
+      pkt->data     = m_PesBuffer;
+      pkt->dts      = m_DTS;
+      pkt->pts      = m_PTS;
+      pkt->duration = m_curDTS - m_prevDTS;
+      pkt->streamChange = streamChange;
+    }
+    m_StartCode = 0xffffffff;
+    m_PesParserPtr = 0;
+    m_FoundFrame = false;
+    m_PTS = m_curPTS;
+    m_DTS = m_curDTS;
+  }
+}
+
+void cParserH264::Reset()
+{
+  cParser::Reset();
+  m_StartCode = 0xffffffff;
+  m_NeedIFrame = true;
+  m_NeedSPS = true;
+  m_NeedPPS = true;
+  m_DTS = DVD_NOPTS_VALUE;
+}
+
+int cParserH264::Parse_H264(uint32_t startcode, int buf_ptr, bool &complete)
+{
+  int len = m_PesBufferPtr - buf_ptr;
+  uint8_t *buf = m_PesBuffer + buf_ptr;
+
+  switch(startcode & 0x9f)
+  {
+  case 1 ... 5:
+  {
+    if (m_NeedSPS || m_NeedPPS)
+    {
+      m_FoundFrame = true;
+      return 0;
+    }
+    // need at least 32 bytes for parsing nal
+    if (len < 32)
+      return -1;
+    h264_private::VCL_NAL vcl;
+    memset(&vcl, 0, sizeof(h264_private::VCL_NAL));
+    vcl.nal_ref_idc = startcode & 0x60;
+    vcl.nal_unit_type = startcode & 0x1F;
+    if (!Parse_SLH(buf, len, vcl))
+      return 0;
+
+    // check for the beginning of a new access unit
+    if (m_FoundFrame && IsFirstVclNal(vcl))
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+
+    m_streamData.vcl_nal = vcl;
+
+    // if this is the first frame we see, set timestamp
+    if (m_DTS == DVD_NOPTS_VALUE)
+    {
+      m_PTS = m_curPTS;
+      m_DTS = m_curDTS;
+    }
+    m_FoundFrame = true;
+
+    break;
+  }
+
+  case NAL_SEI:
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    break;
+
+  case NAL_SPS:
+  {
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    // TODO: how big is SPS?
+    if (len < 256)
+      return -1;
+    if (!Parse_SPS(buf, len))
+      return 0;
+
+    m_NeedSPS = false;
+    break;
+  }
+
+  case NAL_PPS:
+  {
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    // TODO: how big is PPS
+    if (len < 64)
+      return -1;
+    if (!Parse_PPS(buf, len))
+      return 0;
+    m_NeedPPS = false;
+    break;
+  }
+
+  case NAL_AUD:
+    if (m_FoundFrame && (m_prevDTS != DVD_NOPTS_VALUE))
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    break;
+
+  case NAL_END_SEQ:
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr;
+      return -1;
+    }
+    break;
+
+  case 13 ... 18:
+    if (m_FoundFrame)
+    {
+      complete = true;
+      m_PesNextFramePtr = buf_ptr - 4;
+      return -1;
+    }
+    break;
+
+  default:
+    break;
+  }
+
+  return 0;
+}
+
+bool cParserH264::Parse_PPS(uint8_t *buf, int len)
+{
+  cBitstream bs(buf, len*8);
+
+  int pps_id = bs.readGolombUE();
+  int sps_id = bs.readGolombUE();
+  m_streamData.pps[pps_id].sps = sps_id;
+  bs.readBits1();
+  m_streamData.pps[pps_id].pic_order_present_flag = bs.readBits1();
+  return true;
+}
+
+bool cParserH264::Parse_SLH(uint8_t *buf, int len, h264_private::VCL_NAL &vcl)
+{
+  cBitstream bs(buf, len*8);
+
+  bs.readGolombUE(); /* first_mb_in_slice */
+  int slice_type = bs.readGolombUE();
+
+  if (slice_type > 4)
+    slice_type -= 5;  /* Fixed slice type per frame */
+
+  switch (slice_type)
+  {
+  case 0:
+    break;
+  case 1:
+    break;
+  case 2:
+    m_NeedIFrame = false;
+    break;
+  default:
+    return false;
+  }
+
+  int pps_id = bs.readGolombUE();
+  int sps_id = m_streamData.pps[pps_id].sps;
+  if (m_streamData.sps[sps_id].cbpsize == 0)
+    return false;
+
+  m_vbvSize = m_streamData.sps[sps_id].cbpsize;
+  m_vbvDelay = -1;
+
+  vcl.pic_parameter_set_id = pps_id;
+  vcl.frame_num = bs.readBits(m_streamData.sps[sps_id].log2_max_frame_num);
+  if (!m_streamData.sps[sps_id].frame_mbs_only_flag)
+  {
+    vcl.field_pic_flag = bs.readBits1();
+    // interlaced
+//    if (vcl.field_pic_flag)
+//      m_FPS *= 2;
+  }
+  if (vcl.field_pic_flag)
+    vcl.bottom_field_flag = bs.readBits1();
+
+  if (vcl.nal_unit_type == 5)
+    vcl.idr_pic_id = bs.readGolombUE();
+  if (m_streamData.sps[sps_id].pic_order_cnt_type == 0)
+  {
+    vcl.pic_order_cnt_lsb = bs.readBits(m_streamData.sps[sps_id].log2_max_pic_order_cnt_lsb);
+    if(m_streamData.pps[pps_id].pic_order_present_flag && !vcl.field_pic_flag)
+      vcl.delta_pic_order_cnt_bottom = bs.readGolombSE();
+  }
+  if(m_streamData.sps[sps_id].pic_order_cnt_type == 1 &&
+      !m_streamData.sps[sps_id].delta_pic_order_always_zero_flag )
+  {
+    vcl.delta_pic_order_cnt_0 = bs.readGolombSE();
+    if(m_streamData.pps[pps_id].pic_order_present_flag && !vcl.field_pic_flag )
+      vcl.delta_pic_order_cnt_1 = bs.readGolombSE();
+  }
+
+  vcl.pic_order_cnt_type = m_streamData.sps[sps_id].pic_order_cnt_type;
+
+  return true;
+}
+
+bool cParserH264::Parse_SPS(uint8_t *buf, int len)
+{
+  cBitstream bs(buf, len*8);
+  unsigned int tmp, frame_mbs_only;
+  int cbpsize = -1;
+
+  int profile_idc = bs.readBits(8);
+  /* constraint_set0_flag = bs.readBits1();    */
+  /* constraint_set1_flag = bs.readBits1();    */
+  /* constraint_set2_flag = bs.readBits1();    */
+  /* constraint_set3_flag = bs.readBits1();    */
+  /* reserved             = bs.readBits(4);    */
+  bs.skipBits(8);
+  int level_idc = bs.readBits(8);
+  unsigned int seq_parameter_set_id = bs.readGolombUE(9);
+
+  unsigned int i = 0;
+  while (h264_lev2cpbsize[i][0] != -1)
+  {
+    if (h264_lev2cpbsize[i][0] >= level_idc)
+    {
+      cbpsize = h264_lev2cpbsize[i][1];
+      break;
+    }
+    i++;
+  }
+  if (cbpsize < 0)
+    return false;
+
+  memset(&m_streamData.sps[seq_parameter_set_id], 0, sizeof(h264_private::SPS));
+  m_streamData.sps[seq_parameter_set_id].cbpsize = cbpsize * 125; /* Convert from kbit to bytes */
+
+  if( profile_idc == 100 || profile_idc == 110 ||
+      profile_idc == 122 || profile_idc == 244 || profile_idc == 44 ||
+      profile_idc == 83 || profile_idc == 86 || profile_idc == 118 ||
+      profile_idc == 128 )
+  {
+    int chroma_format_idc = bs.readGolombUE(9); /* chroma_format_idc              */
+    if(chroma_format_idc == 3)
+      bs.skipBits(1);           /* residual_colour_transform_flag */
+    bs.readGolombUE();          /* bit_depth_luma - 8             */
+    bs.readGolombUE();          /* bit_depth_chroma - 8           */
+    bs.skipBits(1);             /* transform_bypass               */
+    if (bs.readBits1())         /* seq_scaling_matrix_present     */
+    {
+      for (int i = 0; i < ((chroma_format_idc != 3) ? 8 : 12); i++)
+      {
+        if (bs.readBits1())     /* seq_scaling_list_present       */
+        {
+          int last = 8, next = 8, size = (i<6) ? 16 : 64;
+          for (int j = 0; j < size; j++)
+          {
+            if (next)
+              next = (last + bs.readGolombSE()) & 0xff;
+            last = !next ? last: next;
+          }
+        }
+      }
+    }
+  }
+
+  int log2_max_frame_num_minus4 = bs.readGolombUE();           /* log2_max_frame_num - 4 */
+  m_streamData.sps[seq_parameter_set_id].log2_max_frame_num = log2_max_frame_num_minus4 + 4;
+  int pic_order_cnt_type = bs.readGolombUE(9);
+  m_streamData.sps[seq_parameter_set_id].pic_order_cnt_type = pic_order_cnt_type;
+  if (pic_order_cnt_type == 0)
+  {
+    int log2_max_pic_order_cnt_lsb_minus4 = bs.readGolombUE();         /* log2_max_poc_lsb - 4 */
+    m_streamData.sps[seq_parameter_set_id].log2_max_pic_order_cnt_lsb = log2_max_pic_order_cnt_lsb_minus4 + 4;
+  }
+  else if (pic_order_cnt_type == 1)
+  {
+    m_streamData.sps[seq_parameter_set_id].delta_pic_order_always_zero_flag = bs.readBits1();
+    bs.readGolombSE();         /* offset_for_non_ref_pic          */
+    bs.readGolombSE();         /* offset_for_top_to_bottom_field  */
+    tmp = bs.readGolombUE();   /* num_ref_frames_in_pic_order_cnt_cycle */
+    for (unsigned int i = 0; i < tmp; i++)
+      bs.readGolombSE();       /* offset_for_ref_frame[i]         */
+  }
+  else if(pic_order_cnt_type != 2)
+  {
+    /* Illegal poc */
+    return false;
+  }
+
+  bs.readGolombUE(9);          /* ref_frames                      */
+  bs.skipBits(1);             /* gaps_in_frame_num_allowed       */
+  m_Width  /* mbs */ = bs.readGolombUE() + 1;
+  m_Height /* mbs */ = bs.readGolombUE() + 1;
+  frame_mbs_only     = bs.readBits1();
+  m_streamData.sps[seq_parameter_set_id].frame_mbs_only_flag = frame_mbs_only;
+  DEBUGLOG("H.264 SPS: pic_width:  %u mbs", (unsigned) m_Width);
+  DEBUGLOG("H.264 SPS: pic_height: %u mbs", (unsigned) m_Height);
+  DEBUGLOG("H.264 SPS: frame only flag: %d", frame_mbs_only);
+
+  m_Width  *= 16;
+  m_Height *= 16 * (2-frame_mbs_only);
+
+  if (!frame_mbs_only)
+  {
+    if (bs.readBits1())     /* mb_adaptive_frame_field_flag */
+      DEBUGLOG("H.264 SPS: MBAFF");
+  }
+  bs.skipBits(1);           /* direct_8x8_inference_flag    */
+  if (bs.readBits1())       /* frame_cropping_flag */
+  {
+    uint32_t crop_left   = bs.readGolombUE();
+    uint32_t crop_right  = bs.readGolombUE();
+    uint32_t crop_top    = bs.readGolombUE();
+    uint32_t crop_bottom = bs.readGolombUE();
+    DEBUGLOG("H.264 SPS: cropping %d %d %d %d", crop_left, crop_top, crop_right, crop_bottom);
+
+    m_Width -= 2*(crop_left + crop_right);
+    if (frame_mbs_only)
+      m_Height -= 2*(crop_top + crop_bottom);
+    else
+      m_Height -= 4*(crop_top + crop_bottom);
+  }
+
+  /* VUI parameters */
+  m_PixelAspect.num = 0;
+  if (bs.readBits1())    /* vui_parameters_present flag */
+  {
+    if (bs.readBits1())  /* aspect_ratio_info_present */
+    {
+      uint32_t aspect_ratio_idc = bs.readBits(8);
+      DEBUGLOG("H.264 SPS: aspect_ratio_idc %d", aspect_ratio_idc);
+
+      if (aspect_ratio_idc == 255 /* Extended_SAR */)
+      {
+        m_PixelAspect.num = bs.readBits(16); /* sar_width */
+        m_PixelAspect.den = bs.readBits(16); /* sar_height */
+        DEBUGLOG("H.264 SPS: -> sar %dx%d", m_PixelAspect.num, m_PixelAspect.den);
+      }
+      else
+      {
+        static const mpeg_rational_t aspect_ratios[] =
+        { /* page 213: */
+          /* 0: unknown */
+          {0, 1},
+          /* 1...16: */
+          { 1,  1}, {12, 11}, {10, 11}, {16, 11}, { 40, 33}, {24, 11}, {20, 11}, {32, 11},
+          {80, 33}, {18, 11}, {15, 11}, {64, 33}, {160, 99}, { 4,  3}, { 3,  2}, { 2,  1}
+        };
+
+        if (aspect_ratio_idc < sizeof(aspect_ratios)/sizeof(aspect_ratios[0]))
+        {
+          memcpy(&m_PixelAspect, &aspect_ratios[aspect_ratio_idc], sizeof(mpeg_rational_t));
+          DEBUGLOG("H.264 SPS: PAR %d / %d", m_PixelAspect.num, m_PixelAspect.den);
+        }
+        else
+        {
+          DEBUGLOG("H.264 SPS: aspect_ratio_idc out of range !");
+        }
+      }
+    }
+    if (bs.readBits1()) // overscan
+    {
+      bs.readBits1(); // overscan_appropriate_flag
+    }
+    if (bs.readBits1()) // video_signal_type_present_flag
+    {
+      bs.readBits(3); // video_format
+      bs.readBits1(); // video_full_range_flag
+      if (bs.readBits1()) // colour_description_present_flag
+      {
+        bs.readBits(8); // colour_primaries
+        bs.readBits(8); // transfer_characteristics
+        bs.readBits(8); // matrix_coefficients
+      }
+    }
+
+    if (bs.readBits1()) // chroma_loc_info_present_flag
+    {
+      bs.readGolombUE(); // chroma_sample_loc_type_top_field
+      bs.readGolombUE(); // chroma_sample_loc_type_bottom_field
+    }
+
+    if (bs.readBits1()) // timing_info_present_flag
+    {
+//      uint32_t num_units_in_tick = bs.readBits(32);
+//      uint32_t time_scale = bs.readBits(32);
+//      int fixed_frame_rate = bs.readBits1();
+//      if (num_units_in_tick > 0)
+//        m_FPS = time_scale / (num_units_in_tick * 2);
+    }
+  }
+
+  DEBUGLOG("H.264 SPS: -> video size %dx%d, aspect %d:%d", m_Width, m_Height, m_PixelAspect.num, m_PixelAspect.den);
+  return true;
+}
+
+bool cParserH264::IsFirstVclNal(h264_private::VCL_NAL &vcl)
+{
+  if (m_streamData.vcl_nal.frame_num != vcl.frame_num)
+    return true;
+
+  if (m_streamData.vcl_nal.pic_parameter_set_id != vcl.pic_parameter_set_id)
+    return true;
+
+  if (m_streamData.vcl_nal.field_pic_flag != vcl.field_pic_flag)
+    return true;
+
+  if (m_streamData.vcl_nal.field_pic_flag && vcl.field_pic_flag)
+  {
+    if (m_streamData.vcl_nal.bottom_field_flag != vcl.bottom_field_flag)
+      return true;
+  }
+
+  if (m_streamData.vcl_nal.nal_ref_idc == 0 || vcl.nal_ref_idc == 0)
+  {
+    if (m_streamData.vcl_nal.nal_ref_idc != vcl.nal_ref_idc)
+      return true;
+  }
+
+  if (m_streamData.vcl_nal.pic_order_cnt_type == 0 && vcl.pic_order_cnt_type == 0)
+  {
+    if (m_streamData.vcl_nal.pic_order_cnt_lsb != vcl.pic_order_cnt_lsb)
+      return true;
+    if (m_streamData.vcl_nal.delta_pic_order_cnt_bottom != vcl.delta_pic_order_cnt_bottom)
+      return true;
+  }
+
+  if (m_streamData.vcl_nal.pic_order_cnt_type == 1 && vcl.pic_order_cnt_type == 1)
+  {
+    if (m_streamData.vcl_nal.delta_pic_order_cnt_0 != vcl.delta_pic_order_cnt_0)
+      return true;
+    if (m_streamData.vcl_nal.delta_pic_order_cnt_1 != vcl.delta_pic_order_cnt_1)
+      return true;
+  }
+
+  if (m_streamData.vcl_nal.nal_unit_type == 5 || vcl.nal_unit_type == 5)
+  {
+    if (m_streamData.vcl_nal.nal_unit_type != vcl.nal_unit_type)
+      return true;
+  }
+
+  if (m_streamData.vcl_nal.nal_unit_type == 5 && vcl.nal_unit_type == 5)
+  {
+    if (m_streamData.vcl_nal.idr_pic_id != vcl.idr_pic_id)
+      return true;
+  }
+  return false;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_DEMUXER_H264_H
+#define VNSI_DEMUXER_H264_H
+
+#include "parser.h"
+
+class cBitstream;
+
+// --- cParserH264 -------------------------------------------------
+
+class cParserH264 : public cParser
+{
+private:
+  typedef struct h264_private
+  {
+    struct SPS
+    {
+      int frame_duration;
+      int cbpsize;
+      int pic_order_cnt_type;
+      int frame_mbs_only_flag;
+      int log2_max_frame_num;
+      int log2_max_pic_order_cnt_lsb;
+      int delta_pic_order_always_zero_flag;
+    } sps[256];
+
+    struct PPS
+    {
+      int sps;
+      int pic_order_present_flag;
+    } pps[256];
+
+    struct VCL_NAL
+    {
+      int frame_num; // slice
+      int pic_parameter_set_id; // slice
+      int field_pic_flag; // slice
+      int bottom_field_flag; // slice
+      int delta_pic_order_cnt_bottom; // slice
+      int delta_pic_order_cnt_0; // slice
+      int delta_pic_order_cnt_1; // slice
+      int pic_order_cnt_lsb; // slice
+      int idr_pic_id; // slice
+      int nal_unit_type;
+      int nal_ref_idc; // start code
+      int pic_order_cnt_type; // sps
+    } vcl_nal;
+
+  } h264_private_t;
+
+  typedef struct mpeg_rational_s {
+    int num;
+    int den;
+  } mpeg_rational_t;
+
+  enum
+  {
+    NAL_SLH     = 0x01, // Slice Header
+    NAL_SEI     = 0x06, // Supplemental Enhancement Information
+    NAL_SPS     = 0x07, // Sequence Parameter Set
+    NAL_PPS     = 0x08, // Picture Parameter Set
+    NAL_AUD     = 0x09, // Access Unit Delimiter
+    NAL_END_SEQ = 0x0A  // End of Sequence
+  };
+
+  uint32_t        m_StartCode;
+  bool            m_NeedIFrame;
+  bool            m_NeedSPS;
+  bool            m_NeedPPS;
+  int             m_Width;
+  int             m_Height;
+  int             m_FPS;
+  int             m_FpsScale;
+  mpeg_rational_t m_PixelAspect;
+  int             m_FrameDuration;
+  h264_private    m_streamData;
+  int             m_vbvDelay;       /* -1 if CBR */
+  int             m_vbvSize;        /* Video buffer size (in bytes) */
+  int64_t         m_DTS;
+  int64_t         m_PTS;
+
+
+  int Parse_H264(uint32_t startcode, int buf_ptr, bool &complete);
+  bool Parse_PPS(uint8_t *buf, int len);
+  bool Parse_SLH(uint8_t *buf, int len, h264_private::VCL_NAL &vcl);
+  bool Parse_SPS(uint8_t *buf, int len);
+  bool IsFirstVclNal(h264_private::VCL_NAL &vcl);
+
+public:
+  cParserH264(int pID, cTSStream *stream);
+  virtual ~cParserH264();
+
+  virtual void Parse(sStreamPacket *pkt);
+  virtual void Reset();
+};
+
+
+#endif // VNSI_DEMUXER_H264_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.c	2012-12-12 01:00:24.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1342 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *      Copyright (C) 2010, 2011 Alexander Pipelka
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <time.h>
-
-#include <libsi/section.h>
-#include <libsi/descriptor.h>
-
-#include <vdr/remux.h>
-#include <vdr/channels.h>
-#include <asm/byteorder.h>
-
-#include "config.h"
-#include "receiver.h"
-#include "cxsocket.h"
-#include "vnsicommand.h"
-#include "responsepacket.h"
-#include "vnsi.h"
-
-// --- cLiveReceiver -------------------------------------------------
-
-class cLiveReceiver: public cReceiver
-{
-  friend class cLiveStreamer;
-
-private:
-  cLiveStreamer *m_Streamer;
-
-protected:
-  virtual void Activate(bool On);
-  virtual void Receive(uchar *Data, int Length);
-
-public:
-  cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids);
-  virtual ~cLiveReceiver();
-};
-
-cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids)
- : cReceiver(Channel, Priority)
- , m_Streamer(Streamer)
-{
-  SetPids(NULL);
-  AddPids(Pids);
-  DEBUGLOG("Starting live receiver");
-}
-
-cLiveReceiver::~cLiveReceiver()
-{
-  DEBUGLOG("Killing live receiver");
-}
-
-//void cLiveReceiver
-void cLiveReceiver::Receive(uchar *Data, int Length)
-{
-  m_Streamer->Receive(Data, Length);
-}
-
-inline void cLiveReceiver::Activate(bool On)
-{
-  m_Streamer->Activate(On);
-}
-
-// --- cLivePatFilter ----------------------------------------------------
-
-class cLivePatFilter : public cFilter
-{
-private:
-  int             m_pmtPid;
-  int             m_pmtSid;
-  int             m_pmtVersion;
-  const cChannel *m_Channel;
-  cLiveStreamer  *m_Streamer;
-
-  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
-
-public:
-  cLivePatFilter(cLiveStreamer *Streamer, const cChannel *Channel);
-};
-
-cLivePatFilter::cLivePatFilter(cLiveStreamer *Streamer, const cChannel *Channel)
-{
-  DEBUGLOG("cStreamdevPatFilter(\"%s\")", Channel->Name());
-  m_Channel     = Channel;
-  m_Streamer    = Streamer;
-  m_pmtPid      = 0;
-  m_pmtSid      = 0;
-  m_pmtVersion  = -1;
-  Set(0x00, 0x00);  // PAT
-
-}
-
-void cLivePatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
-{
-  if (Pid == 0x00)
-  {
-    if (Tid == 0x00)
-    {
-      SI::PAT pat(Data, false);
-      if (!pat.CheckCRCAndParse())
-        return;
-      SI::PAT::Association assoc;
-      for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); )
-      {
-        if (!assoc.isNITPid())
-        {
-          const cChannel *Channel =  Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId());
-          if (Channel && (Channel == m_Channel))
-          {
-            int prevPmtPid = m_pmtPid;
-            if (0 != (m_pmtPid = assoc.getPid()))
-            {
-              if (m_pmtPid != prevPmtPid)
-              {
-                m_pmtSid = assoc.getServiceId();
-                Add(m_pmtPid, 0x02);
-                m_pmtVersion = -1;
-                break;
-              }
-              return;
-            }
-          }
-        }
-      }
-    }
-  }
-  else if (Pid == m_pmtPid && Tid == SI::TableIdPMT && Source() && Transponder())
-  {
-    SI::PMT pmt(Data, false);
-    if (!pmt.CheckCRCAndParse())
-      return;
-    if (pmt.getServiceId() != m_pmtSid)
-      return; // skip broken PMT records
-    if (m_pmtVersion != -1)
-    {
-      if (m_pmtVersion != pmt.getVersionNumber())
-      {
-        cFilter::Del(m_pmtPid, 0x02);
-        m_pmtPid = 0; // this triggers PAT scan
-      }
-      return;
-    }
-    m_pmtVersion = pmt.getVersionNumber();
-
-    cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
-    if (Channel) {
-       // Scan the stream-specific loop:
-       SI::PMT::Stream stream;
-       int Vpid = 0;
-       int Ppid = 0;
-       int Vtype = 0;
-       int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
-       int Atypes[MAXAPIDS + 1] = { 0 };
-       int Dpids[MAXDPIDS + 1] = { 0 };
-       int Dtypes[MAXDPIDS + 1] = { 0 };
-       int Spids[MAXSPIDS + 1] = { 0 };
-       uchar SubtitlingTypes[MAXSPIDS + 1] = { 0 };
-       uint16_t CompositionPageIds[MAXSPIDS + 1] = { 0 };
-       uint16_t AncillaryPageIds[MAXSPIDS + 1] = { 0 };
-       char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
-       char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
-       char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
-       int Tpid = 0;
-       int NumApids = 0;
-       int NumDpids = 0;
-       int NumSpids = 0;
-       for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
-           bool ProcessCaDescriptors = false;
-           int esPid = stream.getPid();
-           switch (stream.getStreamType()) {
-             case 1: // STREAMTYPE_11172_VIDEO
-             case 2: // STREAMTYPE_13818_VIDEO
-             case 0x1B: // MPEG4
-                     Vpid = esPid;
-                     Ppid = pmt.getPCRPid();
-                     Vtype = stream.getStreamType();
-                     ProcessCaDescriptors = true;
-                     break;
-             case 3: // STREAMTYPE_11172_AUDIO
-             case 4: // STREAMTYPE_13818_AUDIO
-             case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport syntax
-             case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
-                     {
-                     if (NumApids < MAXAPIDS) {
-                        Apids[NumApids] = esPid;
-                        Atypes[NumApids] = stream.getStreamType();
-                        SI::Descriptor *d;
-                        for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                            switch (d->getDescriptorTag()) {
-                              case SI::ISO639LanguageDescriptorTag: {
-                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                   SI::ISO639LanguageDescriptor::Language l;
-                                   char *s = ALangs[NumApids];
-                                   int n = 0;
-                                   for (SI::Loop::Iterator it; ld->languageLoop.getNext(l, it); ) {
-                                       if (*ld->languageCode != '-') { // some use "---" to indicate "none"
-                                          if (n > 0)
-                                             *s++ = '+';
-                                          strn0cpy(s, I18nNormalizeLanguageCode(l.languageCode), MAXLANGCODE1);
-                                          s += strlen(s);
-                                          if (n++ > 1)
-                                             break;
-                                          }
-                                       }
-                                   }
-                                   break;
-                              default: ;
-                              }
-                            delete d;
-                            }
-                        NumApids++;
-                        }
-                     ProcessCaDescriptors = true;
-                     }
-                     break;
-             case 5: // STREAMTYPE_13818_PRIVATE
-             case 6: // STREAMTYPE_13818_PES_PRIVATE
-             //XXX case 8: // STREAMTYPE_13818_DSMCC
-                     {
-                     int dpid = 0;
-                     int dtype = 0;
-                     char lang[MAXLANGCODE1] = { 0 };
-                     SI::Descriptor *d;
-                     for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                         switch (d->getDescriptorTag()) {
-                           case SI::AC3DescriptorTag:
-                           case SI::EnhancedAC3DescriptorTag:
-                                dpid = esPid;
-                                dtype = d->getDescriptorTag();
-                                ProcessCaDescriptors = true;
-                                break;
-                           case SI::SubtitlingDescriptorTag:
-                                if (NumSpids < MAXSPIDS) {
-                                   Spids[NumSpids] = esPid;
-                                   SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
-                                   SI::SubtitlingDescriptor::Subtitling sub;
-                                   char *s = SLangs[NumSpids];
-                                   int n = 0;
-                                   for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
-                                       if (sub.languageCode[0]) {
-                                          SubtitlingTypes[NumSpids] = sub.getSubtitlingType();
-                                          CompositionPageIds[NumSpids] = sub.getCompositionPageId();
-                                          AncillaryPageIds[NumSpids] = sub.getAncillaryPageId();
-                                          if (n > 0)
-                                             *s++ = '+';
-                                          strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
-                                          s += strlen(s);
-                                          if (n++ > 1)
-                                             break;
-                                          }
-                                       }
-                                   NumSpids++;
-                                   }
-                                break;
-                           case SI::TeletextDescriptorTag:
-                                Tpid = esPid;
-                                break;
-                           case SI::ISO639LanguageDescriptorTag: {
-                                SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
-                                }
-                                break;
-                           default: ;
-                           }
-                         delete d;
-                         }
-                     if (dpid) {
-                        if (NumDpids < MAXDPIDS) {
-                           Dpids[NumDpids] = dpid;
-                           Dtypes[NumDpids] = dtype;
-                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                           NumDpids++;
-                           }
-                        }
-                     }
-                     break;
-             case 0x80: // STREAMTYPE_USER_PRIVATE
-#if APIVERSNUM >= 10728
-                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
-#endif
-                     { // DigiCipher II VIDEO (ANSI/SCTE 57)
-                        Vpid = esPid;
-                        Ppid = pmt.getPCRPid();
-                        Vtype = 0x02; // compression based upon MPEG-2
-                        ProcessCaDescriptors = true;
-                        break;
-                        }
-                     // fall through
-             case 0x81: // STREAMTYPE_USER_PRIVATE
-#if APIVERSNUM >= 10728
-                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
-#endif
-                     { // ATSC A/53 AUDIO (ANSI/SCTE 57)
-                        char lang[MAXLANGCODE1] = { 0 };
-                        SI::Descriptor *d;
-                        for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                            switch (d->getDescriptorTag()) {
-                              case SI::ISO639LanguageDescriptorTag: {
-                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                   strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
-                                   }
-                                   break;
-                              default: ;
-                              }
-                           delete d;
-                           }
-                        if (NumDpids < MAXDPIDS) {
-                           Dpids[NumDpids] = esPid;
-                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
-                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                           NumDpids++;
-                           }
-                        ProcessCaDescriptors = true;
-                        break;
-                        }
-                     // fall through
-             case 0x82: // STREAMTYPE_USER_PRIVATE
-#if APIVERSNUM >= 10728
-                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
-#endif
-                     { // STANDARD SUBTITLE (ANSI/SCTE 27)
-                        //TODO
-                        break;
-                        }
-                     // fall through
-             case 0x83 ... 0xFF: // STREAMTYPE_USER_PRIVATE
-                     {
-                     char lang[MAXLANGCODE1] = { 0 };
-                     bool IsAc3 = false;
-                     SI::Descriptor *d;
-                     for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                         switch (d->getDescriptorTag()) {
-                           case SI::RegistrationDescriptorTag: {
-                                SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d;
-                                // http://www.smpte-ra.org/mpegreg/mpegreg.html
-                                switch (rd->getFormatIdentifier()) {
-                                  case 0x41432D33: // 'AC-3'
-                                       IsAc3 = true;
-                                       break;
-                                  default:
-                                       //printf("Format identifier: 0x%08X (pid: %d)\n", rd->getFormatIdentifier(), esPid);
-                                       break;
-                                  }
-                                }
-                                break;
-                           case SI::ISO639LanguageDescriptorTag: {
-                                SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
-                                }
-                                break;
-                           default: ;
-                           }
-                        delete d;
-                        }
-                     if (IsAc3) {
-                        if (NumDpids < MAXDPIDS) {
-                           Dpids[NumDpids] = esPid;
-                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
-                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                           NumDpids++;
-                           }
-                        ProcessCaDescriptors = true;
-                        }
-                     }
-                     break;
-             default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());
-             }
-           }
-       cChannel pmtChannel(*Channel);
-       pmtChannel.SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
-       pmtChannel.SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
-       m_Streamer->SetTpid(Tpid);
-       cPatPmtGenerator patPmtGenerator(&pmtChannel);
-       m_Streamer->m_bufferLock.Lock();
-       m_Streamer->Put(patPmtGenerator.GetPat(), TS_SIZE);
-       int Index = 0;
-       while (uchar *pmt = patPmtGenerator.GetPmt(Index))
-         m_Streamer->Put(pmt, TS_SIZE);
-       m_Streamer->m_bufferLock.Unlock();
-       }
-  }
-}
-
-// --- cLiveStreamer -------------------------------------------------
-
-cLiveStreamer::cLiveStreamer(uint32_t timeout)
- : cThread("cLiveStreamer stream processor")
- , cRingBufferLinear(MEGABYTE(3), TS_SIZE * 2, true)
- , m_scanTimeout(timeout)
-{
-  m_Channel         = NULL;
-  m_Priority        = 0;
-  m_Socket          = NULL;
-  m_Device          = NULL;
-  m_Receiver        = NULL;
-  m_PatFilter       = NULL;
-  m_Frontend        = -1;
-  m_streamReady     = false;
-  m_IsAudioOnly     = false;
-  m_IsMPEGPS        = false;
-  m_startup         = true;
-  m_SignalLost      = false;
-  m_IFrameSeen      = false;
-  m_PidChange       = false;
-  m_Tpid            = 0;
-
-  m_requestStreamChange = false;
-
-  m_packetEmpty = new cResponsePacket;
-  m_packetEmpty->initStream(VNSI_STREAM_MUXPKT, 0, 0, 0, 0);
-
-  memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
-  for (int idx = 0; idx < MAXRECEIVEPIDS; ++idx)
-  {
-    m_Pids[idx]    = 0;
-  }
-  m_Streams.clear();
-
-  if(m_scanTimeout == 0)
-    m_scanTimeout = VNSIServerConfig.stream_timeout;
-
-  SetTimeouts(0, 100);
-}
-
-cLiveStreamer::~cLiveStreamer()
-{
-  DEBUGLOG("Started to delete live streamer");
-
-  Cancel(-1);
-
-  if (m_Device)
-  {
-    if (m_Receiver)
-    {
-      DEBUGLOG("Detaching Live Receiver");
-      m_Device->Detach(m_Receiver);
-    }
-    else
-    {
-      DEBUGLOG("No live receiver present");
-    }
-
-    if (m_PatFilter)
-    {
-      DEBUGLOG("Detaching Live Filter");
-      m_Device->Detach(m_PatFilter);
-    }
-    else
-    {
-      DEBUGLOG("No live filter present");
-    }
-
-    for (std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin(); it != m_Demuxers.end(); ++it)
-    {
-      DEBUGLOG("Deleting stream demuxer for pid=%i and type=%i", (*it)->GetPID(), (*it)->Type());
-      delete (*it);
-    }
-    m_Demuxers.clear();
-
-    if (m_Receiver)
-    {
-      DEBUGLOG("Deleting Live Receiver");
-      DELETENULL(m_Receiver);
-    }
-
-    if (m_PatFilter)
-    {
-      DEBUGLOG("Deleting Live Filter");
-      DELETENULL(m_PatFilter);
-    }
-  }
-  if (m_Frontend >= 0)
-  {
-    close(m_Frontend);
-    m_Frontend = -1;
-  }
-
-  delete m_packetEmpty;
-
-  DEBUGLOG("Finished to delete live streamer");
-}
-
-void cLiveStreamer::Receive(uchar *Data, int Length)
-{
-  m_bufferLock.Lock();
-  int p = Put(Data, Length);
-
-  if (p != Length)
-    ReportOverflow(Length - p);
-  m_bufferLock.Unlock();
-}
-
-void cLiveStreamer::Action(void)
-{
-  int size              = 0;
-  int used              = 0;
-  unsigned char *buf    = NULL;
-  m_startup             = true;
-  cTimeMs last_info;
-  cTimeMs starttime;
-  m_last_tick.Set(0);
-  cPatPmtParser patPmtParser;
-  cTSDemuxer *demuxer;
-  int oldPmtVersion = -1;
-
-  while (Running())
-  {
-    size = 0;
-    used = 0;
-    buf = Get(size);
-
-    if (!m_Receiver->IsAttached())
-    {
-      INFOLOG("returning from streamer thread, receiver is no more attached");
-      break;
-    }
-
-    // if we got no pmt, create demuxers with info in channels.conf
-    if (m_Demuxers.size() == 0 && starttime.Elapsed() > (unsigned int)PmtTimeout*1000)
-    {
-      INFOLOG("Got no PMT, using channel conf for creating demuxers");
-      confChannelDemuxers(m_Channel);
-    }
-
-    // no data
-    if (buf == NULL || size <= TS_SIZE)
-    {
-      // keep client going
-      if(m_last_tick.Elapsed() >= (uint64_t)(m_scanTimeout*1000))
-      {
-        INFOLOG("No Signal");
-        sendStreamStatus();
-        m_last_tick.Set(0);
-        m_SignalLost = true;
-      }
-      continue;
-    }
-
-    /* Make sure we are looking at a TS packet */
-    while (size > TS_SIZE)
-    {
-      if (buf[0] == TS_SYNC_BYTE && buf[TS_SIZE] == TS_SYNC_BYTE)
-        break;
-      used++;
-      buf++;
-      size--;
-    }
-
-    // Send stream information as the first packet on startup
-    if (IsStarting() && IsReady())
-    {
-      INFOLOG("streaming of channel started");
-      last_info.Set(0);
-      m_last_tick.Set(0);
-      m_requestStreamChange = true;
-      m_startup = false;
-    }
-
-    while (size >= TS_SIZE)
-    {
-      if(!Running())
-      {
-        break;
-      }
-
-      int ts_pid = TsPid(buf);
-
-      if (ts_pid == PATPID)
-      {
-        patPmtParser.ParsePat(buf, TS_SIZE);
-      }
-#if APIVERSNUM >= 10733
-      else if (patPmtParser.IsPmtPid(ts_pid))
-#else
-      else if (ts_pid == patPmtParser.PmtPid())
-#endif
-      {
-        int patVersion, pmtVersion;
-        patPmtParser.ParsePmt(buf, TS_SIZE);
-        if (patPmtParser.GetVersions(patVersion, pmtVersion))
-        {
-          if (pmtVersion != oldPmtVersion)
-          {
-            cChannel pmtChannel(*m_Channel);
-            setChannelPids(&pmtChannel, &patPmtParser);
-            confChannelDemuxers(&pmtChannel);
-            patPmtParser.Reset();
-            oldPmtVersion = pmtVersion;
-          }
-        }
-      }
-      else if (demuxer = FindStreamDemuxer(ts_pid))
-      {
-        if (!demuxer->ProcessTSPacket(buf))
-        {
-          used += TS_SIZE;
-          break;
-        }
-      }
-      else
-        INFOLOG("no muxer found");
-
-      buf += TS_SIZE;
-      size -= TS_SIZE;
-      used += TS_SIZE;
-    }
-    Del(used);
-
-    if(last_info.Elapsed() >= 10*1000 && IsReady())
-    {
-      last_info.Set(0);
-      sendStreamInfo();
-      sendSignalInfo();
-    }
-  }
-  INFOLOG("exit streamer thread");
-}
-
-bool cLiveStreamer::StreamChannel(const cChannel *channel, int priority, cxSocket *Socket, cResponsePacket *resp)
-{
-  if (channel == NULL)
-  {
-    ERRORLOG("Starting streaming of channel without valid channel");
-    return false;
-  }
-
-  m_Channel   = channel;
-  m_Priority  = priority;
-  m_Socket    = Socket;
-  m_Device    = cDevice::GetDevice(channel, m_Priority, true);
-
-  if (m_Device != NULL)
-  {
-    DEBUGLOG("Successfully found following device: %p (%d) for receiving", m_Device, m_Device ? m_Device->CardIndex() + 1 : 0);
-
-    if (m_Device->SwitchChannel(m_Channel, false))
-    {
-      if (!m_Channel->Vpid())
-      {
-        /* m_streamReady is set by the Video demuxers, to have always valid stream informations
-         * like height and width. But if no Video PID is present like for radio channels
-         * VNSI will deadlock
-         */
-        m_streamReady = true;
-        m_IsAudioOnly = true;
-      }
-
-      /* Send the OK response here, that it is before the Stream end message */
-      resp->add_U32(VNSI_RET_OK);
-      resp->finalise();
-      m_Socket->write(resp->getPtr(), resp->getLen());
-
-      if (m_Channel && ((m_Channel->Source() >> 24) == 'V')) m_IsMPEGPS = true;
-
-      if (m_Socket)
-      {
-        dsyslog("VNSI: Creating new live Receiver");
-        m_PatFilter = new cLivePatFilter(this, m_Channel);
-        m_Device->AttachFilter(m_PatFilter);
-        m_Receiver = new cLiveReceiver(this, m_Channel, m_Priority, m_Pids);
-        m_Device->AttachReceiver(m_Receiver);
-      }
-
-      INFOLOG("Successfully switched to channel %i - %s", m_Channel->Number(), m_Channel->Name());
-      return true;
-    }
-    else
-    {
-      ERRORLOG("Can't switch to channel %i - %s", m_Channel->Number(), m_Channel->Name());
-    }
-  }
-  else
-  {
-    ERRORLOG("Can't get device for channel %i - %s", m_Channel->Number(), m_Channel->Name());
-  }
-  return false;
-}
-
-cTSDemuxer *cLiveStreamer::FindStreamDemuxer(int Pid)
-{
-  for (std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin(); it != m_Demuxers.end(); ++it)
-  {
-    if (Pid == (*it)->GetPID())
-      return *it;
-  }
-  return NULL;
-}
-
-void cLiveStreamer::AddStream(sStream &stream)
-{
-  m_Streams.push_back(stream);
-}
-
-inline void cLiveStreamer::Activate(bool On)
-{
-  if (m_PidChange)
-    return;
-
-  if (On)
-  {
-    DEBUGLOG("VDR active, sending stream start message");
-    Start();
-  }
-  else
-  {
-    DEBUGLOG("VDR inactive, sending stream end message");
-    Cancel(5);
-  }
-}
-
-void cLiveStreamer::sendStreamPacket(sStreamPacket *pkt)
-{
-  if(pkt == NULL)
-    return;
-
-  if(pkt->size == 0)
-    return;
-
-  if(!m_IsAudioOnly && !m_IFrameSeen && (pkt->frametype != PKT_I_FRAME))
-    return;
-
-  if(m_requestStreamChange)
-    sendStreamChange();
-
-  m_IFrameSeen = true;
-
-  if (!m_streamHeader.initStream(VNSI_STREAM_MUXPKT, pkt->id, pkt->duration, pkt->pts, pkt->dts))
-  {
-    ERRORLOG("stream response packet init fail");
-    return;
-  }
-  m_streamHeader.setLen(m_streamHeader.getStreamHeaderLength() + pkt->size);
-  m_streamHeader.finaliseStream();
-
-  m_Socket->write(m_streamHeader.getPtr(), m_streamHeader.getStreamHeaderLength(), -1, true);
-  m_Socket->write(pkt->data, pkt->size);
-
-  m_last_tick.Set(0);
-  m_SignalLost = false;
-}
-
-void cLiveStreamer::sendStreamChange()
-{
-  cResponsePacket *resp = new cResponsePacket();
-  if (!resp->initStream(VNSI_STREAM_CHANGE, 0, 0, 0, 0))
-  {
-    ERRORLOG("stream response packet init fail");
-    delete resp;
-    return;
-  }
-
-  for (std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin(); it != m_Demuxers.end(); ++it)
-  {
-    resp->add_U32((*it)->GetPID());
-    if ((*it)->Type() == stMPEG2AUDIO)
-    {
-      resp->add_String("MPEG2AUDIO");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stMPEG2VIDEO)
-    {
-      resp->add_String("MPEG2VIDEO");
-      resp->add_U32((*it)->GetFpsScale());
-      resp->add_U32((*it)->GetFpsRate());
-      resp->add_U32((*it)->GetHeight());
-      resp->add_U32((*it)->GetWidth());
-      resp->add_double((*it)->GetAspect());
-    }
-    else if ((*it)->Type() == stAC3)
-    {
-      resp->add_String("AC3");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stH264)
-    {
-      resp->add_String("H264");
-      resp->add_U32((*it)->GetFpsScale());
-      resp->add_U32((*it)->GetFpsRate());
-      resp->add_U32((*it)->GetHeight());
-      resp->add_U32((*it)->GetWidth());
-      resp->add_double((*it)->GetAspect());
-    }
-    else if ((*it)->Type() == stDVBSUB)
-    {
-      resp->add_String("DVBSUB");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->CompositionPageId());
-      resp->add_U32((*it)->AncillaryPageId());
-    }
-    else if ((*it)->Type() == stTELETEXT)
-    {
-      resp->add_String("TELETEXT");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->CompositionPageId());
-      resp->add_U32((*it)->AncillaryPageId());
-    }
-    else if ((*it)->Type() == stAACADST)
-    {
-      resp->add_String("AAC");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stAACLATM)
-    {
-      resp->add_String("AACLATM");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stEAC3)
-    {
-      resp->add_String("EAC3");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stDTS)
-    {
-      resp->add_String("DTS");
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-  }
-
-  resp->finaliseStream();
-  m_Socket->write(resp->getPtr(), resp->getLen(), -1, true);
-  delete resp;
-
-  m_requestStreamChange = false;
-
-  sendStreamInfo();
-}
-
-void cLiveStreamer::sendSignalInfo()
-{
-  /* If no frontend is found m_Frontend is set to -2, in this case
-     return a empty signalinfo package */
-  if (m_Frontend == -2)
-  {
-    cResponsePacket *resp = new cResponsePacket();
-    if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
-    {
-      ERRORLOG("stream response packet init fail");
-      delete resp;
-      return;
-    }
-
-    resp->add_String(*cString::sprintf("Unknown"));
-    resp->add_String(*cString::sprintf("Unknown"));
-    resp->add_U32(0);
-    resp->add_U32(0);
-    resp->add_U32(0);
-    resp->add_U32(0);
-
-    resp->finaliseStream();
-    m_Socket->write(resp->getPtr(), resp->getLen(), -1, true);
-    delete resp;
-    return;
-  }
-
-  if (m_Channel && ((m_Channel->Source() >> 24) == 'V'))
-  {
-    if (m_Frontend < 0)
-    {
-      for (int i = 0; i < 8; i++)
-      {
-        m_DeviceString = cString::sprintf("/dev/video%d", i);
-        m_Frontend = open(m_DeviceString, O_RDONLY | O_NONBLOCK);
-        if (m_Frontend >= 0)
-        {
-          if (ioctl(m_Frontend, VIDIOC_QUERYCAP, &m_vcap) < 0)
-          {
-            ERRORLOG("cannot read analog frontend info.");
-            close(m_Frontend);
-            m_Frontend = -1;
-            memset(&m_vcap, 0, sizeof(m_vcap));
-            continue;
-          }
-          break;
-        }
-      }
-      if (m_Frontend < 0)
-        m_Frontend = -2;
-    }
-
-    if (m_Frontend >= 0)
-    {
-      cResponsePacket *resp = new cResponsePacket();
-      if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
-      {
-        ERRORLOG("stream response packet init fail");
-        delete resp;
-        return;
-      }
-      resp->add_String(*cString::sprintf("Analog #%s - %s (%s)", *m_DeviceString, (char *) m_vcap.card, m_vcap.driver));
-      resp->add_String("");
-      resp->add_U32(0);
-      resp->add_U32(0);
-      resp->add_U32(0);
-      resp->add_U32(0);
-
-      resp->finaliseStream();
-      m_Socket->write(resp->getPtr(), resp->getLen(), -1, true);
-      delete resp;
-    }
-  }
-  else
-  {
-    if (m_Frontend < 0)
-    {
-      m_DeviceString = cString::sprintf(FRONTEND_DEVICE, m_Device->CardIndex(), 0);
-      m_Frontend = open(m_DeviceString, O_RDONLY | O_NONBLOCK);
-      if (m_Frontend >= 0)
-      {
-        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0)
-        {
-          ERRORLOG("cannot read frontend info.");
-          close(m_Frontend);
-          m_Frontend = -2;
-          memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
-          return;
-        }
-      }
-    }
-
-    if (m_Frontend >= 0)
-    {
-      cResponsePacket *resp = new cResponsePacket();
-      if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
-      {
-        ERRORLOG("stream response packet init fail");
-        delete resp;
-        return;
-      }
-
-      fe_status_t status;
-      uint16_t fe_snr;
-      uint16_t fe_signal;
-      uint32_t fe_ber;
-      uint32_t fe_unc;
-
-      memset(&status, 0, sizeof(status));
-      ioctl(m_Frontend, FE_READ_STATUS, &status);
-
-      if (ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &fe_signal) == -1)
-        fe_signal = -2;
-      if (ioctl(m_Frontend, FE_READ_SNR, &fe_snr) == -1)
-        fe_snr = -2;
-      if (ioctl(m_Frontend, FE_READ_BER, &fe_ber) == -1)
-        fe_ber = -2;
-      if (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &fe_unc) == -1)
-        fe_unc = -2;
-
-      switch (m_Channel->Source() & cSource::st_Mask)
-      {
-        case cSource::stSat:
-          resp->add_String(*cString::sprintf("DVB-S%s #%d - %s", (m_FrontendInfo.caps & 0x10000000) ? "2" : "",  cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-          break;
-        case cSource::stCable:
-          resp->add_String(*cString::sprintf("DVB-C #%d - %s", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-          break;
-        case cSource::stTerr:
-          resp->add_String(*cString::sprintf("DVB-T #%d - %s", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-          break;
-      }
-      resp->add_String(*cString::sprintf("%s:%s:%s:%s:%s", (status & FE_HAS_LOCK) ? "LOCKED" : "-", (status & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (status & FE_HAS_CARRIER) ? "CARRIER" : "-", (status & FE_HAS_VITERBI) ? "VITERBI" : "-", (status & FE_HAS_SYNC) ? "SYNC" : "-"));
-      resp->add_U32(fe_snr);
-      resp->add_U32(fe_signal);
-      resp->add_U32(fe_ber);
-      resp->add_U32(fe_unc);
-
-      resp->finaliseStream();
-      m_Socket->write(resp->getPtr(), resp->getLen(), -1, true);
-      delete resp;
-    }
-  }
-}
-
-void cLiveStreamer::sendStreamInfo()
-{
-  if(m_Demuxers.size() == 0)
-  {
-    return;
-  }
-
-  cResponsePacket *resp = new cResponsePacket();
-  if (!resp->initStream(VNSI_STREAM_CONTENTINFO, 0, 0, 0, 0))
-  {
-    ERRORLOG("stream response packet init fail");
-    delete resp;
-    return;
-  }
-
-  for (std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin(); it != m_Demuxers.end(); ++it)
-  {
-    if ((*it)->Type() == stMPEG2AUDIO ||
-        (*it)->Type() == stAC3 ||
-        (*it)->Type() == stEAC3 ||
-        (*it)->Type() == stDTS ||
-        (*it)->Type() == stAACADST ||
-        (*it)->Type() == stAACLATM)
-    {
-      resp->add_U32((*it)->GetPID());
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->GetChannels());
-      resp->add_U32((*it)->GetSampleRate());
-      resp->add_U32((*it)->GetBlockAlign());
-      resp->add_U32((*it)->GetBitRate());
-      resp->add_U32((*it)->GetBitsPerSample());
-    }
-    else if ((*it)->Type() == stMPEG2VIDEO || (*it)->Type() == stH264)
-    {
-      resp->add_U32((*it)->GetPID());
-      resp->add_U32((*it)->GetFpsScale());
-      resp->add_U32((*it)->GetFpsRate());
-      resp->add_U32((*it)->GetHeight());
-      resp->add_U32((*it)->GetWidth());
-      resp->add_double((*it)->GetAspect());
-    }
-    else if ((*it)->Type() == stDVBSUB)
-    {
-      resp->add_U32((*it)->GetPID());
-      resp->add_String((*it)->GetLanguage());
-      resp->add_U32((*it)->CompositionPageId());
-      resp->add_U32((*it)->AncillaryPageId());
-    }
-  }
-
-  resp->finaliseStream();
-  m_Socket->write(resp->getPtr(), resp->getLen());
-  delete resp;
-}
-
-void cLiveStreamer::sendStreamStatus()
-{
-  cResponsePacket *resp = new cResponsePacket();
-  if (!resp->initStream(VNSI_STREAM_STATUS, 0, 0, 0, 0))
-  {
-    ERRORLOG("stream response packet init fail");
-    delete resp;
-    return;
-  }
-  resp->add_String("No Signal");
-  resp->finaliseStream();
-  m_Socket->write(resp->getPtr(), resp->getLen());
-  delete resp;
-}
-
-void cLiveStreamer::ensureDemuxers()
-{
-  std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin();
-  while (it != m_Demuxers.end())
-  {
-    std::list<sStream>::iterator its;
-    for (its = m_Streams.begin(); its != m_Streams.end(); ++its)
-    {
-      if ((its->pID == (*it)->GetPID()) && (its->type == (*it)->Type()))
-      {
-        break;
-      }
-    }
-    if (its == m_Streams.end())
-    {
-      INFOLOG("Deleting stream demuxer for pid=%i and type=%i", (*it)->GetPID(), (*it)->Type());
-      m_Demuxers.erase(it);
-      it = m_Demuxers.begin();
-      m_requestStreamChange = true;
-    }
-    else
-      ++it;
-  }
-
-  for (std::list<sStream>::iterator it = m_Streams.begin(); it != m_Streams.end(); ++it)
-  {
-    cTSDemuxer *demuxer = FindStreamDemuxer(it->pID);
-    if (demuxer)
-    {
-      demuxer->SetLanguage(it->language);
-      continue;
-    }
-
-    if (it->type == stH264)
-    {
-      demuxer = new cTSDemuxer(this, stH264, it->pID);
-    }
-    else if (it->type == stMPEG2VIDEO)
-    {
-      demuxer = new cTSDemuxer(this, stMPEG2VIDEO, it->pID);
-    }
-    else if (it->type == stMPEG2AUDIO)
-    {
-      demuxer = new cTSDemuxer(this, stMPEG2AUDIO, it->pID);
-      demuxer->SetLanguage(it->language);
-    }
-    else if (it->type == stAACADST)
-    {
-      demuxer = new cTSDemuxer(this, stAACADST, it->pID);
-      demuxer->SetLanguage(it->language);
-    }
-    else if (it->type == stAACLATM)
-    {
-      demuxer = new cTSDemuxer(this, stAACLATM, it->pID);
-      demuxer->SetLanguage(it->language);
-    }
-    else if (it->type == stAC3)
-    {
-      demuxer = new cTSDemuxer(this, stAC3, it->pID);
-      demuxer->SetLanguage(it->language);
-    }
-    else if (it->type == stEAC3)
-    {
-      demuxer = new cTSDemuxer(this, stEAC3, it->pID);
-      demuxer->SetLanguage(it->language);
-    }
-    else if (it->type == stDVBSUB)
-    {
-      demuxer = new cTSDemuxer(this, stDVBSUB, it->pID);
-      demuxer->SetLanguage(it->language);
-#if APIVERSNUM >= 10709
-      demuxer->SetSubtitlingDescriptor(it->subtitlingType, it->compositionPageId, it->ancillaryPageId);
-#endif
-    }
-    else if (it->type == stTELETEXT)
-    {
-      demuxer = new cTSDemuxer(this, stTELETEXT, it->pID);
-    }
-    else
-      continue;
-
-    m_Demuxers.push_back(demuxer);
-    INFOLOG("Created stream demuxer for pid=%i and type=%i", demuxer->GetPID(), demuxer->Type());
-    m_requestStreamChange = true;
-  }
-
-  if (m_requestStreamChange)
-  {
-    int index = 0;
-    for (std::list<cTSDemuxer*>::iterator it = m_Demuxers.begin(); it != m_Demuxers.end(); ++it)
-    {
-      m_Pids[index] = (*it)->GetPID();
-      index++;
-    }
-    m_Pids[index] = 0;
-
-    if (m_Receiver)
-    {
-      m_PidChange = true;
-      m_Device->Detach(m_Receiver);
-      m_Receiver->SetPids(NULL);
-      m_Receiver->AddPids(m_Pids);
-      m_Device->AttachReceiver(m_Receiver);
-      m_PidChange = false;
-    }
-  }
-
-  m_Streams.clear();
-}
-
-void cLiveStreamer::confChannelDemuxers(const cChannel *channel)
-{
-  sStream newStream;
-  if (channel->Vpid())
-  {
-    newStream.pID = channel->Vpid();
-#if APIVERSNUM >= 10701
-    if (channel->Vtype() == 0x1B)
-      newStream.type = stH264;
-    else
-#endif
-      newStream.type = stMPEG2VIDEO;
-
-    AddStream(newStream);
-  }
-
-  const int *APids = channel->Apids();
-  for ( ; *APids; APids++)
-  {
-    int index = 0;
-    if (!FindStreamDemuxer(*APids))
-    {
-      newStream.pID = *APids;
-      newStream.type = stMPEG2AUDIO;
-#if APIVERSNUM >= 10715
-      if (channel->Atype(index) == 0x0F)
-        newStream.type = stAACADST;
-      else if (channel->Atype(index) == 0x11)
-        newStream.type = stAACLATM;
-#endif
-      newStream.SetLanguage(channel->Alang(index));
-      AddStream(newStream);
-    }
-    index++;
-  }
-
-  const int *DPids = channel->Dpids();
-  for ( ; *DPids; DPids++)
-  {
-    int index = 0;
-    if (!FindStreamDemuxer(*DPids))
-    {
-      newStream.pID = *DPids;
-      newStream.type = stAC3;
-#if APIVERSNUM >= 10715
-      if (channel->Dtype(index) == SI::EnhancedAC3DescriptorTag)
-        newStream.type = stEAC3;
-#endif
-      newStream.SetLanguage(channel->Dlang(index));
-      AddStream(newStream);
-    }
-    index++;
-  }
-
-  const int *SPids = channel->Spids();
-  if (SPids)
-  {
-    int index = 0;
-    for ( ; *SPids; SPids++)
-    {
-      if (!FindStreamDemuxer(*SPids))
-      {
-        newStream.pID = *SPids;
-        newStream.type = stDVBSUB;
-        newStream.SetLanguage(channel->Slang(index));
-#if APIVERSNUM >= 10709
-        newStream.subtitlingType = channel->SubtitlingType(index);
-        newStream.compositionPageId = channel->CompositionPageId(index);
-        newStream.ancillaryPageId = channel->AncillaryPageId(index);
-#endif
-        AddStream(newStream);
-      }
-      index++;
-    }
-  }
-
-  if (m_Tpid)
-  {
-    newStream.pID = m_Tpid;
-    newStream.type = stTELETEXT;
-    AddStream(newStream);
-  }
-
-  ensureDemuxers();
-}
-
-void cLiveStreamer::setChannelPids(cChannel *channel, cPatPmtParser *patPmtParser)
-{
-  int Apids[MAXAPIDS + 1] = { 0 };
-  int Atypes[MAXAPIDS + 1] = { 0 };
-  int Dpids[MAXDPIDS + 1] = { 0 };
-  int Dtypes[MAXDPIDS + 1] = { 0 };
-  int Spids[MAXSPIDS + 1] = { 0 };
-  char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
-  char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
-  char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
-  int index = 0;
-
-  const int *aPids = patPmtParser->Apids();
-  index = 0;
-  for ( ; *aPids; aPids++)
-  {
-    Apids[index] = patPmtParser->Apid(index);
-    Atypes[index] = patPmtParser->Atype(index);
-    strn0cpy(ALangs[index], patPmtParser->Alang(index), MAXLANGCODE2);
-    index++;
-  }
-
-  const int *dPids = patPmtParser->Dpids();
-  index = 0;
-  for ( ; *dPids; dPids++)
-  {
-    Dpids[index] = patPmtParser->Dpid(index);
-    Dtypes[index] = patPmtParser->Dtype(index);
-    strn0cpy(DLangs[index], patPmtParser->Dlang(index), MAXLANGCODE2);
-    index++;
-  }
-
-  const int *sPids = patPmtParser->Spids();
-  index = 0;
-  for ( ; *sPids; sPids++)
-  {
-    Spids[index] = patPmtParser->Spid(index);
-    strn0cpy(SLangs[index], patPmtParser->Slang(index), MAXLANGCODE2);
-    index++;
-  }
-
-  int Vpid = patPmtParser->Vpid();
-  int Ppid = patPmtParser->Ppid();
-  int VType = patPmtParser->Vtype();
-  int Tpid = m_Channel->Tpid();
-  channel->SetPids(Vpid, Ppid, VType,
-                   Apids, Atypes, ALangs,
-                   Dpids, Dtypes, DLangs,
-                   Spids, SLangs,
-                   Tpid);
-}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.h	2012-12-11 01:00:24.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/receiver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/*
- *      vdr-plugin-vnsi - XBMC server plugin for VDR
- *
- *      Copyright (C) 2010 Alwin Esch (Team XBMC)
- *      Copyright (C) 2010, 2011 Alexander Pipelka
- *
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef VNSI_RECEIVER_H
-#define VNSI_RECEIVER_H
-
-#include <linux/dvb/frontend.h>
-#include <linux/videodev2.h>
-#include <vdr/channels.h>
-#include <vdr/device.h>
-#include <vdr/receiver.h>
-#include <vdr/thread.h>
-#include <vdr/ringbuffer.h>
-#include <list>
-
-#include "demuxer.h"
-#include "responsepacket.h"
-
-class cxSocket;
-class cChannel;
-class cLiveReceiver;
-class cTSDemuxer;
-class cResponsePacket;
-class cLivePatFilter;
-
-struct sStream
-{
-  int pID;
-  eStreamType type;
-  eStreamContent content;
-  char language[MAXLANGCODE2];
-  int subtitlingType;
-  int compositionPageId;
-  int ancillaryPageId;
-  void SetLanguage(const char* lang)
-  {
-    language[0] = lang[0];
-    language[1] = lang[1];
-    language[2] = lang[2];
-    language[3] = 0;
-  }
-};
-
-class cLiveStreamer : public cThread
-                    , public cRingBufferLinear
-{
-private:
-  friend class cParser;
-  friend class cLivePatFilter;
-  friend class cLiveReceiver;
-
-  cTSDemuxer *FindStreamDemuxer(int Pid);
-
-  void sendStreamPacket(sStreamPacket *pkt);
-  void sendStreamChange();
-  void sendSignalInfo();
-  void sendStreamInfo();
-  void sendStreamStatus();
-  void ensureDemuxers();
-  void confChannelDemuxers(const cChannel *channel);
-  void setChannelPids(cChannel *channel, cPatPmtParser *patPmtParser);
-  void Receive(uchar *Data, int Length);
-
-  const cChannel   *m_Channel;                      /*!> Channel to stream */
-  cDevice          *m_Device;                       /*!> The receiving device the channel depents to */
-  cLiveReceiver    *m_Receiver;                     /*!> Our stream transceiver */
-  cLivePatFilter   *m_PatFilter;                    /*!> Filter processor to get changed pid's */
-  int               m_Priority;                     /*!> The priority over other streamers */
-  int               m_Pids[MAXRECEIVEPIDS + 1];     /*!> PID for cReceiver also as extra array */
-  cxSocket         *m_Socket;                       /*!> The socket class to communicate with client */
-  int               m_Frontend;                     /*!> File descriptor to access used receiving device  */
-  dvb_frontend_info m_FrontendInfo;                 /*!> DVB Information about the receiving device (DVB only) */
-  v4l2_capability   m_vcap;                         /*!> PVR Information about the receiving device (pvrinput only) */
-  cString           m_DeviceString;                 /*!> The name of the receiving device */
-  bool              m_streamReady;                  /*!> Set by the video demuxer after we got video information */
-  bool              m_startup;
-  bool              m_IsAudioOnly;                  /*!> Set to true if streams contains only audio */
-  bool              m_IsMPEGPS;                     /*!> TS Stream contains MPEG PS data like from pvrinput */
-  cResponsePacket*  m_packetEmpty;                  /*!> Empty stream packet */
-  bool              m_requestStreamChange;
-  uint32_t          m_scanTimeout;                  /*!> Channel scanning timeout (in seconds) */
-  cTimeMs           m_last_tick;
-  bool              m_SignalLost;
-  bool              m_IFrameSeen;
-  cResponsePacket   m_streamHeader;
-  std::list<cTSDemuxer*> m_Demuxers;
-  std::list<sStream> m_Streams;
-  bool              m_PidChange;
-  int               m_Tpid;
-  cMutex            m_bufferLock;
-
-protected:
-  virtual void Action(void);
-
-public:
-  cLiveStreamer(uint32_t timeout = 0);
-  virtual ~cLiveStreamer();
-
-  void Activate(bool On);
-
-  bool StreamChannel(const cChannel *channel, int priority, cxSocket *Socket, cResponsePacket* resp);
-  void SetReady() { m_streamReady = true; }
-  bool IsReady() { return m_streamReady; }
-  bool IsStarting() { return m_startup; }
-  bool IsAudioOnly() { return m_IsAudioOnly; }
-  bool IsMPEGPS() { return m_IsMPEGPS; }
-  void AddStream(sStream &stream);
-  void SetTpid(int tPid) { m_Tpid = tPid; }
-};
-
-#endif  // VNSI_RECEIVER_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.c	2013-03-12 10:51:22.000000000 +0000
@@ -147,6 +147,37 @@
   return true;
 }
 
+bool cResponsePacket::initOsd(uint32_t opCode, int32_t wnd, int32_t color, int32_t x0, int32_t y0, int32_t x1, int32_t y1)
+{
+  initBuffers();
+
+  uint32_t ul;
+  int32_t l;
+
+  ul =  htonl(VNSI_CHANNEL_OSD);               // stream OSD
+  memcpy(&buffer[0], &ul, sizeof(uint32_t));
+  ul = htonl(opCode);                          // OSD operation code
+  memcpy(&buffer[4], &ul, sizeof(uint32_t));
+  l = htonl(wnd);                              // Window
+  memcpy(&buffer[8], &l, sizeof(int32_t));
+  l = htonl(color);                            // Color
+  memcpy(&buffer[12], &l, sizeof(int32_t));
+  l = htonl(x0);                               // x0
+  memcpy(&buffer[16], &l, sizeof(int32_t));
+  l = htonl(y0);                               // y0
+  memcpy(&buffer[20], &l, sizeof(int32_t));
+  l = htonl(x1);                               // x1
+  memcpy(&buffer[24], &l, sizeof(int32_t));
+  l = htonl(y1);                               // y1
+  memcpy(&buffer[28], &l, sizeof(int32_t));
+  ul = 0;
+  memcpy(&buffer[userDataLenPosOSD], &ul, sizeof(uint32_t));
+
+  bufUsed = headerLengthOSD;
+
+  return true;
+}
+
 void cResponsePacket::finalise()
 {
   uint32_t ul = htonl(bufUsed - headerLength);
@@ -159,6 +190,11 @@
   memcpy(&buffer[userDataLenPosStream], &ul, sizeof(uint32_t));
 }
 
+void cResponsePacket::finaliseOSD()
+{
+  uint32_t ul = htonl(bufUsed - headerLengthOSD);
+  memcpy(&buffer[userDataLenPosOSD], &ul, sizeof(uint32_t));
+}
 
 bool cResponsePacket::copyin(const uint8_t* src, uint32_t len)
 {
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/responsepacket.h	2013-03-12 10:51:22.000000000 +0000
@@ -41,8 +41,10 @@
   bool initScan(uint32_t opCode);
   bool initStatus(uint32_t opCode);
   bool initStream(uint32_t opCode, uint32_t streamID, uint32_t duration, int64_t pts, int64_t dts);
+  bool initOsd(uint32_t opCode, int32_t wnd, int32_t color, int32_t x0, int32_t y0, int32_t x1, int32_t y1);
   void finalise();
   void finaliseStream();
+  void finaliseOSD();
   bool copyin(const uint8_t* src, uint32_t len);
   uint8_t* reserve(uint32_t len);
   bool unreserve(uint32_t len);
@@ -57,6 +59,7 @@
   uint8_t* getPtr() { return buffer; }
   uint32_t getLen() { return bufUsed; }
   uint32_t getStreamHeaderLength() { return headerLengthStream; } ;
+  uint32_t getOSDHeaderLength() { return headerLengthOSD; } ;
   void     setLen(uint32_t len) { bufUsed = len; }
 
 private:
@@ -71,6 +74,8 @@
   const static uint32_t userDataLenPos        = 8;
   const static uint32_t headerLengthStream    = 36;
   const static uint32_t userDataLenPosStream  = 32;
+  const static uint32_t headerLengthOSD       = 36;
+  const static uint32_t userDataLenPosOSD     = 32;
 };
 
 #endif // VNSI_RESPONSEPACKET_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,483 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *      Copyright (C) 2010, 2011 Alexander Pipelka
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <time.h>
+
+#include <vdr/channels.h>
+
+#include "config.h"
+#include "streamer.h"
+#include "cxsocket.h"
+#include "vnsicommand.h"
+#include "responsepacket.h"
+#include "vnsi.h"
+#include "videobuffer.h"
+
+
+// --- cLiveStreamer -------------------------------------------------
+
+cLiveStreamer::cLiveStreamer(uint32_t timeout)
+ : cThread("cLiveStreamer stream processor")
+ , m_scanTimeout(timeout)
+{
+  m_Channel         = NULL;
+  m_Socket          = NULL;
+  m_Frontend        = -1;
+  m_IsAudioOnly     = false;
+  m_IsMPEGPS        = false;
+  m_startup         = true;
+  m_SignalLost      = false;
+  m_IFrameSeen      = false;
+
+  memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+
+  if(m_scanTimeout == 0)
+    m_scanTimeout = VNSIServerConfig.stream_timeout;
+}
+
+cLiveStreamer::~cLiveStreamer()
+{
+  DEBUGLOG("Started to delete live streamer");
+
+  Cancel(5);
+
+  m_VideoInput.Close();
+  m_Demuxer.Close();
+  delete m_VideoBuffer;
+
+  if (m_Frontend >= 0)
+  {
+    close(m_Frontend);
+    m_Frontend = -1;
+  }
+
+  DEBUGLOG("Finished to delete live streamer");
+}
+
+void cLiveStreamer::Action(void)
+{
+  int ret;
+  sStreamPacket pkt;
+  bool requestStreamChange = false;
+  cTimeMs last_info(1000);
+
+  while (Running())
+  {
+    ret = m_Demuxer.Read(&pkt);
+    if (ret > 0)
+    {
+      if (pkt.pmtChange)
+      {
+        requestStreamChange = true;
+      }
+      if (pkt.data)
+      {
+        if (pkt.streamChange || requestStreamChange)
+          sendStreamChange();
+        requestStreamChange = false;
+        sendStreamPacket(&pkt);
+      }
+
+      // send signal info every 10 sec.
+      if(last_info.Elapsed() >= 10*1000)
+      {
+        last_info.Set(0);
+        sendSignalInfo();
+      }
+    }
+    else
+    {
+      // no data
+      if(m_last_tick.Elapsed() >= (uint64_t)(m_scanTimeout*1000))
+      {
+        INFOLOG("No Signal");
+        sendStreamStatus();
+        m_last_tick.Set(0);
+        m_SignalLost = true;
+      }
+    }
+  }
+  INFOLOG("exit streamer thread");
+}
+
+bool cLiveStreamer::StreamChannel(const cChannel *channel, int priority, cxSocket *Socket, cResponsePacket *resp)
+{
+  if (channel == NULL)
+  {
+    ERRORLOG("Starting streaming of channel without valid channel");
+    return false;
+  }
+
+  m_VideoBuffer = cVideoBuffer::Create();
+  m_Channel   = channel;
+  m_Socket    = Socket;
+  m_Device = cDevice::GetDevice(m_Channel, priority, true);
+
+  if (m_Channel && ((m_Channel->Source() >> 24) == 'V')) m_IsMPEGPS = true;
+
+  if (m_VideoInput.Open(channel, priority, m_VideoBuffer))
+  {
+    m_Demuxer.Open(*m_Channel, m_VideoBuffer);
+
+    // Send the OK response here, that it is before the Stream end message
+    resp->add_U32(VNSI_RET_OK);
+    resp->finalise();
+    m_Socket->write(resp->getPtr(), resp->getLen());
+
+    Activate(true);
+
+    INFOLOG("Successfully switched to channel %i - %s", m_Channel->Number(), m_Channel->Name());
+    return true;
+  }
+  else
+  {
+    ERRORLOG("Can't switch to channel %i - %s", m_Channel->Number(), m_Channel->Name());
+  }
+  return false;
+}
+
+inline void cLiveStreamer::Activate(bool On)
+{
+  if (On)
+  {
+    DEBUGLOG("VDR active, sending stream start message");
+    Start();
+  }
+  else
+  {
+    DEBUGLOG("VDR inactive, sending stream end message");
+    Cancel(5);
+  }
+}
+
+void cLiveStreamer::sendStreamPacket(sStreamPacket *pkt)
+{
+  if(pkt == NULL)
+    return;
+
+  if(pkt->size == 0)
+    return;
+
+  if (!m_streamHeader.initStream(VNSI_STREAM_MUXPKT, pkt->id, pkt->duration, pkt->pts, pkt->dts))
+  {
+    ERRORLOG("stream response packet init fail");
+    return;
+  }
+  m_streamHeader.setLen(m_streamHeader.getStreamHeaderLength() + pkt->size);
+  m_streamHeader.finaliseStream();
+
+  m_Socket->LockWrite();
+  m_Socket->write(m_streamHeader.getPtr(), m_streamHeader.getStreamHeaderLength(), -1, true);
+  m_Socket->write(pkt->data, pkt->size);
+  m_Socket->UnlockWrite();
+
+  m_last_tick.Set(0);
+  m_SignalLost = false;
+}
+
+void cLiveStreamer::sendStreamChange()
+{
+  cResponsePacket *resp = new cResponsePacket();
+  if (!resp->initStream(VNSI_STREAM_CHANGE, 0, 0, 0, 0))
+  {
+    ERRORLOG("stream response packet init fail");
+    delete resp;
+    return;
+  }
+
+  uint32_t FpsScale, FpsRate, Height, Width;
+  double Aspect;
+  uint32_t Channels, SampleRate, BitRate, BitsPerSample, BlockAlign;
+  for (cTSStream* stream = m_Demuxer.GetFirstStream(); stream; stream = m_Demuxer.GetNextStream())
+  {
+    resp->add_U32(stream->GetPID());
+    if (stream->Type() == stMPEG2AUDIO)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("MPEG2AUDIO");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+    else if (stream->Type() == stMPEG2VIDEO)
+    {
+      stream->GetVideoInformation(FpsScale, FpsRate, Height, Width, Aspect);
+      resp->add_String("MPEG2VIDEO");
+      resp->add_U32(FpsScale);
+      resp->add_U32(FpsRate);
+      resp->add_U32(Height);
+      resp->add_U32(Width);
+      resp->add_double(Aspect);
+    }
+    else if (stream->Type() == stAC3)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("AC3");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+    else if (stream->Type() == stH264)
+    {
+      stream->GetVideoInformation(FpsScale, FpsRate, Height, Width, Aspect);
+      resp->add_String("H264");
+      resp->add_U32(FpsScale);
+      resp->add_U32(FpsRate);
+      resp->add_U32(Height);
+      resp->add_U32(Width);
+      resp->add_double(Aspect);
+    }
+    else if (stream->Type() == stDVBSUB)
+    {
+      resp->add_String("DVBSUB");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(stream->CompositionPageId());
+      resp->add_U32(stream->AncillaryPageId());
+    }
+    else if (stream->Type() == stTELETEXT)
+    {
+      resp->add_String("TELETEXT");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(stream->CompositionPageId());
+      resp->add_U32(stream->AncillaryPageId());
+    }
+    else if (stream->Type() == stAACADTS)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("AAC");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+    else if (stream->Type() == stAACLATM)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("AACLATM");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+    else if (stream->Type() == stEAC3)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("EAC3");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+    else if (stream->Type() == stDTS)
+    {
+      stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
+      resp->add_String("DTS");
+      resp->add_String(stream->GetLanguage());
+      resp->add_U32(Channels);
+      resp->add_U32(SampleRate);
+      resp->add_U32(BlockAlign);
+      resp->add_U32(BitRate);
+      resp->add_U32(BitsPerSample);
+    }
+  }
+
+  resp->finaliseStream();
+  m_Socket->write(resp->getPtr(), resp->getLen());
+  delete resp;
+}
+
+void cLiveStreamer::sendSignalInfo()
+{
+  /* If no frontend is found m_Frontend is set to -2, in this case
+     return a empty signalinfo package */
+  if (m_Frontend == -2)
+  {
+    cResponsePacket *resp = new cResponsePacket();
+    if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
+    {
+      ERRORLOG("stream response packet init fail");
+      delete resp;
+      return;
+    }
+
+    resp->add_String(*cString::sprintf("Unknown"));
+    resp->add_String(*cString::sprintf("Unknown"));
+    resp->add_U32(0);
+    resp->add_U32(0);
+    resp->add_U32(0);
+    resp->add_U32(0);
+
+    resp->finaliseStream();
+    m_Socket->write(resp->getPtr(), resp->getLen());
+    delete resp;
+    return;
+  }
+
+  if (m_Channel && ((m_Channel->Source() >> 24) == 'V'))
+  {
+    if (m_Frontend < 0)
+    {
+      for (int i = 0; i < 8; i++)
+      {
+        m_DeviceString = cString::sprintf("/dev/video%d", i);
+        m_Frontend = open(m_DeviceString, O_RDONLY | O_NONBLOCK);
+        if (m_Frontend >= 0)
+        {
+          if (ioctl(m_Frontend, VIDIOC_QUERYCAP, &m_vcap) < 0)
+          {
+            ERRORLOG("cannot read analog frontend info.");
+            close(m_Frontend);
+            m_Frontend = -1;
+            memset(&m_vcap, 0, sizeof(m_vcap));
+            continue;
+          }
+          break;
+        }
+      }
+      if (m_Frontend < 0)
+        m_Frontend = -2;
+    }
+
+    if (m_Frontend >= 0)
+    {
+      cResponsePacket *resp = new cResponsePacket();
+      if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
+      {
+        ERRORLOG("stream response packet init fail");
+        delete resp;
+        return;
+      }
+      resp->add_String(*cString::sprintf("Analog #%s - %s (%s)", *m_DeviceString, (char *) m_vcap.card, m_vcap.driver));
+      resp->add_String("");
+      resp->add_U32(0);
+      resp->add_U32(0);
+      resp->add_U32(0);
+      resp->add_U32(0);
+
+      resp->finaliseStream();
+      m_Socket->write(resp->getPtr(), resp->getLen());
+      delete resp;
+    }
+  }
+  else
+  {
+    if (m_Frontend < 0)
+    {
+      m_DeviceString = cString::sprintf(FRONTEND_DEVICE, m_Device->CardIndex(), 0);
+      m_Frontend = open(m_DeviceString, O_RDONLY | O_NONBLOCK);
+      if (m_Frontend >= 0)
+      {
+        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0)
+        {
+          ERRORLOG("cannot read frontend info.");
+          close(m_Frontend);
+          m_Frontend = -2;
+          memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+          return;
+        }
+      }
+    }
+
+    if (m_Frontend >= 0)
+    {
+      cResponsePacket *resp = new cResponsePacket();
+      if (!resp->initStream(VNSI_STREAM_SIGNALINFO, 0, 0, 0, 0))
+      {
+        ERRORLOG("stream response packet init fail");
+        delete resp;
+        return;
+      }
+
+      fe_status_t status;
+      uint16_t fe_snr;
+      uint16_t fe_signal;
+      uint32_t fe_ber;
+      uint32_t fe_unc;
+
+      memset(&status, 0, sizeof(status));
+      ioctl(m_Frontend, FE_READ_STATUS, &status);
+
+      if (ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &fe_signal) == -1)
+        fe_signal = -2;
+      if (ioctl(m_Frontend, FE_READ_SNR, &fe_snr) == -1)
+        fe_snr = -2;
+      if (ioctl(m_Frontend, FE_READ_BER, &fe_ber) == -1)
+        fe_ber = -2;
+      if (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &fe_unc) == -1)
+        fe_unc = -2;
+
+      switch (m_Channel->Source() & cSource::st_Mask)
+      {
+        case cSource::stSat:
+          resp->add_String(*cString::sprintf("DVB-S%s #%d - %s", (m_FrontendInfo.caps & 0x10000000) ? "2" : "",  cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+          break;
+        case cSource::stCable:
+          resp->add_String(*cString::sprintf("DVB-C #%d - %s", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+          break;
+        case cSource::stTerr:
+          resp->add_String(*cString::sprintf("DVB-T #%d - %s", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+          break;
+      }
+      resp->add_String(*cString::sprintf("%s:%s:%s:%s:%s", (status & FE_HAS_LOCK) ? "LOCKED" : "-", (status & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (status & FE_HAS_CARRIER) ? "CARRIER" : "-", (status & FE_HAS_VITERBI) ? "VITERBI" : "-", (status & FE_HAS_SYNC) ? "SYNC" : "-"));
+      resp->add_U32(fe_snr);
+      resp->add_U32(fe_signal);
+      resp->add_U32(fe_ber);
+      resp->add_U32(fe_unc);
+
+      resp->finaliseStream();
+      m_Socket->write(resp->getPtr(), resp->getLen());
+      delete resp;
+    }
+  }
+}
+
+void cLiveStreamer::sendStreamStatus()
+{
+  cResponsePacket *resp = new cResponsePacket();
+  if (!resp->initStream(VNSI_STREAM_STATUS, 0, 0, 0, 0))
+  {
+    ERRORLOG("stream response packet init fail");
+    delete resp;
+    return;
+  }
+  resp->add_String("No Signal");
+  resp->finaliseStream();
+  m_Socket->write(resp->getPtr(), resp->getLen());
+  delete resp;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ *      vdr-plugin-vnsi - XBMC server plugin for VDR
+ *
+ *      Copyright (C) 2010 Alwin Esch (Team XBMC)
+ *      Copyright (C) 2010, 2011 Alexander Pipelka
+ *
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef VNSI_RECEIVER_H
+#define VNSI_RECEIVER_H
+
+#include <linux/dvb/frontend.h>
+#include <linux/videodev2.h>
+#include <vdr/channels.h>
+#include <vdr/device.h>
+#include <vdr/receiver.h>
+#include <vdr/thread.h>
+#include <list>
+
+#include "parser.h"
+#include "responsepacket.h"
+#include "demuxer.h"
+#include "videoinput.h"
+
+class cxSocket;
+class cChannel;
+class cTSParser;
+class cResponsePacket;
+class cVideoBuffer;
+class cVideoInput;
+
+class cLiveStreamer : public cThread
+{
+private:
+  friend class cParser;
+  friend class cLivePatFilter;
+  friend class cLiveReceiver;
+
+  void sendStreamPacket(sStreamPacket *pkt);
+  void sendStreamChange();
+  void sendSignalInfo();
+  void sendStreamStatus();
+
+  const cChannel   *m_Channel;                      /*!> Channel to stream */
+  cDevice          *m_Device;
+  cxSocket         *m_Socket;                       /*!> The socket class to communicate with client */
+  int               m_Frontend;                     /*!> File descriptor to access used receiving device  */
+  dvb_frontend_info m_FrontendInfo;                 /*!> DVB Information about the receiving device (DVB only) */
+  v4l2_capability   m_vcap;                         /*!> PVR Information about the receiving device (pvrinput only) */
+  cString           m_DeviceString;                 /*!> The name of the receiving device */
+  bool              m_startup;
+  bool              m_IsAudioOnly;                  /*!> Set to true if streams contains only audio */
+  bool              m_IsMPEGPS;                     /*!> TS Stream contains MPEG PS data like from pvrinput */
+  uint32_t          m_scanTimeout;                  /*!> Channel scanning timeout (in seconds) */
+  cTimeMs           m_last_tick;
+  bool              m_SignalLost;
+  bool              m_IFrameSeen;
+  cResponsePacket   m_streamHeader;
+  cVNSIDemuxer      m_Demuxer;
+  cVideoBuffer     *m_VideoBuffer;
+  cVideoInput       m_VideoInput;
+
+protected:
+  virtual void Action(void);
+
+public:
+  cLiveStreamer(uint32_t timeout = 0);
+  virtual ~cLiveStreamer();
+
+  void Activate(bool On);
+
+  bool StreamChannel(const cChannel *channel, int priority, cxSocket *Socket, cResponsePacket* resp);
+  bool IsStarting() { return m_startup; }
+  bool IsAudioOnly() { return m_IsAudioOnly; }
+  bool IsMPEGPS() { return m_IsMPEGPS; }
+};
+
+#endif  // VNSI_RECEIVER_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,107 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "videobuffer.h"
+
+#include <vdr/ringbuffer.h>
+#include <vdr/remux.h>
+
+class cVideoBufferSimple : public cVideoBuffer
+{
+friend class cVideoBuffer;
+public:
+  virtual void Put(uint8_t *buf, int size);
+  virtual int Read(uint8_t **buf, int size);
+
+protected:
+  cVideoBufferSimple();
+  virtual ~cVideoBufferSimple();
+  cRingBufferLinear *m_Buffer;
+  int m_BytesConsumed;
+};
+
+cVideoBufferSimple::cVideoBufferSimple()
+{
+  m_Buffer = new cRingBufferLinear(MEGABYTE(3), TS_SIZE * 2, false);
+  m_Buffer->SetTimeouts(0, 100);
+  m_BytesConsumed = 0;
+}
+
+cVideoBufferSimple::~cVideoBufferSimple()
+{
+  if (m_Buffer)
+    delete m_Buffer;
+}
+
+void cVideoBufferSimple::Put(uint8_t *buf, int size)
+{
+  m_Buffer->Put(buf, size);
+}
+
+int cVideoBufferSimple::Read(uint8_t **buf, int size)
+{
+  int  readBytes;
+  if (m_BytesConsumed)
+  {
+    m_Buffer->Del(m_BytesConsumed);
+  }
+  m_BytesConsumed = 0;
+  *buf = m_Buffer->Get(readBytes);
+  if (!(*buf) || readBytes < TS_SIZE)
+  {
+    usleep(100);
+    return 0;
+  }
+  /* Make sure we are looking at a TS packet */
+  while (readBytes > TS_SIZE)
+  {
+    if ((*buf)[0] == TS_SYNC_BYTE && (*buf)[TS_SIZE] == TS_SYNC_BYTE)
+      break;
+    m_BytesConsumed++;
+    (*buf)++;
+    readBytes--;
+  }
+
+  if ((*buf)[0] != TS_SYNC_BYTE)
+  {
+    m_Buffer->Del(m_BytesConsumed);
+    m_BytesConsumed = 0;
+    return 0;
+  }
+
+  m_BytesConsumed += TS_SIZE;
+  return TS_SIZE;
+}
+
+//-----------------------------------------------------------------------------
+
+cVideoBuffer::cVideoBuffer()
+{
+}
+
+cVideoBuffer::~cVideoBuffer()
+{
+}
+
+cVideoBuffer* cVideoBuffer::Create()
+{
+  cVideoBuffer *buffer = new cVideoBufferSimple();
+  return buffer;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+class cVideoBuffer
+{
+public:
+  virtual ~cVideoBuffer();
+  static cVideoBuffer* Create();
+  virtual void Put(uint8_t *buf, int size) = 0;
+  virtual int Read(uint8_t **buf, int size) = 0;
+protected:
+  cVideoBuffer();
+};
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,540 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+#include "config.h"
+#include "videoinput.h"
+#include "videobuffer.h"
+#include "vnsi.h"
+
+#include <vdr/remux.h>
+#include <vdr/channels.h>
+#include <vdr/device.h>
+#include <vdr/receiver.h>
+#include <libsi/section.h>
+#include <libsi/descriptor.h>
+
+// --- cLiveReceiver -------------------------------------------------
+
+class cLiveReceiver: public cReceiver
+{
+public:
+  cLiveReceiver(cVideoInput *VideoInput, const cChannel *Channel, int Priority);
+  virtual ~cLiveReceiver();
+  cChannel m_PmtChannel;
+
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+
+  cVideoInput *m_VideoInput;
+};
+
+cLiveReceiver::cLiveReceiver(cVideoInput *VideoInput, const cChannel *Channel, int Priority)
+ : cReceiver(Channel, Priority)
+ , m_VideoInput(VideoInput)
+{
+  SetPids(NULL);
+}
+
+cLiveReceiver::~cLiveReceiver()
+{
+
+}
+
+//void cLiveReceiver
+void cLiveReceiver::Receive(uchar *Data, int Length)
+{
+  m_VideoInput->Receive(Data, Length);
+}
+
+inline void cLiveReceiver::Activate(bool On)
+{
+  DEBUGLOG("activate live receiver: %d", On);
+}
+
+// --- cLivePatFilter ----------------------------------------------------
+
+class cLivePatFilter : public cFilter
+{
+private:
+  int             m_pmtPid;
+  int             m_pmtSid;
+  int             m_pmtVersion;
+  const cChannel *m_Channel;
+  cVideoInput    *m_VideoInput;
+
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+
+public:
+  cLivePatFilter(cVideoInput *VideoInput, const cChannel *Channel);
+};
+
+cLivePatFilter::cLivePatFilter(cVideoInput *VideoInput, const cChannel *Channel)
+{
+  DEBUGLOG("cStreamdevPatFilter(\"%s\")", Channel->Name());
+  m_Channel     = Channel;
+  m_VideoInput  = VideoInput;
+  m_pmtPid      = 0;
+  m_pmtSid      = 0;
+  m_pmtVersion  = -1;
+  Set(0x00, 0x00);  // PAT
+}
+
+void cLivePatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  if (Pid == 0x00)
+  {
+    if (Tid == 0x00)
+    {
+      SI::PAT pat(Data, false);
+      if (!pat.CheckCRCAndParse())
+        return;
+      SI::PAT::Association assoc;
+      for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); )
+      {
+        if (!assoc.isNITPid())
+        {
+          const cChannel *Channel =  Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId());
+          if (Channel && (Channel == m_Channel))
+          {
+            int prevPmtPid = m_pmtPid;
+            if (0 != (m_pmtPid = assoc.getPid()))
+            {
+              if (m_pmtPid != prevPmtPid)
+              {
+                m_pmtSid = assoc.getServiceId();
+                Add(m_pmtPid, 0x02);
+                m_pmtVersion = -1;
+                break;
+              }
+              return;
+            }
+          }
+        }
+      }
+    }
+  }
+  else if (Pid == m_pmtPid && Tid == SI::TableIdPMT && Source() && Transponder())
+  {
+    SI::PMT pmt(Data, false);
+    if (!pmt.CheckCRCAndParse())
+      return;
+    if (pmt.getServiceId() != m_pmtSid)
+      return; // skip broken PMT records
+    if (m_pmtVersion != -1)
+    {
+      if (m_pmtVersion != pmt.getVersionNumber())
+      {
+        cFilter::Del(m_pmtPid, 0x02);
+        m_pmtPid = 0; // this triggers PAT scan
+      }
+      return;
+    }
+    m_pmtVersion = pmt.getVersionNumber();
+
+    cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
+    if (Channel) {
+       // Scan the stream-specific loop:
+       SI::PMT::Stream stream;
+       int Vpid = 0;
+       int Ppid = 0;
+       int Vtype = 0;
+       int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
+       int Atypes[MAXAPIDS + 1] = { 0 };
+       int Dpids[MAXDPIDS + 1] = { 0 };
+       int Dtypes[MAXDPIDS + 1] = { 0 };
+       int Spids[MAXSPIDS + 1] = { 0 };
+       uchar SubtitlingTypes[MAXSPIDS + 1] = { 0 };
+       uint16_t CompositionPageIds[MAXSPIDS + 1] = { 0 };
+       uint16_t AncillaryPageIds[MAXSPIDS + 1] = { 0 };
+       char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
+       char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
+       char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
+       int Tpid = 0;
+       int NumApids = 0;
+       int NumDpids = 0;
+       int NumSpids = 0;
+       for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
+           bool ProcessCaDescriptors = false;
+           int esPid = stream.getPid();
+           switch (stream.getStreamType()) {
+             case 1: // STREAMTYPE_11172_VIDEO
+             case 2: // STREAMTYPE_13818_VIDEO
+             case 0x1B: // MPEG4
+                     Vpid = esPid;
+                     Ppid = pmt.getPCRPid();
+                     Vtype = stream.getStreamType();
+                     ProcessCaDescriptors = true;
+                     break;
+             case 3: // STREAMTYPE_11172_AUDIO
+             case 4: // STREAMTYPE_13818_AUDIO
+             case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport syntax
+             case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
+                     {
+                     if (NumApids < MAXAPIDS) {
+                        Apids[NumApids] = esPid;
+                        Atypes[NumApids] = stream.getStreamType();
+                        SI::Descriptor *d;
+                        for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                            switch (d->getDescriptorTag()) {
+                              case SI::ISO639LanguageDescriptorTag: {
+                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                   SI::ISO639LanguageDescriptor::Language l;
+                                   char *s = ALangs[NumApids];
+                                   int n = 0;
+                                   for (SI::Loop::Iterator it; ld->languageLoop.getNext(l, it); ) {
+                                       if (*ld->languageCode != '-') { // some use "---" to indicate "none"
+                                          if (n > 0)
+                                             *s++ = '+';
+                                          strn0cpy(s, I18nNormalizeLanguageCode(l.languageCode), MAXLANGCODE1);
+                                          s += strlen(s);
+                                          if (n++ > 1)
+                                             break;
+                                          }
+                                       }
+                                   }
+                                   break;
+                              default: ;
+                              }
+                            delete d;
+                            }
+                        NumApids++;
+                        }
+                     ProcessCaDescriptors = true;
+                     }
+                     break;
+             case 5: // STREAMTYPE_13818_PRIVATE
+             case 6: // STREAMTYPE_13818_PES_PRIVATE
+             //XXX case 8: // STREAMTYPE_13818_DSMCC
+                     {
+                     int dpid = 0;
+                     int dtype = 0;
+                     char lang[MAXLANGCODE1] = { 0 };
+                     SI::Descriptor *d;
+                     for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                         switch (d->getDescriptorTag()) {
+                           case SI::AC3DescriptorTag:
+                           case SI::EnhancedAC3DescriptorTag:
+                                dpid = esPid;
+                                dtype = d->getDescriptorTag();
+                                ProcessCaDescriptors = true;
+                                break;
+                           case SI::SubtitlingDescriptorTag:
+                                if (NumSpids < MAXSPIDS) {
+                                   Spids[NumSpids] = esPid;
+                                   SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
+                                   SI::SubtitlingDescriptor::Subtitling sub;
+                                   char *s = SLangs[NumSpids];
+                                   int n = 0;
+                                   for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
+                                       if (sub.languageCode[0]) {
+                                          SubtitlingTypes[NumSpids] = sub.getSubtitlingType();
+                                          CompositionPageIds[NumSpids] = sub.getCompositionPageId();
+                                          AncillaryPageIds[NumSpids] = sub.getAncillaryPageId();
+                                          if (n > 0)
+                                             *s++ = '+';
+                                          strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
+                                          s += strlen(s);
+                                          if (n++ > 1)
+                                             break;
+                                          }
+                                       }
+                                   NumSpids++;
+                                   }
+                                break;
+                           case SI::TeletextDescriptorTag:
+                                Tpid = esPid;
+                                break;
+                           case SI::ISO639LanguageDescriptorTag: {
+                                SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                }
+                                break;
+                           default: ;
+                           }
+                         delete d;
+                         }
+                     if (dpid) {
+                        if (NumDpids < MAXDPIDS) {
+                           Dpids[NumDpids] = dpid;
+                           Dtypes[NumDpids] = dtype;
+                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                           NumDpids++;
+                           }
+                        }
+                     }
+                     break;
+             case 0x80: // STREAMTYPE_USER_PRIVATE
+#if APIVERSNUM >= 10728
+                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
+#endif
+                     { // DigiCipher II VIDEO (ANSI/SCTE 57)
+                        Vpid = esPid;
+                        Ppid = pmt.getPCRPid();
+                        Vtype = 0x02; // compression based upon MPEG-2
+                        ProcessCaDescriptors = true;
+                        break;
+                        }
+                     // fall through
+             case 0x81: // STREAMTYPE_USER_PRIVATE
+#if APIVERSNUM >= 10728
+                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
+#endif
+                     { // ATSC A/53 AUDIO (ANSI/SCTE 57)
+                        char lang[MAXLANGCODE1] = { 0 };
+                        SI::Descriptor *d;
+                        for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                            switch (d->getDescriptorTag()) {
+                              case SI::ISO639LanguageDescriptorTag: {
+                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                   strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                   }
+                                   break;
+                              default: ;
+                              }
+                           delete d;
+                           }
+                        if (NumDpids < MAXDPIDS) {
+                           Dpids[NumDpids] = esPid;
+                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                           NumDpids++;
+                           }
+                        ProcessCaDescriptors = true;
+                        break;
+                        }
+                     // fall through
+             case 0x82: // STREAMTYPE_USER_PRIVATE
+#if APIVERSNUM >= 10728
+                     if (Setup.StandardCompliance == STANDARD_ANSISCTE)
+#endif
+                     { // STANDARD SUBTITLE (ANSI/SCTE 27)
+                        //TODO
+                        break;
+                        }
+                     // fall through
+             case 0x83 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+                     {
+                     char lang[MAXLANGCODE1] = { 0 };
+                     bool IsAc3 = false;
+                     SI::Descriptor *d;
+                     for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                         switch (d->getDescriptorTag()) {
+                           case SI::RegistrationDescriptorTag: {
+                                SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d;
+                                // http://www.smpte-ra.org/mpegreg/mpegreg.html
+                                switch (rd->getFormatIdentifier()) {
+                                  case 0x41432D33: // 'AC-3'
+                                       IsAc3 = true;
+                                       break;
+                                  default:
+                                       //printf("Format identifier: 0x%08X (pid: %d)\n", rd->getFormatIdentifier(), esPid);
+                                       break;
+                                  }
+                                }
+                                break;
+                           case SI::ISO639LanguageDescriptorTag: {
+                                SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                }
+                                break;
+                           default: ;
+                           }
+                        delete d;
+                        }
+                     if (IsAc3) {
+                        if (NumDpids < MAXDPIDS) {
+                           Dpids[NumDpids] = esPid;
+                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                           NumDpids++;
+                           }
+                        ProcessCaDescriptors = true;
+                        }
+                     }
+                     break;
+             default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());
+             }
+           }
+       DEBUGLOG("Pat/Pmt Filter received pmt change");
+       cChannel *pmtChannel = m_VideoInput->PmtChannel();
+       pmtChannel->Modification();
+       pmtChannel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+       pmtChannel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
+       m_VideoInput->PmtChange(pmtChannel->Modification(CHANNELMOD_PIDS));
+    }
+  }
+}
+
+// ----------------------------------------------------------------------------
+
+cVideoInput::cVideoInput()
+{
+  m_Device = NULL;;
+  m_PatFilter = NULL;
+  m_Receiver = NULL;;
+  m_Channel = NULL;
+  m_VideoBuffer = NULL;
+  m_Priority = 0;
+  m_PmtChange = false;
+}
+
+cVideoInput::~cVideoInput()
+{
+  Close();
+}
+
+bool cVideoInput::Open(const cChannel *channel, int priority, cVideoBuffer *videoBuffer)
+{
+  m_VideoBuffer = videoBuffer;
+  m_Channel = channel;
+  m_Priority = priority;
+  m_Device = cDevice::GetDevice(m_Channel, m_Priority, true);
+
+  if (m_Device != NULL)
+  {
+    DEBUGLOG("Successfully found following device: %p (%d) for receiving", m_Device, m_Device ? m_Device->CardIndex() + 1 : 0);
+
+    if (m_Device->SwitchChannel(m_Channel, false))
+    {
+      DEBUGLOG("Creating new live Receiver");
+      m_SeenPmt = false;
+      m_PatFilter = new cLivePatFilter(this, m_Channel);
+      m_Receiver0 = new cLiveReceiver(this, m_Channel, m_Priority);
+      m_Receiver = new cLiveReceiver(this, m_Channel, m_Priority);
+      m_Device->AttachReceiver(m_Receiver0);
+      m_Device->AttachFilter(m_PatFilter);
+      Start();
+      return true;
+    }
+  }
+  return false;
+}
+
+void cVideoInput::Close()
+{
+  Cancel(5);
+
+  if (m_Device)
+  {
+    if (m_Receiver)
+    {
+      DEBUGLOG("Detaching Live Receiver");
+      m_Device->Detach(m_Receiver);
+    }
+    else
+    {
+      DEBUGLOG("No live receiver present");
+    }
+
+    if (m_Receiver0)
+    {
+      DEBUGLOG("Detaching Live Receiver0");
+      m_Device->Detach(m_Receiver0);
+    }
+    else
+    {
+      DEBUGLOG("No live receiver present");
+    }
+
+    if (m_PatFilter)
+    {
+      DEBUGLOG("Detaching Live Filter");
+      m_Device->Detach(m_PatFilter);
+    }
+    else
+    {
+      DEBUGLOG("No live filter present");
+    }
+
+    if (m_Receiver)
+    {
+      DEBUGLOG("Deleting Live Receiver");
+      DELETENULL(m_Receiver);
+    }
+
+    if (m_Receiver0)
+    {
+      DEBUGLOG("Deleting Live Receiver0");
+      DELETENULL(m_Receiver0);
+    }
+
+    if (m_PatFilter)
+    {
+      DEBUGLOG("Deleting Live Filter");
+      DELETENULL(m_PatFilter);
+    }
+  }
+}
+
+cChannel *cVideoInput::PmtChannel()
+{
+  return &m_Receiver->m_PmtChannel;
+}
+
+void cVideoInput::PmtChange(int pidChange)
+{
+  if (pidChange)
+  {
+    INFOLOG("Video Input - new pmt, attaching receiver");
+    m_Device->Detach(m_Receiver);
+    m_Receiver->SetPids(NULL);
+    m_Receiver->SetPids(&m_Receiver->m_PmtChannel);
+    m_Receiver->AddPid(m_Receiver->m_PmtChannel.Tpid());
+    m_PmtChange = true;
+    m_Device->AttachReceiver(m_Receiver);
+    m_SeenPmt = true;
+  }
+}
+
+inline void cVideoInput::Receive(uchar *data, int length)
+{
+  if (m_PmtChange)
+  {
+     // generate pat/pmt so we can configure parsers later
+     cPatPmtGenerator patPmtGenerator(&m_Receiver->m_PmtChannel);
+     m_VideoBuffer->Put(patPmtGenerator.GetPat(), TS_SIZE);
+     int Index = 0;
+     while (uchar *pmt = patPmtGenerator.GetPmt(Index))
+       m_VideoBuffer->Put(pmt, TS_SIZE);
+     m_PmtChange = false;
+  }
+  m_VideoBuffer->Put(data, length);
+}
+
+void cVideoInput::Action()
+{
+  cTimeMs starttime;
+
+  while (Running())
+  {
+    if (starttime.Elapsed() > (unsigned int)PmtTimeout*1000)
+    {
+      INFOLOG("VideoInput: no pat/pmt within timeout, falling back to channel pids");
+      m_Receiver->m_PmtChannel = *m_Channel;
+      PmtChange(true);
+    }
+    if (m_SeenPmt)
+      break;
+
+    usleep(1000);
+  }
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videoinput.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <vdr/thread.h>
+
+class cLivePatFilter;
+class cLiveReceiver;
+class cVideoBuffer;
+class cChannel;
+class cDevice;
+
+class cVideoInput : public cThread
+{
+friend class cLivePatFilter;
+friend class cLiveReceiver;
+public:
+  cVideoInput();
+  virtual ~cVideoInput();
+  bool Open(const cChannel *channel, int priority, cVideoBuffer *videoBuffer);
+  void Close();
+
+protected:
+  virtual void Action(void);
+  void PmtChange(int pidChange);
+  cChannel *PmtChannel();
+  void Receive(uchar *data, int length);
+  cDevice          *m_Device;
+  cLivePatFilter   *m_PatFilter;
+  cLiveReceiver    *m_Receiver;
+  cLiveReceiver    *m_Receiver0;
+  const cChannel   *m_Channel;
+  cVideoBuffer     *m_VideoBuffer;
+  int               m_Priority;
+  bool              m_PmtChange;
+  bool              m_SeenPmt;
+};
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h	2012-12-11 01:00:24.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h	2013-03-12 10:51:22.000000000 +0000
@@ -27,7 +27,7 @@
 #include <vdr/plugin.h>
 #include "vnsiserver.h"
 
-static const char *VERSION        = "0.9.0";
+static const char *VERSION        = "0.9.1";
 static const char *DESCRIPTION    = "VDR-Network-Streaming-Interface (VNSI) Server";
 
 extern int PmtTimeout;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.c	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.c	2013-03-12 10:51:22.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <map>
 
 #include <vdr/recording.h>
 #include <vdr/channels.h>
@@ -38,9 +39,10 @@
 #include "vnsicommand.h"
 #include "recordingscache.h"
 #include "vnsiclient.h"
-#include "receiver.h"
+#include "streamer.h"
 #include "vnsiserver.h"
 #include "recplayer.h"
+#include "vnsiosd.h"
 #include "requestpacket.h"
 #include "responsepacket.h"
 #include "hash.h"
@@ -76,9 +78,9 @@
   m_resp                    = NULL;
   m_processSCAN_Response    = NULL;
   m_processSCAN_Socket      = NULL;
+  m_Osd                     = NULL;
 
-
-  m_socket.set_handle(fd);
+  m_socket.SetHandle(fd);
 
   Start();
 }
@@ -94,7 +96,6 @@
 
 void cVNSIClient::Action(void)
 {
-  uint32_t kaTimeStamp;
   uint32_t channelID;
   uint32_t requestID;
   uint32_t opcode;
@@ -156,23 +157,6 @@
 
       processRequest(req);
     }
-    else if (channelID == 3)
-    {
-      if (!m_socket.read((uint8_t*)&kaTimeStamp, sizeof(uint32_t), 1000)) break;
-      kaTimeStamp = ntohl(kaTimeStamp);
-
-      uint8_t buffer[8];
-      uint32_t ul;
-      ul = htonl(3); // KA CHANNEL
-      memcpy(&buffer[0], &ul, sizeof(uint32_t));
-      ul = htonl(kaTimeStamp);
-      memcpy(&buffer[4], &ul, sizeof(uint32_t));
-      if (!m_socket.write(buffer, 8))
-      {
-        ERRORLOG("Could not send back KA reply");
-        break;
-      }
-    }
     else
     {
       ERRORLOG("Incoming channel number unknown");
@@ -183,6 +167,13 @@
   /* If thread is ended due to closed connection delete a
      possible running stream here */
   StopChannelStreaming();
+
+  // Shutdown OSD
+  if (m_Osd)
+  {
+    delete m_Osd;
+    m_Osd = NULL;
+  }
 }
 
 bool cVNSIClient::StartChannelStreaming(const cChannel *channel, uint32_t timeout)
@@ -264,6 +255,52 @@
   delete resp;
 }
 
+void cVNSIClient::EpgChange()
+{
+  cMutexLock lock(&m_msgLock);
+
+  if (!m_StatusInterfaceEnabled)
+    return;
+
+  cSchedulesLock MutexLock;
+  const cSchedules *schedules = cSchedules::Schedules(MutexLock);
+  if (!schedules)
+    return;
+
+  std::map<int, time_t>::iterator it;
+  for (const cSchedule *schedule = schedules->First(); schedule; schedule = schedules->Next(schedule))
+  {
+    cEvent *lastEvent =  schedule->Events()->Last();
+    if (!lastEvent)
+      continue;
+
+    uint32_t channelId = CreateStringHash(schedule->ChannelID().ToString());
+    it = m_epgUpdate.find(channelId);
+    if (it == m_epgUpdate.end())
+    {
+      continue;
+    }
+
+    if (it->second >= lastEvent->StartTime())
+      continue;
+
+    cResponsePacket *resp = new cResponsePacket();
+    if (!resp->initStatus(VNSI_STATUS_EPGCHANGE))
+    {
+      delete resp;
+      return;
+    }
+    resp->add_U32(channelId);
+    resp->finalise();
+    m_socket.write(resp->getPtr(), resp->getLen());
+    delete resp;
+
+    const cChannel *channel = FindChannelByUID(channelId);
+    if (channel)
+      INFOLOG("Trigger EPG update for channel %s", channel->Name());
+  }
+}
+
 void cVNSIClient::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
 {
   cMutexLock lock(&m_msgLock);
@@ -506,6 +543,19 @@
     case VNSI_SCAN_STOP:
       result = processSCAN_Stop();
       break;
+
+    /** OPCODE 160 - 179: VNSI network functions for OSD */
+    case VNSI_OSD_CONNECT:
+      result = processOSD_Connect();
+      break;
+
+    case VNSI_OSD_DISCONNECT:
+      result = processOSD_Disconnect();
+      break;
+
+    case VNSI_OSD_HITKEY:
+      result = processOSD_Hitkey();
+      break;
   }
 
   delete m_resp;
@@ -1532,6 +1582,7 @@
 
   cSchedulesLock MutexLock;
   const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
+  m_epgUpdate[channelUID] = 0;
   if (!Schedules)
   {
     m_resp->add_U32(0);
@@ -1623,6 +1674,11 @@
   m_resp->finalise();
   m_socket.write(m_resp->getPtr(), m_resp->getLen());
 
+  cEvent *lastEvent =  Schedule->Events()->Last();
+  if (lastEvent)
+  {
+    m_epgUpdate[channelUID] = lastEvent->StartTime();
+  }
   DEBUGLOG("written schedules packet");
 
   return true;
@@ -1881,3 +1937,38 @@
   m_processSCAN_Socket->write(resp->getPtr(), resp->getLen());
   delete resp;
 }
+
+bool cVNSIClient::processOSD_Connect() /* OPCODE 160 */
+{
+  m_Osd = new cVnsiOsdProvider(&m_socket);
+  int osdWidth, osdHeight;
+  double aspect;
+  cDevice::PrimaryDevice()->GetOsdSize(osdWidth, osdHeight, aspect);
+  m_resp->add_U32(osdWidth);
+  m_resp->add_U32(osdHeight);
+  m_resp->finalise();
+  m_socket.write(m_resp->getPtr(), m_resp->getLen());
+
+  m_Osd = new cVnsiOsdProvider(&m_socket);
+  return true;
+}
+
+bool cVNSIClient::processOSD_Disconnect() /* OPCODE 161 */
+{
+  if (m_Osd)
+  {
+    delete m_Osd;
+    m_Osd = NULL;
+  }
+  return true;
+}
+
+bool cVNSIClient::processOSD_Hitkey() /* OPCODE 162 */
+{
+  if (m_Osd)
+  {
+    unsigned int key = m_req->extract_U32();
+    cVnsiOsdProvider::SendKey(key);
+  }
+  return true;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.h	2013-03-12 10:51:22.000000000 +0000
@@ -44,6 +44,7 @@
 class cResponsePacket;
 class cRecPlayer;
 class cCmdControl;
+class cVnsiOsdProvider;
 
 class cVNSIClient : public cThread
                   , public cStatus
@@ -64,6 +65,8 @@
   uint32_t         m_protocolVersion;
   cMutex           m_msgLock;
   static cMutex    m_timerLock;
+  cVnsiOsdProvider *m_Osd;
+  std::map<int, time_t> m_epgUpdate;
 
 protected:
 
@@ -83,6 +86,7 @@
   void ChannelChange();
   void RecordingsChange();
   void TimerChange();
+  void EpgChange();
 
   unsigned int GetID() { return m_Id; }
 
@@ -163,6 +167,9 @@
   static cResponsePacket *m_processSCAN_Response;
   static cxSocket *m_processSCAN_Socket;
 
+  bool processOSD_Connect();
+  bool processOSD_Disconnect();
+  bool processOSD_Hitkey();
 };
 
 #endif // VNSI_CLIENT_H
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsicommand.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsicommand.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsicommand.h	2012-11-16 14:47:13.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsicommand.h	2013-03-12 10:51:22.000000000 +0000
@@ -36,7 +36,7 @@
 #define VNSI_CHANNEL_NETLOG           4
 #define VNSI_CHANNEL_STATUS           5
 #define VNSI_CHANNEL_SCAN             6
-
+#define VNSI_CHANNEL_OSD              7
 
 /** Response packets operation codes */
 
@@ -90,6 +90,10 @@
 #define VNSI_SCAN_START            143
 #define VNSI_SCAN_STOP             144
 
+/* OPCODE 160 - 179: VNSI network functions for channel scanning */
+#define VNSI_OSD_CONNECT           160
+#define VNSI_OSD_DISCONNECT        161
+#define VNSI_OSD_HITKEY            162
 
 /** Stream packet types (server -> client) */
 #define VNSI_STREAM_CHANGE       1
@@ -108,12 +112,21 @@
 #define VNSI_SCANNER_FINISHED    6
 #define VNSI_SCANNER_STATUS      7
 
+/** OSD packet types (server -> client) */
+#define VNSI_OSD_MOVEWINDOW      1
+#define VNSI_OSD_CLEAR           2
+#define VNSI_OSD_OPEN            3
+#define VNSI_OSD_CLOSE           4
+#define VNSI_OSD_SETPALETTE      5
+#define VNSI_OSD_SETBLOCK        6
+
 /** Status packet types (server -> client) */
 #define VNSI_STATUS_TIMERCHANGE      1
 #define VNSI_STATUS_RECORDING        2
 #define VNSI_STATUS_MESSAGE          3
 #define VNSI_STATUS_CHANNELCHANGE    4
 #define VNSI_STATUS_RECORDINGSCHANGE 5
+#define VNSI_STATUS_EPGCHANGE        6
 
 /** Packet return codes */
 #define VNSI_RET_OK              0
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,337 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+#include "vnsiosd.h"
+#include "vnsicommand.h"
+#include "responsepacket.h"
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/unistd.h>
+#include <vdr/tools.h>
+#include <vdr/remote.h>
+#include "cxsocket.h"
+
+#define ACTION_NONE                    0
+#define ACTION_MOVE_LEFT               1
+#define ACTION_MOVE_RIGHT              2
+#define ACTION_MOVE_UP                 3
+#define ACTION_MOVE_DOWN               4
+#define ACTION_SELECT_ITEM             7
+#define ACTION_PREVIOUS_MENU          10
+
+#define REMOTE_0                    58  // remote keys 0-9. are used by multiple windows
+#define REMOTE_1                    59  // for example in videoFullScreen.xml window id=2005 you can
+#define REMOTE_2                    60  // enter time (mmss) to jump to particular point in the movie
+#define REMOTE_3                    61
+#define REMOTE_4                    62  // with spincontrols you can enter 3digit number to quickly set
+#define REMOTE_5                    63  // spincontrol to desired value
+#define REMOTE_6                    64
+#define REMOTE_7                    65
+#define REMOTE_8                    66
+#define REMOTE_9                    67
+#define ACTION_NAV_BACK             92
+
+#define ACTION_TELETEXT_RED           215 // Teletext Color buttons to control TopText
+#define ACTION_TELETEXT_GREEN         216 //    "       "      "    "     "       "
+#define ACTION_TELETEXT_YELLOW        217 //    "       "      "    "     "       "
+#define ACTION_TELETEXT_BLUE          218 //    "       "      "    "     "       "
+
+
+// --- cVnsiOsd -----------------------------------------------------------
+
+#define MAXNUMWINDOWS 16 // OSD windows are counted 0...15
+#define MAXOSDMEMORY  1024000 // number of bytes available to the OSD
+
+class cVnsiOsd : public cOsd
+{
+private:
+  int osdMem;
+  bool shown;
+  void Cmd(int cmd, int wnd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL, int size = 0);
+protected:
+  virtual void SetActive(bool On);
+public:
+  cVnsiOsd(int Left, int Top, uint Level);
+  virtual ~cVnsiOsd();
+  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+  virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
+  virtual void Flush(void);
+};
+
+cVnsiOsd::cVnsiOsd(int Left, int Top, uint Level)
+:cOsd(Left, Top, Level)
+{
+  shown = false;
+  osdMem = MAXOSDMEMORY;
+  DEBUGLOG("osd created. left: %d, top: %d", Left, Top);
+}
+
+cVnsiOsd::~cVnsiOsd()
+{
+  SetActive(false);
+}
+
+void cVnsiOsd::SetActive(bool On)
+{
+  if (On != Active())
+  {
+    cOsd::SetActive(On);
+    if (On)
+    {
+      // must clear all windows here to avoid flashing effects - doesn't work if done
+      // in Flush() only for the windows that are actually used...
+      for (int i = 0; i < MAXNUMWINDOWS; i++)
+      {
+        Cmd(VNSI_OSD_CLEAR, i);
+      }
+      if (GetBitmap(0)) // only flush here if there are already bitmaps
+        Flush();
+    }
+    else if (shown)
+    {
+      for (int i = 0; GetBitmap(i); i++)
+      {
+        Cmd(VNSI_OSD_CLOSE, i);
+      }
+      shown = false;
+    }
+  }
+}
+
+eOsdError cVnsiOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
+{
+  eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
+  if (Result == oeOk)
+  {
+    if (NumAreas > MAXNUMWINDOWS)
+      return oeTooManyAreas;
+    int TotalMemory = 0;
+    for (int i = 0; i < NumAreas; i++)
+    {
+      if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8)
+        return oeBppNotSupported;
+      if ((Areas[i].Width() & (8 / Areas[i].bpp - 1)) != 0)
+        return oeWrongAlignment;
+      if (Areas[i].Width() < 1 || Areas[i].Height() < 1 || Areas[i].Width() > 720 || Areas[i].Height() > 576)
+        return oeWrongAreaSize;
+      TotalMemory += Areas[i].Width() * Areas[i].Height() / (8 / Areas[i].bpp);
+    }
+    if (TotalMemory > osdMem)
+      return oeOutOfMemory;
+  }
+  return Result;
+}
+
+eOsdError cVnsiOsd::SetAreas(const tArea *Areas, int NumAreas)
+{
+  if (shown)
+  {
+    for (int i = 0; GetBitmap(i); i++)
+    {
+      Cmd(VNSI_OSD_CLOSE, i);
+    }
+    shown = false;
+  }
+  return cOsd::SetAreas(Areas, NumAreas);
+}
+
+void cVnsiOsd::Cmd(int cmd, int wnd, int color, int x0, int y0, int x1, int y1, const void *data, int size)
+{
+  DEBUGLOG("OSD: cmd: %d, wnd: %d, color: %d, x0: %d, y0: %d, x1: %d, y1: %d",
+      cmd, wnd, color, x0, y0, x1, y1);
+  cVnsiOsdProvider::SendOsdPacket(cmd, wnd, color, x0, y0, x1, y1, data, size);
+}
+
+void cVnsiOsd::Flush(void)
+{
+  if (!Active())
+     return;
+  cBitmap *Bitmap;
+  bool full = cVnsiOsdProvider::IsRequestFull();
+  for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
+  {
+    uint8_t reset = !shown || full;
+    Cmd(VNSI_OSD_OPEN, i, Bitmap->Bpp(), Left() + Bitmap->X0(), Top() + Bitmap->Y0(), Left() + Bitmap->X0() + Bitmap->Width() - 1, Top() + Bitmap->Y0() + Bitmap->Height() - 1, (void *)&reset, 1);
+    int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+    if (!shown || Bitmap->Dirty(x1, y1, x2, y2) || full)
+    {
+      if (!shown || full)
+      {
+        x1 = y1 = 0;
+        x2 = Bitmap->Width() - 1;
+        y2 = Bitmap->Height() - 1;
+      }
+      // commit colors:
+      int NumColors;
+      const tColor *Colors = Bitmap->Colors(NumColors);
+      if (Colors)
+      {
+        Cmd(VNSI_OSD_SETPALETTE, i, 0, NumColors, 0, 0, 0, Colors, NumColors*sizeof(tColor));
+      }
+      // commit modified data:
+      int size = (y2-y1) * Bitmap->Width() + (x2-x1+1);
+      Cmd(VNSI_OSD_SETBLOCK, i, Bitmap->Width(), x1, y1, x2, y2, Bitmap->Data(x1, y1), size);
+    }
+    Bitmap->Clean();
+  }
+  if (!shown)
+  {
+    // Showing the windows in a separate loop to avoid seeing them come up one after another
+    for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
+    {
+      Cmd(VNSI_OSD_MOVEWINDOW, i, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0());
+    }
+    shown = true;
+  }
+}
+
+// --- cVnsiOsdProvider -------------------------------------------------------
+
+cResponsePacket cVnsiOsdProvider::m_OsdPacket;
+cxSocket *cVnsiOsdProvider::m_Socket;
+cMutex cVnsiOsdProvider::m_Mutex;
+bool cVnsiOsdProvider::m_RequestFull;
+
+cVnsiOsdProvider::cVnsiOsdProvider(cxSocket *socket)
+{
+  cMutexLock lock(&m_Mutex);
+  INFOLOG("new osd provider");
+  m_Socket = socket;
+  m_RequestFull = true;
+}
+
+cVnsiOsdProvider::~cVnsiOsdProvider()
+{
+  cMutexLock lock(&m_Mutex);
+  m_Socket = NULL;
+}
+
+cOsd *cVnsiOsdProvider::CreateOsd(int Left, int Top, uint Level)
+{
+  cMutexLock lock(&m_Mutex);
+  return new cVnsiOsd(Left, Top, Level);
+}
+
+void cVnsiOsdProvider::SendOsdPacket(int cmd, int wnd, int color, int x0, int y0, int x1, int y1, const void *data, int size)
+{
+  cMutexLock lock(&m_Mutex);
+  if (!m_Socket)
+    return;
+
+  if (!m_OsdPacket.initOsd(cmd, wnd, color, x0, y0, x1, y1))
+  {
+    ERRORLOG("OSD response packet init fail");
+    return;
+  }
+  m_OsdPacket.setLen(m_OsdPacket.getOSDHeaderLength() + size);
+  m_OsdPacket.finaliseOSD();
+
+  m_Socket->LockWrite();
+  m_Socket->write(m_OsdPacket.getPtr(), m_OsdPacket.getOSDHeaderLength(), -1, (size > 0) ? true: false);
+  if (size)
+    m_Socket->write(data, size);
+  m_Socket->UnlockWrite();
+}
+
+bool cVnsiOsdProvider::IsRequestFull()
+{
+  cMutexLock lock(&m_Mutex);
+  bool ret = m_RequestFull;
+  m_RequestFull = false;
+  return ret;
+}
+
+void cVnsiOsdProvider::SendKey(unsigned int key)
+{
+  if (!cOsd::IsOpen())
+  {
+    cRemote::Put(kMenu);
+    return;
+  }
+  switch (key)
+  {
+  case ACTION_MOVE_UP:
+    cRemote::Put(kUp);
+    break;
+  case ACTION_MOVE_DOWN:
+    cRemote::Put(kDown);
+    break;
+  case ACTION_MOVE_LEFT:
+    cRemote::Put(kLeft);
+    break;
+  case ACTION_MOVE_RIGHT:
+    cRemote::Put(kRight);
+    break;
+  case ACTION_PREVIOUS_MENU:
+    cRemote::Put(kMenu);
+    break;
+  case ACTION_NAV_BACK:
+    cRemote::Put(kBack);
+    break;
+  case ACTION_SELECT_ITEM:
+    cRemote::Put(kOk);
+    break;
+  case ACTION_TELETEXT_RED:
+    cRemote::Put(kRed);
+    break;
+  case ACTION_TELETEXT_BLUE:
+    cRemote::Put(kBlue);
+    break;
+  case ACTION_TELETEXT_YELLOW:
+    cRemote::Put(kYellow);
+    break;
+  case ACTION_TELETEXT_GREEN:
+    cRemote::Put(kGreen);
+    break;
+  case REMOTE_0:
+    cRemote::Put(k0);
+    break;
+  case REMOTE_1:
+    cRemote::Put(k1);
+    break;
+  case REMOTE_2:
+    cRemote::Put(k2);
+    break;
+  case REMOTE_3:
+    cRemote::Put(k3);
+    break;
+  case REMOTE_4:
+    cRemote::Put(k4);
+    break;
+  case REMOTE_5:
+    cRemote::Put(k5);
+    break;
+  case REMOTE_6:
+    cRemote::Put(k6);
+    break;
+  case REMOTE_7:
+    cRemote::Put(k7);
+    break;
+  case REMOTE_8:
+    cRemote::Put(k8);
+    break;
+  case REMOTE_9:
+    cRemote::Put(k9);
+    break;
+  default:
+    break;
+  }
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.h	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiosd.h	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <vdr/osd.h>
+#include "responsepacket.h"
+
+class cxSocket;
+
+class cVnsiOsdProvider : public cOsdProvider
+{
+public:
+  cVnsiOsdProvider(cxSocket *socket);
+  virtual ~cVnsiOsdProvider();
+  virtual cOsd *CreateOsd(int Left, int Top, uint Level);
+  static void SendOsdPacket(int cmd, int wnd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL, int size = 0);
+  static bool IsRequestFull();
+  static void SendKey(unsigned int key);
+private:
+  static cResponsePacket m_OsdPacket;
+  static cxSocket *m_Socket;
+  static cMutex m_Mutex;
+  static bool m_RequestFull;
+};
+
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver.c	2013-03-12 10:51:22.000000000 +0000
@@ -187,6 +187,9 @@
   int timerState = -1;
   Timers.Modified(timerState);
 
+  // last update of epg
+  time_t epgUpdate = cSchedules::Modified();
+
   while (Running())
   {
     FD_ZERO(&fds);
@@ -254,6 +257,16 @@
          (*i)->TimerChange();
         }
       }
+
+      // update epg
+      if((cSchedules::Modified() > epgUpdate + 10) || time(NULL) > epgUpdate + 300)
+      {
+        for (ClientList::iterator i = m_clients.begin(); i != m_clients.end(); i++)
+        {
+         (*i)->EpgChange();
+        }
+        epgUpdate = cSchedules::Modified();
+      }
       continue;
     }
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/addon.xml.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/addon.xml.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/addon.xml.in	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/addon.xml.in	2013-03-12 10:51:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="1.6.6"
+  version="1.6.7"
   name="VU+ / Enigma2 Client"
   provider-name="Joerg Dembski">
   <requires>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/changelog.txt xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/changelog.txt
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/changelog.txt	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/changelog.txt	2013-03-12 10:51:22.000000000 +0000
@@ -1,3 +1,8 @@
+1.6.7
+- add: support for /virtual) recording folders
+- add: support for fetching picons from the webinterface
+- add: support for recording icons
+
 1.6.6
 - updated language files from Transifex
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/language/English/strings.po xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/language/English/strings.po
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/language/English/strings.po	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/language/English/strings.po	2013-03-12 10:51:22.000000000 +0000
@@ -117,7 +117,11 @@
 msgid "TV-Bouquet"
 msgstr ""
 
-#empty strings from id 30027 to 30499
+msgctxt "#30027"
+imsgid "Fetch picons from webinterface"
+msgstr ""
+
+#empty strings from id 30028 to 30499
 #notifications
 
 msgctxt "#30500"
@@ -127,3 +131,5 @@
 msgctxt "#30501"
 msgid "Reconnected to '%s'"
 msgstr ""
+
+
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/language/German/strings.po xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/language/German/strings.po
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/language/German/strings.po	2013-01-04 01:00:25.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/language/German/strings.po	2013-03-12 10:51:22.000000000 +0000
@@ -109,6 +109,13 @@
 msgid "TV-Bouquet"
 msgstr "TV-Bouquet"
 
+msgctxt "#30027"
+imsgid "Fetch picons from webinterface"
+msgstr "Lade Picons vom Web-Interface"
+
+#empty strings from id 30028 to 30499
+#notifications
+
 msgctxt "#30500"
 msgid "Disconnected from '%s'"
 msgstr "Verbindung '%s' unterbrochen"
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/settings.xml xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/settings.xml
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/addon/resources/settings.xml	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/addon/resources/settings.xml	2013-03-12 10:51:22.000000000 +0000
@@ -3,7 +3,8 @@
   <!-- SYSTEM -->
   <category label="30018">
     <setting id="host" type="text" label="30000" default="127.0.0.1" />
-    <setting id="iconpath" type="folder" label="30008" default="" />
+    <setting id="onlinepicons" type="bool" default="true" label="30027" />
+    <setting id="iconpath" type="folder" label="30008" enable="e1(-1, false)" default="" />
     <setting id="updateint" type="number" label="30010" default="2" />
   </category>
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/VuData.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/VuData.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/VuData.cpp	2012-12-07 01:00:48.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/VuData.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -898,7 +898,7 @@
 
     strTmp2.Format("%s", strIcon.c_str());
 
-    std::replace(strIcon.begin(), strIcon.end(), ':','_');
+    std::replace(strIcon.begin(), strIcon.end(), ':', '_');
     strIcon = g_strIconPath.c_str() + strIcon + ".png";
 
     newChannel.strIconPath = strIcon;
@@ -911,6 +911,13 @@
     strTmp.Format("http://%s%s:%d/%s", strTmp.c_str(), g_strHostname, g_iPortStream, strTmp2.c_str());
     newChannel.strStreamURL = strTmp;
 
+    if (g_bOnlinePicons == true)
+    {
+      std::replace(strTmp2.begin(), strTmp2.end(), ':', '_');
+      strTmp.Format("%spicon/%s.png", m_strURL.c_str(), strTmp2.c_str());
+      newChannel.strIconPath = strTmp;
+    }
+
     m_channels.push_back(newChannel);
     XBMC->Log(LOG_INFO, "%s Loaded channel: %s, Icon: %s", __FUNCTION__, newChannel.strChannelName.c_str(), newChannel.strIconPath.c_str());
   }
@@ -1161,6 +1168,16 @@
   return -1;
 }
 
+CStdString Vu::GetChannelIconPath(CStdString strChannelName)  
+{
+  for (unsigned int i = 0;i<m_channels.size();  i++) 
+  {
+    if (!strChannelName.compare(m_channels[i].strChannelName))
+      return m_channels[i].strIconPath;
+  }
+  return "";
+}
+
 PVR_ERROR Vu::GetTimers(ADDON_HANDLE handle)
 {
   // is the addon is currently updating the channels, then delay the call
@@ -1457,19 +1474,70 @@
 
   for (unsigned int i=0; i<m_locations.size(); i++)
   {
-    if (!GetRecordingFromLocation(handle, m_locations[i]))
+    if (!GetRecordingFromLocation(m_locations[i]))
     {
       XBMC->Log(LOG_ERROR, "%s Error fetching lists for folder: '%s'", __FUNCTION__, m_locations[i].c_str());
-      return PVR_ERROR_SERVER_ERROR;
     }
   }
 
+  TransferRecordings(handle);
+
   RestoreLastPlayedPositions();
 
   return PVR_ERROR_NO_ERROR;
 }
 
-bool Vu::GetRecordingFromLocation(ADDON_HANDLE handle, CStdString strRecordingFolder)
+bool Vu::IsInRecordingFolder(CStdString strRecordingFolder)
+{
+  int iMatches = 0;
+  for (unsigned int i = 0; i < m_recordings.size(); i++)
+  {
+    if (strRecordingFolder.compare(m_recordings.at(i).strTitle) == 0)
+    {
+      iMatches++;
+      XBMC->Log(LOG_DEBUG, "%s Found Recording title '%s' in recordings vector!", __FUNCTION__, strRecordingFolder.c_str());
+      if (iMatches > 1)
+      {
+        XBMC->Log(LOG_DEBUG, "%s Found Recording title twice '%s' in recordings vector!", __FUNCTION__, strRecordingFolder.c_str());
+        return true;    
+      }
+    }
+  }
+
+  return false;
+}
+
+void Vu::TransferRecordings(ADDON_HANDLE handle)
+{
+  for (unsigned int i=0; i<m_recordings.size(); i++)
+  {
+    CStdString strTmp;
+    VuRecording &recording = m_recordings.at(i);
+    PVR_RECORDING tag;
+    memset(&tag, 0, sizeof(PVR_RECORDING));
+    strncpy(tag.strRecordingId, recording.strRecordingId.c_str(), sizeof(tag.strRecordingId));
+    strncpy(tag.strTitle, recording.strTitle.c_str(), sizeof(tag.strTitle));
+    strncpy(tag.strStreamURL, recording.strStreamURL.c_str(), sizeof(tag.strStreamURL));
+    strncpy(tag.strPlotOutline, recording.strPlotOutline.c_str(), sizeof(tag.strPlotOutline));
+    strncpy(tag.strPlot, recording.strPlot.c_str(), sizeof(tag.strPlot));
+    strncpy(tag.strChannelName, recording.strChannelName.c_str(), sizeof(tag.strChannelName));
+    strncpy(tag.strIconPath, recording.strIconPath.c_str(), sizeof(tag.strIconPath));
+
+    if(IsInRecordingFolder(recording.strTitle))
+      strTmp.Format("/%s/", recording.strTitle.c_str());
+    else
+      strTmp.Format("/");
+
+    recording.strDirectory = strTmp;
+    strncpy(tag.strDirectory, recording.strDirectory.c_str(), sizeof(tag.strDirectory));
+    tag.recordingTime     = recording.startTime;
+    tag.iDuration         = recording.iDuration;
+
+    PVR->TransferRecordingEntry(handle, &tag);
+  }
+}
+
+bool Vu::GetRecordingFromLocation(CStdString strRecordingFolder)
 {
   CStdString url;
 
@@ -1535,6 +1603,8 @@
     if (XMLUtils::GetString(pNode, "e2servicename", strTmp))
       recording.strChannelName = strTmp;
 
+    recording.strIconPath = GetChannelIconPath(strTmp.c_str());
+
     if (XMLUtils::GetInt(pNode, "e2time", iTmp)) 
       recording.startTime = iTmp;
 
@@ -1552,27 +1622,12 @@
       recording.strStreamURL = strTmp;
     }
 
-
-    PVR_RECORDING tag;
-    memset(&tag, 0, sizeof(PVR_RECORDING));
-    strncpy(tag.strRecordingId, recording.strRecordingId.c_str(), sizeof(tag.strRecordingId));
-    strncpy(tag.strTitle, recording.strTitle.c_str(), sizeof(tag.strTitle));
-    strncpy(tag.strStreamURL, recording.strStreamURL.c_str(), sizeof(tag.strStreamURL));
-    strncpy(tag.strPlotOutline, recording.strPlotOutline.c_str(), sizeof(tag.strPlotOutline));
-    strncpy(tag.strPlot, recording.strPlot.c_str(), sizeof(tag.strPlot));
-    strncpy(tag.strChannelName, recording.strChannelName.c_str(), sizeof(tag.strChannelName));
-    tag.recordingTime     = recording.startTime;
-    tag.iDuration         = recording.iDuration;
-    strncpy(tag.strDirectory, "/", sizeof(tag.strDirectory));   // unused
-
-    PVR->TransferRecordingEntry(handle, &tag);
-
     m_iNumRecordings++; 
     iNumRecording++;
 
     m_recordings.push_back(recording);
 
-    XBMC->Log(LOG_DEBUG, "%s loaded Recording entry '%s', start '%d', length '%d'", __FUNCTION__, tag.strTitle, recording.startTime, recording.iDuration);
+    XBMC->Log(LOG_DEBUG, "%s loaded Recording entry '%s', start '%d', length '%d'", __FUNCTION__, recording.strTitle.c_str(), recording.startTime, recording.iDuration);
   }
 
   XBMC->Log(LOG_INFO, "%s Loaded %u Recording Entries from folder '%s'", __FUNCTION__, iNumRecording, strRecordingFolder.c_str());
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/VuData.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/VuData.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/VuData.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/VuData.h	2013-03-12 10:51:22.000000000 +0000
@@ -148,6 +148,8 @@
   std::string strPlot;
   std::string strPlotOutline;
   std::string strChannelName;
+  std::string strDirectory;
+  std::string strIconPath;
 };
  
 class Vu  : public PLATFORM::CThread
@@ -185,6 +187,7 @@
   bool RestoreLastPlayedPositions();
   CStdString GetHttpXML(CStdString& url);
   int GetChannelNumber(CStdString strServiceReference);
+  CStdString GetChannelIconPath(CStdString strChannelName);
   bool SendSimpleCommand(const CStdString& strCommandURL, CStdString& strResult, bool bIgnoreResult = false);
   CStdString GetGroupServiceReference(CStdString strGroupName);
   bool LoadChannels(CStdString strServerReference, CStdString strGroupName);
@@ -203,6 +206,8 @@
   bool CheckForChannelUpdate();
   std::string& Escape(std::string &s, std::string from, std::string to);
   CStdString URLEncodeInline(const CStdString& sSrc);
+  bool IsInRecordingFolder(CStdString);
+  void TransferRecordings(ADDON_HANDLE handle);
 
 protected:
   virtual void *Process(void);
@@ -225,7 +230,7 @@
   int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording);
   PVR_ERROR UpdateTimer(const PVR_TIMER &timer);
   PVR_ERROR DeleteTimer(const PVR_TIMER &timer);
-  bool GetRecordingFromLocation(ADDON_HANDLE handle, CStdString strRecordingFolder);
+  bool GetRecordingFromLocation(CStdString strRecordingFolder);
   unsigned int GetRecordingsAmount();
   PVR_ERROR    GetRecordings(ADDON_HANDLE handle);
   PVR_ERROR    DeleteRecording(const PVR_RECORDING &recinfo);
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/client.cpp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.cpp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/client.cpp	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.cpp	2013-03-12 10:51:22.000000000 +0000
@@ -53,6 +53,7 @@
 bool        g_bOnlyCurrentLocation    = false;
 bool        g_bSetPowerstate          = false;
 bool        g_bOnlyOneGroup           = false;
+bool        g_bOnlinePicons           = true;
 std::string g_strOneGroup             = "";
 std::string g_szClientPath            = "";
 std::string g_strChannelDataPath      = "/tmp/";
@@ -104,6 +105,10 @@
   if (!XBMC->GetSetting("webport", &g_iPortWeb))
     g_iPortWeb = DEFAULT_WEB_PORT;
   
+  /* read setting "onlinepicons" from settings.xml */
+  if (!XBMC->GetSetting("onlinepicons", &g_bOnlinePicons))
+    g_bOnlinePicons = true;
+  
   /* read setting "onlycurrent" from settings.xml */
   if (!XBMC->GetSetting("onlycurrent", &g_bOnlyCurrentLocation))
     g_bOnlyCurrentLocation = false;
@@ -340,17 +345,16 @@
 
 PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities)
 {
-  //pCapabilities->bSupportsChannelSettings = false;
-  //pCapabilities->bSupportsTimeshift       = false;
-  pCapabilities->bSupportsEPG             = true;
-  pCapabilities->bSupportsTV              = true;
-  pCapabilities->bSupportsRadio           = true;
-  pCapabilities->bSupportsRecordings      = true;
-  pCapabilities->bSupportsTimers          = true;
-  pCapabilities->bSupportsChannelGroups   = true;
-  pCapabilities->bSupportsChannelScan     = false;
-  pCapabilities->bHandlesInputStream      = true;
-  pCapabilities->bHandlesDemuxing         = false;
+  pCapabilities->bSupportsEPG                = true;
+  pCapabilities->bSupportsTV                 = true;
+  pCapabilities->bSupportsRadio              = true;
+  pCapabilities->bSupportsRecordings         = true;
+  pCapabilities->bSupportsRecordingFolders   = true;
+  pCapabilities->bSupportsTimers             = true;
+  pCapabilities->bSupportsChannelGroups      = true;
+  pCapabilities->bSupportsChannelScan        = false;
+  pCapabilities->bHandlesInputStream         = true;
+  pCapabilities->bHandlesDemuxing            = false;
   pCapabilities->bSupportsLastPlayedPosition = true;
 
   return PVR_ERROR_NO_ERROR;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/client.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/addons/pvr.vuplus/src/client.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/addons/pvr.vuplus/src/client.h	2013-03-12 10:51:22.000000000 +0000
@@ -48,6 +48,7 @@
 extern bool                      g_bOnlyCurrentLocation;
 extern bool			 g_bSetPowerstate;
 extern bool			 g_bOnlyOneGroup;
+extern bool                      g_bOnlinePicons;
 extern std::string               g_strOneGroup;
 extern std::string               g_szUserPath;
 extern std::string               g_szClientPath;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog	2013-01-29 21:46:51.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog	2013-03-12 10:54:38.000000000 +0000
@@ -1,23 +1,97 @@
-xbmc-pvr-addons (1.0.0~git20130129.2244-96774c4-0precise) precise; urgency=high
+xbmc-pvr-addons (1.0.0~git20130312.1151-590f862-0~precise) precise; urgency=high
 
+  [Lars Op den Kamp]
+   * updated README for windows
 
+  [Adam Sutton]
+   * [tvheadend] fix return PTS when skipping
 
+  [Adam Sutton]
+   * [tvheadend] update addon version info
 
+  [Adam Sutton]
+   * [tvheadend] correct previous mistaken fix to webroot processing
 
+  [Adam Sutton]
+   * [tvheadend] update subscriptionSeek call to use abs PTS
 
+  [Christian Fetzer]
+   * [mythtv-cmyth] Release v1.6.9
 
+  [Adam Sutton]
+   * [tvheadend] ensure timeshiftStatus does not spam logs
+
+  [Adam Sutton]
+   * [tvheadend] added working seek support.
+
+  [Christian Fetzer]
+   * [mythtv-cmyth] Fix crash when starting Live TV after a failed attempt
+
+  [Jörg Dembski]
+   * [vuplus]: increment version number in addon.xml.in
+
+  [Jörg Dembski]
+   * [vuplus]: Add several new features
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: bump version
+
+  [Lucian Muresan]
+   * vdr-vnsiserver Makefile vdr-1.7.36
 
   [Rainer Hochecker]
-   * makefile
+   * vdr-plugin-vnsiserver: redesign for timeshift, revised parsers
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: revised socket
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: osd - increase memory
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: trigger epg update
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: vdr osd
+
+  [Christian Fetzer]
+   * [mythtv-cmyth] Release 1.6.8
+
+  [Marcel Groothuis]
+   * [MediaPortal] Update version number and changelog
+
+  [Marcel Groothuis]
+   * [MediaPortal] Solve CppCheck warning about missing copy constructor
+
+  [Marcel Groothuis]
+   * [MediaPortal] Cleanup unused NoSignalStream related variables
 
+  [Marcel Groothuis]
+   * [MediaPortal] Added: Extra debug info on errors
 
+  [Marcel Groothuis]
+   * [MediaPortal] Setting recording play count is only supported since TVServerXBMC build 117
 
+  [Marcel Groothuis]
+   * MediaPortal: refactor: move loading card settings to separate function
 
+  [Marcel Groothuis]
+   * [MediaPortal] MultiFileReader: continue as soon as the buffer file has a non-zero length
 
+  [Marcel Groothuis]
+   * MediaPortal: search also for the genre_translation.xml file in the profile folder (userdata/addon_data/pvr.team-mediaportal.tvserver) This allows for storing a modified file at a writable location
 
+  [Marcel Groothuis]
+   * MediaPortal: channel icons: search also for these extensions: .jpg .jpeg .bmp .gif (Still Windows only)
 
+  [Marcel Groothuis]
+   * [MediaPortal] Channels: Use MediaPortal VisibleInGuide property as inverted IsHidden flag in XBMC. (requires TVServerXBMC build 120)
 
+  [Marcel Groothuis]
+   * [MediaPortal] Don't load other channel groups when the user selected to import channels from a single group.
 
+  [Fred Hoogduin]
+   * [argustv-fix] If we can not connect to the pvr server at startup do not return ADDON_STATUS_PERMANENT_FAILURE as this causes the add-on to become disabled.
 
 
   * Initial release 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.in	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in	2013-03-12 10:51:34.000000000 +0000
@@ -0,0 +1,99 @@
+xbmc-pvr-addons (1.0.0~git20130312.1151-590f862-0~#DIST#) #DIST#; urgency=high
+
+  [Lars Op den Kamp]
+   * updated README for windows
+
+  [Adam Sutton]
+   * [tvheadend] fix return PTS when skipping
+
+  [Adam Sutton]
+   * [tvheadend] update addon version info
+
+  [Adam Sutton]
+   * [tvheadend] correct previous mistaken fix to webroot processing
+
+  [Adam Sutton]
+   * [tvheadend] update subscriptionSeek call to use abs PTS
+
+  [Christian Fetzer]
+   * [mythtv-cmyth] Release v1.6.9
+
+  [Adam Sutton]
+   * [tvheadend] ensure timeshiftStatus does not spam logs
+
+  [Adam Sutton]
+   * [tvheadend] added working seek support.
+
+  [Christian Fetzer]
+   * [mythtv-cmyth] Fix crash when starting Live TV after a failed attempt
+
+  [Jörg Dembski]
+   * [vuplus]: increment version number in addon.xml.in
+
+  [Jörg Dembski]
+   * [vuplus]: Add several new features
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: bump version
+
+  [Lucian Muresan]
+   * vdr-vnsiserver Makefile vdr-1.7.36
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: redesign for timeshift, revised parsers
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: revised socket
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: osd - increase memory
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: trigger epg update
+
+  [Rainer Hochecker]
+   * vdr-plugin-vnsiserver: vdr osd
+
+  [Christian Fetzer]
+   * [mythtv-cmyth] Release 1.6.8
+
+  [Marcel Groothuis]
+   * [MediaPortal] Update version number and changelog
+
+  [Marcel Groothuis]
+   * [MediaPortal] Solve CppCheck warning about missing copy constructor
+
+  [Marcel Groothuis]
+   * [MediaPortal] Cleanup unused NoSignalStream related variables
+
+  [Marcel Groothuis]
+   * [MediaPortal] Added: Extra debug info on errors
+
+  [Marcel Groothuis]
+   * [MediaPortal] Setting recording play count is only supported since TVServerXBMC build 117
+
+  [Marcel Groothuis]
+   * MediaPortal: refactor: move loading card settings to separate function
+
+  [Marcel Groothuis]
+   * [MediaPortal] MultiFileReader: continue as soon as the buffer file has a non-zero length
+
+  [Marcel Groothuis]
+   * MediaPortal: search also for the genre_translation.xml file in the profile folder (userdata/addon_data/pvr.team-mediaportal.tvserver) This allows for storing a modified file at a writable location
+
+  [Marcel Groothuis]
+   * MediaPortal: channel icons: search also for these extensions: .jpg .jpeg .bmp .gif (Still Windows only)
+
+  [Marcel Groothuis]
+   * [MediaPortal] Channels: Use MediaPortal VisibleInGuide property as inverted IsHidden flag in XBMC. (requires TVServerXBMC build 120)
+
+  [Marcel Groothuis]
+   * [MediaPortal] Don't load other channel groups when the user selected to import channels from a single group.
+
+  [Fred Hoogduin]
+   * [argustv-fix] If we can not connect to the pvr server at startup do not return ADDON_STATUS_PERMANENT_FAILURE as this causes the add-on to become disabled.
+
+
+  * Initial release 
+
+ -- wsnipex <wsnipex@a1.net>  Fri, 21 Dec 2012 11:06:07 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.in.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.in.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.in.old	2013-03-12 10:51:24.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (#PACKAGEVERSION#-0~#DIST#) #DIST#; urgency=high
+
+  * Initial release 
+
+ -- wsnipex <wsnipex@a1.net>  Fri, 21 Dec 2012 11:06:07 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.tmp xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.tmp
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.tmp	2013-01-29 21:44:54.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.tmp	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-xbmc-pvr-addons (1.0.0~git20130129.2244-96774c4-0dist) dist; urgency=high
-
-
-
-
-
-
-
-
-  [Rainer Hochecker]
-   * makefile
-
-
-
-
-
-
-
-
-
-
-
-  * Initial release 
-
- -- wsnipex <wsnipex@a1.net>  Fri, 21 Dec 2012 11:06:07 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.tmp.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.tmp.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/changelog.tmp.old	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/changelog.tmp.old	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-xbmc-pvr-addons (1.0.0~git20130104.1408-5a47b5b-0dist) dist; urgency=high
-
-
-
-
-
-
-
-  [Rainer Hochecker]
-   * makefile
-
-
-
-
-
-
-
-
-
-
-
-  * Initial release 
-
- -- wsnipex <wsnipex@a1.net>  Fri, 21 Dec 2012 11:06:07 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/control xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/control	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control	2013-03-12 10:54:38.000000000 +0000
@@ -2,7 +2,7 @@
 Section: video
 Priority: extra
 Maintainer: wsnipex <wsnipex@a1.net>
-Build-Depends: debhelper (>= 8.0.0), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17)
+Build-Depends: debhelper (>= 8.0.0), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17), devscripts, lsb-release
 Standards-Version: 3.9.3
 Homepage: http://xbmc.org
 Vcs-Git: git://github.com/opdenkamp/xbmc-pvr-addons.git
@@ -11,7 +11,7 @@
 Package: xbmc-pvr-mythtv-cmyth
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14
-Description: XBMC PVR Addon MythTv - Cmyth
+Description: XBMC PVR Addon MythTv - Cmyth - PVR API:1.6.0
  This package contains the Cmyth PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -19,7 +19,7 @@
 Package: xbmc-pvr-vuplus
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon Vuplus
+Description: XBMC PVR Addon Vuplus - PVR API:1.6.0
  This package contains the Vuplus PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -27,7 +27,7 @@
 Package: xbmc-pvr-vdr-vnsi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon VDR Vnsi
+Description: XBMC PVR Addon VDR Vnsi - PVR API:1.6.0
  This package contains the VDR Vnsi PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -35,13 +35,13 @@
 Package: vdr-plugin-vnsiserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Description: VDR-Network-Streaming-Interface
+Description: VDR-Network-Streaming-Interface - PVR API:1.6.0
  VDR-Network-Streaming-Interface
 
 Package: xbmc-pvr-njoy
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon Njoy
+Description: XBMC PVR Addon Njoy - PVR API:1.6.0
  This package contains the Njoy PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -49,7 +49,7 @@
 Package: xbmc-pvr-nextpvr
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon NextPvr
+Description: XBMC PVR Addon NextPvr - PVR API:1.6.0
  This package contains the NextPvr PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -57,7 +57,7 @@
 Package: xbmc-pvr-mediaportal-tvserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon Mediaportal Tvserver
+Description: XBMC PVR Addon Mediaportal Tvserver - PVR API:1.6.0
  This package contains the Mediaportal PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -65,7 +65,7 @@
 Package: xbmc-pvr-tvheadend-hts
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon TvHeadend Hts
+Description: XBMC PVR Addon TvHeadend Hts - PVR API:1.6.0
  This package contains the TvHeadend PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -73,7 +73,7 @@
 Package: xbmc-pvr-dvbviewer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon Dvbviewer
+Description: XBMC PVR Addon Dvbviewer - PVR API:1.6.0
  This package contains the Dvbviewer PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -81,7 +81,7 @@
 Package: xbmc-pvr-argustv
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Addon Argustv
+Description: XBMC PVR Addon Argustv - PVR API:1.6.0
  This package contains the Argustv PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
@@ -89,7 +89,7 @@
 Package: xbmc-pvr-demo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XBMC PVR Demo Addon
+Description: XBMC PVR Demo Addon - PVR API:1.6.0 
  This package contains the Demo PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment hub
  for all your digital media
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/control.in xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control.in
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/control.in	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/control.in	2013-03-12 10:51:24.000000000 +0000
@@ -0,0 +1,96 @@
+Source: xbmc-pvr-addons
+Section: video
+Priority: extra
+Maintainer: wsnipex <wsnipex@a1.net>
+Build-Depends: debhelper (>= 8.0.0), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17), devscripts, lsb-release
+Standards-Version: 3.9.3
+Homepage: http://xbmc.org
+Vcs-Git: git://github.com/opdenkamp/xbmc-pvr-addons.git
+Vcs-Browser: https://github.com/opdenkamp/xbmc-pvr-addons/tree/frodo
+
+Package: xbmc-pvr-mythtv-cmyth
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14
+Description: XBMC PVR Addon MythTv - Cmyth - PVR API:#APIVERSION#
+ This package contains the Cmyth PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-vuplus
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon Vuplus - PVR API:#APIVERSION#
+ This package contains the Vuplus PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-vdr-vnsi
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon VDR Vnsi - PVR API:#APIVERSION#
+ This package contains the VDR Vnsi PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: vdr-plugin-vnsiserver
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
+Description: VDR-Network-Streaming-Interface - PVR API:#APIVERSION#
+ VDR-Network-Streaming-Interface
+
+Package: xbmc-pvr-njoy
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon Njoy - PVR API:#APIVERSION#
+ This package contains the Njoy PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-nextpvr
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon NextPvr - PVR API:#APIVERSION#
+ This package contains the NextPvr PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-mediaportal-tvserver
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon Mediaportal Tvserver - PVR API:#APIVERSION#
+ This package contains the Mediaportal PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-tvheadend-hts
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon TvHeadend Hts - PVR API:#APIVERSION#
+ This package contains the TvHeadend PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-dvbviewer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon Dvbviewer - PVR API:#APIVERSION#
+ This package contains the Dvbviewer PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-argustv
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Addon Argustv - PVR API:#APIVERSION#
+ This package contains the Argustv PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
+Package: xbmc-pvr-demo
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: XBMC PVR Demo Addon - PVR API:#APIVERSION# 
+ This package contains the Demo PVR (Personal Video Recorder) Addon for XBMC,
+ the award winning free and open source software media-player and entertainment hub
+ for all your digital media
+
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/patches/vnsi-plugin-make xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/patches/vnsi-plugin-make
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/patches/vnsi-plugin-make	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/patches/vnsi-plugin-make	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
---- xbmc-pvr-addons-1.0.0~git20121222.1009-0482a89.orig/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-+++ xbmc-pvr-addons-1.0.0~git20121222.1009-0482a89/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-@@ -80,7 +80,7 @@ all: libvdr-$(PLUGIN).so
- 
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
--	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
-+	@cp $@ $@.$(APIVERSION)
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-@@ -94,5 +94,6 @@ clean:
- 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
- 
- install:
-+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
- 	@install -d ../../man
- 	@install README ../../man/$(PLUGIN).man
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/patches/vnsiserver-make.patch xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/patches/vnsiserver-make.patch
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/patches/vnsiserver-make.patch	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/patches/vnsiserver-make.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-From c514d6e3ddab39f42a7ea1c36e5c951c58ddaa17 Mon Sep 17 00:00:00 2001
-From: wsnipex <wsnipex@a1.net>
-Date: Thu, 3 Jan 2013 11:11:59 +0100
-Subject: [PATCH] vnsiserver: fix build with vdr < 1.7.34
-
----
- addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile b/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-index 28b857b..b39dfe3 100644
---- a/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-+++ b/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-@@ -17,8 +17,12 @@ VERSION = $(shell grep 'static const char \*VERSION *=' vnsi.h | awk '{ print $$
- 
- # Use package data if installed...otherwise assume we're under the VDR source directory:
- PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-+ifeq ($(strip $(LIBDIR)),)
- LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
-+endif
-+ifeq ($(strip $(LOCDIR)),)
- LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
-+endif
- #
- TMPDIR ?= /tmp
- 
-@@ -135,7 +139,7 @@ install-i18n: $(I18Nmsgs)
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
- ifdef API1733
--	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
-+	@cp $@ $@.$(APIVERSION)
- endif
- 
- install-lib: $(SOFILE)
--- 
-1.7.10
-
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/prepare-build.sh xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/prepare-build.sh
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/prepare-build.sh	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/prepare-build.sh	2013-03-12 10:51:24.000000000 +0000
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+if [[ $1 == "-h" ]] || [[ $1 == "--help" ]] || [[ -z $1 ]]
+then
+	echo "usage $(basename $0) distribution"
+	exit 1
+else
+	dist=$1
+	echo "preparing build for $dist"
+fi
+
+[[ $(basename $PWD) == "debian" ]] || cd debian
+
+###
+# add a tag to the package versions, needed for rebuilds without upstream version changes
+###
+[[ -f versiontag ]] && tag=$(cat versiontag) || tag="0"
+
+###
+# detect Pvr Api version
+###
+PVRAPI=$(awk '/XBMC_PVR_API_VERSION/ {gsub("\"",""); print $3 }' ../xbmc/xbmc_pvr_types.h)
+echo "detected Xbmc PVR-API: $PVRAPI"
+
+###
+# Create control and changelog. This file MUST exist with the correct package name before calling debuild
+###
+echo "Generating changelog with PVR Api version $PVRAPI"
+sed -e "s/#APIVERSION#/$PVRAPI/g" -e "s/#DIST#/$dist/g" changelog.in > changelog
+echo "Generating control file"
+sed "s/#APIVERSION#/$PVRAPI/g" control.in > control
+
+###
+# Define upstream addon name to package name mapping
+###
+declare -A PACKAGES=(
+	["pvr.hts"]="xbmc-pvr-tvheadend-hts"
+	["pvr.vuplus"]="xbmc-pvr-vuplus"
+	["pvr.mediaportal.tvserver"]="xbmc-pvr-mediaportal-tvserver"
+	["pvr.dvbviewer"]="xbmc-pvr-dvbviewer"
+	["pvr.argustv"]="xbmc-pvr-argustv"
+	["pvr.mythtv.cmyth"]="xbmc-pvr-mythtv-cmyth"
+	["pvr.vdr.vnsi"]="xbmc-pvr-vdr-vnsi"
+	["pvr.nextpvr"]="xbmc-pvr-nextpvr"
+	["pvr.demo"]="xbmc-pvr-demo"
+	["pvr.njoy"]="xbmc-pvr-njoy"
+)
+
+###
+# loop over all packages and create the specific changelog and version files used by debuild
+###
+for package in "${!PACKAGES[@]}"
+do
+	echo "creating changelog for: $package"
+	changelog="../addons/$package/addon/changelog.txt"
+	addonxml="../addons/$package/addon/addon.xml.in"
+	aversion=$(awk -F'=' '!/<?xml/ && /version/ && !/>/ {gsub("\"",""); print $2}' $addonxml)
+	pvrapiversion=$(awk -F'=' '/import addon="xbmc.pvr"/ {gsub("\"",""); gsub("/>",""); print $3}' $addonxml)
+
+	[[ -f ${PACKAGES["$package"]}.changelog ]] && mv ${PACKAGES["$package"]}.changelog ${PACKAGES["$package"]}.changelog.old
+
+	version="${aversion}-${tag}${dist}"
+	echo "${version}" > ${PACKAGES["$package"]}.version
+	if [[ -f $changelog ]]
+	then
+		dch -c ${PACKAGES["$package"]}.changelog --create --empty --package xbmc-pvr-addons -v "${version}" --distribution ${dist} --force-distribution 2>/dev/null $(cat $changelog | tail -80)
+	else
+		dch -c ${PACKAGES["$package"]}.changelog --create --empty --package xbmc-pvr-addons -v "${version}" --distribution ${dist} --force-distribution 2>/dev/null "no upstream changelog available"
+	fi
+done
+
+###
+# special handling for vdr-plugin-vnsiserver
+###
+echo "creating changelog for: vdr-plugin-vnsiserver"
+package="vdr-plugin-vnsiserver"
+version="1:"$(awk -F'=' '/\*VERSION/ {gsub("\"",""); gsub(" ",""); gsub(";",""); print $2}' ../addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h)"-${tag}${dist}"
+echo "${version}" > ${package}.version
+
+[[ -f "${package}.changelog" ]] && mv ${package}.changelog ${package}.changelog.old
+dch -c ${package}.changelog --create --empty --package xbmc-pvr-addons -v"${version}" --distribution ${dist} --force-distribution 2>/dev/null "no upstream changelog available"
+
+exit 0
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/rules xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/rules
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/rules	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/rules	2013-03-12 10:51:24.000000000 +0000
@@ -1,14 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -16,6 +7,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+SHELL=/bin/bash
 
 %:
 	dh $@ --parallel
@@ -38,10 +30,15 @@
 	dh_gencontrol
 
 override_dh_auto_build:
-	#cd addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
 	VDRDIR=/usr/include/vdr LIBDIR=$(CURDIR)/debian/vdr-plugin-vnsiserver/usr/lib/vdr/plugins LOCALEDIR=locale $(MAKE) compile -C addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
 	dh_auto_build
 
 override_dh_auto_install:
 	VDRDIR=/usr/include/vdr LIBDIR=$(CURDIR)/debian/vdr-plugin-vnsiserver/usr/lib/vdr/plugins LOCALEDIR=locale $(MAKE) install-lib -C addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
 	dh_auto_install
+
+override_dh_gencontrol:
+	for PACKAGE in $(shell cd debian && ls *.version | sed 's/.version//g'); do \
+             VERSION=$$(cat debian/$$PACKAGE.version) ;\
+             dh_gencontrol -p$$PACKAGE -- -ldebian/changelog -v$$VERSION ;\
+        done
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog	2013-03-12 10:55:08.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1:0.9.1-0precise) precise; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:55:08 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.changelog.old	2013-03-12 10:53:37.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1:0.9.1-0quantal) quantal; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:37 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/vdr-plugin-vnsiserver.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/vdr-plugin-vnsiserver.version	2013-03-12 10:55:06.000000000 +0000
@@ -0,0 +1 @@
+1:0.9.1-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/versiontag xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/versiontag
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/versiontag	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/versiontag	2013-03-12 10:51:24.000000000 +0000
@@ -0,0 +1 @@
+0
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-addons.doc-base.EX xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-addons.doc-base.EX
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-addons.doc-base.EX	2013-01-29 21:44:45.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-addons.doc-base.EX	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-Document: xbmc-pvr-addons
-Title: Debian xbmc-pvr-addons Manual
-Author: <insert document author here>
-Abstract: This manual describes what xbmc-pvr-addons is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/xbmc-pvr-addons/xbmc-pvr-addons.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/xbmc-pvr-addons/xbmc-pvr-addons.ps.gz
-
-Format: text
-Files: /usr/share/doc/xbmc-pvr-addons/xbmc-pvr-addons.text.gz
-
-Format: HTML
-Index: /usr/share/doc/xbmc-pvr-addons/html/index.html
-Files: /usr/share/doc/xbmc-pvr-addons/html/*.html
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog	2013-03-12 10:54:49.000000000 +0000
@@ -0,0 +1,62 @@
+xbmc-pvr-addons (1.6.165-0precise) precise; urgency=low
+
+  * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording
+    was last watched on the server v0.0.1.132 (20-03-2012) - Small fix
+    to correct one invalid GUID error message at start v0.0.1.131 (16-
+    03-2012) - Added many internal verifications to the <FTR GUID> to
+    <XBMC number> channel mappings. External factors can break the
+    mapping and these checks will hopefully warn the user to reset the
+    PVR database v0.0.1.130 (11-03-2012) - Fixed 64-bit Linux .tsbuffer
+    processing v0.0.1.129 (04-03-2012) - Media Portal TV-Server will now
+    work with the FTR - FTR Addon - XBMC combination Recording titles
+    with trailing periods '...' will show up in XBMC, NOTICE: this
+    requires FTR 1.6.1.0 Beta 5 or newer v0.0.1.128 (23-01-2012) -
+    Added: System Info - PVR Information now shows FTR version info
+    Timers do no longer retrieve the cancelled 'upcomingprograms' from
+    ForTheRecord v0.0.1.127 (20-01-2012) - Added: System Info - PVR
+    Information now shows total and used disk sizes v0.0.1.126 (10-01-
+    2012) - Added: titles of recordings changed to be more descriptive
+    v0.0.1.125 (04-01-2012) - Added: validation of the shares for all
+    ForTheRecord tuners at startup v0.0.1.124 (01-01-2012) - Fixed Linux
+    mutex initialisation, caused by C++ not having static constructors
+    v0.0.1.123 (20-12-2011) - Pressing 'record' while viewing will
+    schedule the recording of the show watched - Delete Timer: will
+    abort an active recording, will remove the upcoming program from the
+    server will remove the corresponding schedule from the server (the
+    schedule name MUST be: "XBMC - " + timer title, this is the case
+    when the schedule was added by the addon and unchanged by the user)
+    v0.0.1.122 (07-12-2011) - Signal quality retrieval implemented
+    v0.0.1.121 (04-12-2011) - Channel logo retrieval added v0.0.1.120
+    (07-11-2011) - Windows, Linux and OSX version using TsReader -
+    Reliable switching between channels with HD and SD content -
+    TsReader streamlined v0.0.1.117 (unreleased) - Adaptation to many
+    changes within XBMC v0.0.1.116 (16-06-2011) - Greatly improved
+    channel zapping - Add timer will now force a recording when no
+    matching show title is found in the channel epg data on the server -
+    Add timer fixed: new PVR API - GUI update triggers added: new PVR
+    API v0.0.1.115 (10-05-2011) - First implementation of channelgroups
+    v0.0.1.114 (26-02-2011) - Delete recording is now actually
+    working... v0.0.1.113 (26-02-2011) - Upcoming recordings now showing
+    as timers in EPG and timerlist - Delete timer implemented - Add
+    timer implemented v0.0.1.112 (23-02-2011) - Fixed bad bug that
+    caused loss of epg data every 10 minutes v0.0.1.111 (01-02-2011) -
+    EPG loading optimised. Programme descriptions only loaded for
+    ForTheRecord 1.5.1. - EPG loads 48 hours of data now. - Tune live
+    stream now also supports radio. v0.0.1.110 (22-01-2011) - Delete
+    recording implemented, needs ForTheRecord 1.5.1.0 Beta 6 or newer -
+    Programme descriptions added to EPG and TV channels screen - More
+    fixes to memory handling v0.0.1.109 (13-01-2011) - Initial support
+    for retrieval of recordings on the ForTheRecord Argus server -
+    Overview of recordings, grouped by Title - Viewing of a selected
+    recording via the ForTheRecord shares - Fixes some memory
+    corruptions - Support for retrieval of recordings on the
+    ForTheRecord Argus server - Overview of recordings, grouped by
+    Title, including recording starttime, and description - Credits:
+    Red-F v0.0.1.108 (08-01-2011) - EPG data retrieval fixed for dates
+    where month and day have less than 2 digits (credits: Red-F)
+    v0.0.1.107 (27-11-2010) - First release of the ForTheRecord PVR
+    client (Windows only, TSReader) - Implemented: Channel retrieval,
+    tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG
+    - Tested ForTheRecord Argus version: v1.5.0.3
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:49 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.changelog.old	2013-03-12 10:53:18.000000000 +0000
@@ -0,0 +1,62 @@
+xbmc-pvr-addons (1.6.165-0quantal) quantal; urgency=low
+
+  * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording
+    was last watched on the server v0.0.1.132 (20-03-2012) - Small fix
+    to correct one invalid GUID error message at start v0.0.1.131 (16-
+    03-2012) - Added many internal verifications to the <FTR GUID> to
+    <XBMC number> channel mappings. External factors can break the
+    mapping and these checks will hopefully warn the user to reset the
+    PVR database v0.0.1.130 (11-03-2012) - Fixed 64-bit Linux .tsbuffer
+    processing v0.0.1.129 (04-03-2012) - Media Portal TV-Server will now
+    work with the FTR - FTR Addon - XBMC combination Recording titles
+    with trailing periods '...' will show up in XBMC, NOTICE: this
+    requires FTR 1.6.1.0 Beta 5 or newer v0.0.1.128 (23-01-2012) -
+    Added: System Info - PVR Information now shows FTR version info
+    Timers do no longer retrieve the cancelled 'upcomingprograms' from
+    ForTheRecord v0.0.1.127 (20-01-2012) - Added: System Info - PVR
+    Information now shows total and used disk sizes v0.0.1.126 (10-01-
+    2012) - Added: titles of recordings changed to be more descriptive
+    v0.0.1.125 (04-01-2012) - Added: validation of the shares for all
+    ForTheRecord tuners at startup v0.0.1.124 (01-01-2012) - Fixed Linux
+    mutex initialisation, caused by C++ not having static constructors
+    v0.0.1.123 (20-12-2011) - Pressing 'record' while viewing will
+    schedule the recording of the show watched - Delete Timer: will
+    abort an active recording, will remove the upcoming program from the
+    server will remove the corresponding schedule from the server (the
+    schedule name MUST be: "XBMC - " + timer title, this is the case
+    when the schedule was added by the addon and unchanged by the user)
+    v0.0.1.122 (07-12-2011) - Signal quality retrieval implemented
+    v0.0.1.121 (04-12-2011) - Channel logo retrieval added v0.0.1.120
+    (07-11-2011) - Windows, Linux and OSX version using TsReader -
+    Reliable switching between channels with HD and SD content -
+    TsReader streamlined v0.0.1.117 (unreleased) - Adaptation to many
+    changes within XBMC v0.0.1.116 (16-06-2011) - Greatly improved
+    channel zapping - Add timer will now force a recording when no
+    matching show title is found in the channel epg data on the server -
+    Add timer fixed: new PVR API - GUI update triggers added: new PVR
+    API v0.0.1.115 (10-05-2011) - First implementation of channelgroups
+    v0.0.1.114 (26-02-2011) - Delete recording is now actually
+    working... v0.0.1.113 (26-02-2011) - Upcoming recordings now showing
+    as timers in EPG and timerlist - Delete timer implemented - Add
+    timer implemented v0.0.1.112 (23-02-2011) - Fixed bad bug that
+    caused loss of epg data every 10 minutes v0.0.1.111 (01-02-2011) -
+    EPG loading optimised. Programme descriptions only loaded for
+    ForTheRecord 1.5.1. - EPG loads 48 hours of data now. - Tune live
+    stream now also supports radio. v0.0.1.110 (22-01-2011) - Delete
+    recording implemented, needs ForTheRecord 1.5.1.0 Beta 6 or newer -
+    Programme descriptions added to EPG and TV channels screen - More
+    fixes to memory handling v0.0.1.109 (13-01-2011) - Initial support
+    for retrieval of recordings on the ForTheRecord Argus server -
+    Overview of recordings, grouped by Title - Viewing of a selected
+    recording via the ForTheRecord shares - Fixes some memory
+    corruptions - Support for retrieval of recordings on the
+    ForTheRecord Argus server - Overview of recordings, grouped by
+    Title, including recording starttime, and description - Credits:
+    Red-F v0.0.1.108 (08-01-2011) - EPG data retrieval fixed for dates
+    where month and day have less than 2 digits (credits: Red-F)
+    v0.0.1.107 (27-11-2010) - First release of the ForTheRecord PVR
+    client (Windows only, TSReader) - Implemented: Channel retrieval,
+    tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG
+    - Tested ForTheRecord Argus version: v1.5.0.3
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:18 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-argustv.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-argustv.version	2013-03-12 10:54:46.000000000 +0000
@@ -0,0 +1 @@
+1.6.165-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog	2013-03-12 10:55:05.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.1-0precise) precise; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:55:05 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.changelog.old	2013-03-12 10:53:35.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.1-0quantal) quantal; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:35 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-demo.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-demo.version	2013-03-12 10:55:03.000000000 +0000
@@ -0,0 +1 @@
+1.6.1-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog	2013-03-12 10:55:03.000000000 +0000
@@ -0,0 +1,37 @@
+xbmc-pvr-addons (1.6.5-0precise) precise; urgency=low
+
+  * 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf-
+    8 encoding to get and set the timers. [fixed] Channel names with
+    more than 25 chars could crash the add-on. 1.6.3 [updated] Language
+    files from Transifex 1.6.2 New version number by Team XBMC 0.1.8
+    [fixed] Changed the way timers are calculated. This should fix
+    problems with scheduled and instant recordings on some machines.
+    [fixed] Favourites didn't show channels if the audio track wasn't
+    the first one. [fixed] Channel settings weren't saved/restored after
+    a channel switch with the channels OSD. [fixed] XBMC could hang
+    after a channel switch with the channels OSD. 0.1.7 [added] The
+    Recording Service version 1.21 or higher is now required. Download
+    the latest version from the DVBViewer members area and install it.
+    [added] Display a notification if the add-on can't connect to the
+    Recording Service. Please, check that the RS is enabled and the IP,
+    webinterface port, username and pass are correct. [added] If the
+    favourites.xml selector is empty, the favourites are loaded from the
+    web interface. [added] Don't fetch recording thumbnails at startup
+    if there are more than 20 recordings. [fixed] The add-on crashed if
+    favourites.xml had entries with the old 32 bits ID. [fixed] Channel
+    names with ansi chars are converted to utf8 so they can be displayed
+    properly (a reset of the PVR database may be required). [fixed]
+    Channel names with more than 25 chars. 0.1.5 [added] Timers support.
+    [added] An option to load the channels from favourites.xml instead
+    of from channels.dat (a reset of the PVR database is required). It
+    is usually located at c:\ProgramData\CMUV\DVBViewer\ This is a
+    hidden folder so be sure to enable the "Settings\Appearance\File
+    Lists\Show hidden files and directories" option. [added] Always grab
+    the EPG data after a channel switch. [added] Recording thumbnails.
+    [added] Receiving device name to the status info. [fixed] The
+    preferred language is loaded from the DVBViewer config and used to
+    get the correct EPG in case it supports multi language entries.
+    [fixed] When the EPG is missing the description entry, the event
+    entry is used instead. 0.1.0 First version.
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:55:03 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.changelog.old	2013-03-12 10:53:32.000000000 +0000
@@ -0,0 +1,37 @@
+xbmc-pvr-addons (1.6.5-0quantal) quantal; urgency=low
+
+  * 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf-
+    8 encoding to get and set the timers. [fixed] Channel names with
+    more than 25 chars could crash the add-on. 1.6.3 [updated] Language
+    files from Transifex 1.6.2 New version number by Team XBMC 0.1.8
+    [fixed] Changed the way timers are calculated. This should fix
+    problems with scheduled and instant recordings on some machines.
+    [fixed] Favourites didn't show channels if the audio track wasn't
+    the first one. [fixed] Channel settings weren't saved/restored after
+    a channel switch with the channels OSD. [fixed] XBMC could hang
+    after a channel switch with the channels OSD. 0.1.7 [added] The
+    Recording Service version 1.21 or higher is now required. Download
+    the latest version from the DVBViewer members area and install it.
+    [added] Display a notification if the add-on can't connect to the
+    Recording Service. Please, check that the RS is enabled and the IP,
+    webinterface port, username and pass are correct. [added] If the
+    favourites.xml selector is empty, the favourites are loaded from the
+    web interface. [added] Don't fetch recording thumbnails at startup
+    if there are more than 20 recordings. [fixed] The add-on crashed if
+    favourites.xml had entries with the old 32 bits ID. [fixed] Channel
+    names with ansi chars are converted to utf8 so they can be displayed
+    properly (a reset of the PVR database may be required). [fixed]
+    Channel names with more than 25 chars. 0.1.5 [added] Timers support.
+    [added] An option to load the channels from favourites.xml instead
+    of from channels.dat (a reset of the PVR database is required). It
+    is usually located at c:\ProgramData\CMUV\DVBViewer\ This is a
+    hidden folder so be sure to enable the "Settings\Appearance\File
+    Lists\Show hidden files and directories" option. [added] Always grab
+    the EPG data after a channel switch. [added] Recording thumbnails.
+    [added] Receiving device name to the status info. [fixed] The
+    preferred language is loaded from the DVBViewer config and used to
+    get the correct EPG in case it supports multi language entries.
+    [fixed] When the EPG is missing the description entry, the event
+    entry is used instead. 0.1.0 First version.
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:32 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-dvbviewer.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-dvbviewer.version	2013-03-12 10:55:00.000000000 +0000
@@ -0,0 +1 @@
+1.6.5-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog	2013-03-12 10:54:52.000000000 +0000
@@ -0,0 +1,54 @@
+xbmc-pvr-addons (1.6.8-0precise) precise; urgency=low
+
+  * - Added: use channel icons from MediaPortal (Windows, localhost
+    only) - Changed: switch from libPlatform + libTcpSocket to platform
+    library v1.2.2.109: - Fixed: fix mimetype for tv channels - Fixed:
+    make sure that OpenLiveStream does not return true due to
+    m_iCurrentChannel when the TSReader fails in a later stage - Fixed:
+    compilation IOS/OSX/Linux - Fixed: compile fixes for API move into
+    ADDON namespace - Added: show localized error messages when
+    OpenLiveStream fails - Added: signal status support - Fixed: Don't
+    return encrypted channels as group members when FTA only option is
+    turned on - Added: add more debug log information about the addon
+    settings and status - Added: add support for direct recording
+    playback from network shares (smb, Windows only) - Added: implement
+    support for recording subdirectories - Fixed: don't return radio
+    channels/channelgroup/channelgroup mappings when radio support is
+    disabled v1.1.3.107: - Added: add additional checks for
+    communication errors - Fixed: trigger also a recording list update
+    on timer changes - Fixed: add a mutex to prevent mixing up backend
+    communication on concurrent access - Fixed: stack overflow while
+    closing a live stream - Fixed: tv/radio playback after recording
+    playback - Added: EPG genre string-to-id translation table
+    (addons/pvr.team-
+    mediaportal.tvserver/resources/genre_translation.xml) - Added: EPG
+    genre string support - Added: Retrieve TV/Radio card settings from
+    the backend - Added: support for TVServerXBMC v1.1.x.105-107 -
+    Fixed: several memory leaks - Changed: sources adapted for PVR API
+    changes v1.1.3.103: - Fixed: trigger timer and recording list update
+    on changes from XBMC side - Fixed: check for empty recordings list -
+    Fixed: check for empty timer list - Fixed: limit EPG request to the
+    requested period - Fixed: use tuning details to retrieve the channel
+    number from the backend - Added: support for TVServerXBMC v1.1.x.104
+    - Changed: sources adapted for PVR API changes v1.1.2.102: - Added:
+    Channel group support - Fixed: live stream playback - Fixed:
+    recording retrieval - Changed: sources adapted for PVR API changes
+    v1.1.2.101: - Fixed: "Include radio" setting - Changed: cleanup
+    unused settings v1.1.0.100 - Rewrite: timer code - Changed:
+    BackendName - Fixed: Retrieve more details for timers (repeat,
+    lifetime, ...) - Fixed: Playback of radio channels with a webstream
+    URL (added via the MediaPortal TV-server) - Fixed: "Free-to-air
+    only" setting - Support for TVServerXBMC v1.1.0.100 v1.1.0.98 - Log
+    more information on socket related problems v1.1.0.97 - Fixed: Use
+    uri decode for ip-address in hostname field v1.1.0.96 - Fixed: allow
+    spaces in groupnames, recording names and timer titles - Fixed:
+    GetTimerInfo - Add debug messages for empty channel list v1.1.0.95 -
+    Fix time mismatch between XBMC and MediaPortal TV Server for new
+    timers (scheduled recordings) - Send genre strings to XBMC for
+    unrecognised genres. No colors in EPG, but at least the text is now
+    ok. v1.1.0.90 - Faster channel switching (around 2 sec faster) -
+    Decrease CPU uage when a buffer underrun occurs v1.1.0.75 - PVR
+    client should abort connection when the TVServerXBMC version is too
+    old v1.1.0.60 - Fix PVR client destroy
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:52 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.changelog.old	2013-03-12 10:53:21.000000000 +0000
@@ -0,0 +1,54 @@
+xbmc-pvr-addons (1.6.8-0quantal) quantal; urgency=low
+
+  * - Added: use channel icons from MediaPortal (Windows, localhost
+    only) - Changed: switch from libPlatform + libTcpSocket to platform
+    library v1.2.2.109: - Fixed: fix mimetype for tv channels - Fixed:
+    make sure that OpenLiveStream does not return true due to
+    m_iCurrentChannel when the TSReader fails in a later stage - Fixed:
+    compilation IOS/OSX/Linux - Fixed: compile fixes for API move into
+    ADDON namespace - Added: show localized error messages when
+    OpenLiveStream fails - Added: signal status support - Fixed: Don't
+    return encrypted channels as group members when FTA only option is
+    turned on - Added: add more debug log information about the addon
+    settings and status - Added: add support for direct recording
+    playback from network shares (smb, Windows only) - Added: implement
+    support for recording subdirectories - Fixed: don't return radio
+    channels/channelgroup/channelgroup mappings when radio support is
+    disabled v1.1.3.107: - Added: add additional checks for
+    communication errors - Fixed: trigger also a recording list update
+    on timer changes - Fixed: add a mutex to prevent mixing up backend
+    communication on concurrent access - Fixed: stack overflow while
+    closing a live stream - Fixed: tv/radio playback after recording
+    playback - Added: EPG genre string-to-id translation table
+    (addons/pvr.team-
+    mediaportal.tvserver/resources/genre_translation.xml) - Added: EPG
+    genre string support - Added: Retrieve TV/Radio card settings from
+    the backend - Added: support for TVServerXBMC v1.1.x.105-107 -
+    Fixed: several memory leaks - Changed: sources adapted for PVR API
+    changes v1.1.3.103: - Fixed: trigger timer and recording list update
+    on changes from XBMC side - Fixed: check for empty recordings list -
+    Fixed: check for empty timer list - Fixed: limit EPG request to the
+    requested period - Fixed: use tuning details to retrieve the channel
+    number from the backend - Added: support for TVServerXBMC v1.1.x.104
+    - Changed: sources adapted for PVR API changes v1.1.2.102: - Added:
+    Channel group support - Fixed: live stream playback - Fixed:
+    recording retrieval - Changed: sources adapted for PVR API changes
+    v1.1.2.101: - Fixed: "Include radio" setting - Changed: cleanup
+    unused settings v1.1.0.100 - Rewrite: timer code - Changed:
+    BackendName - Fixed: Retrieve more details for timers (repeat,
+    lifetime, ...) - Fixed: Playback of radio channels with a webstream
+    URL (added via the MediaPortal TV-server) - Fixed: "Free-to-air
+    only" setting - Support for TVServerXBMC v1.1.0.100 v1.1.0.98 - Log
+    more information on socket related problems v1.1.0.97 - Fixed: Use
+    uri decode for ip-address in hostname field v1.1.0.96 - Fixed: allow
+    spaces in groupnames, recording names and timer titles - Fixed:
+    GetTimerInfo - Add debug messages for empty channel list v1.1.0.95 -
+    Fix time mismatch between XBMC and MediaPortal TV Server for new
+    timers (scheduled recordings) - Send genre strings to XBMC for
+    unrecognised genres. No colors in EPG, but at least the text is now
+    ok. v1.1.0.90 - Faster channel switching (around 2 sec faster) -
+    Decrease CPU uage when a buffer underrun occurs v1.1.0.75 - PVR
+    client should abort connection when the TVServerXBMC version is too
+    old v1.1.0.60 - Fix PVR client destroy
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:21 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mediaportal-tvserver.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mediaportal-tvserver.version	2013-03-12 10:54:49.000000000 +0000
@@ -0,0 +1 @@
+1.6.8-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog	2013-03-12 10:55:00.000000000 +0000
@@ -0,0 +1,40 @@
+xbmc-pvr-addons (1.6.9-0precise) precise; urgency=low
+
+  * v1.6.9 - Added Live TV vs. recording conflict handling - Fixed
+    recovering from backend connection loss on Windows - Fixed error
+    when trying to set watched flag for recordings that already have
+    been marked as watched v1.6.8 - Performance improvements - Reduced
+    startup time (Faster loading of EPG, channels, recordings and
+    images) - Reduced resource usage for image caching - Cache recording
+    data (event triggered updates from backend) - Fixed lock when
+    stopping recording playback - Improved general response time - Live
+    TV improvements - Better handling of connection problems - Playback
+    does not stop anymore between program breaks - Fixed seek problems -
+    Timer improvements - Add optional internal recording rule template -
+    Correctly apply backend recording rule settings - Properly add title
+    and subtitle - Fixed Timer deletion - Added advanced option for
+    specifying database host/port - Fixed crash when loading invisibile
+    recordings - Improved Art-work loading - Combine channels with same
+    channum and callsign - Fixed IPv6 support - Fixed Windows XP support
+    - Improved logging, notifications and system labels - Refactored &
+    cleaned up libcmyth (inttypes, names, docs) v1.6.7 - Updated
+    language files from Transifex v1.6.6 - Updated language files from
+    Transifex v1.6.5 New version number by Team XBMC v0.5.0 - Support
+    MythTV 0.26 backends - Allow Timer Deletion - Support reconnecting
+    to backend - Reworked LiveTV (no more stops at show end, fixed USB
+    tuner support) - Performance improvements (adapted socket buffer
+    sizes, removed unnecessary locks) - Stability improvements - Fixed
+    crash on SetRecordingPlayCount and SetRecordingLastPlayedPosition -
+    Fixed crash when addon was restarted - Fixed crash when backend
+    connection was lost - Fixed memory leaks in libcmyth - Show correct
+    start/end time in recordings- and timer view v0.4.0 - OSX support
+    v0.3.0 - Transifex localizations - Support for recording images
+    (icon, thumbnail, fanart) - Fixed: Preview images of new recordings
+    were not cached v0.2.0 - Added setting to enable / disable Live TV
+    support (disbale to use the addon only for watching recordings)
+    v0.1.0 - Initial version based on Tonny Pettersen's work - Supports
+    Live TV &amp; Recordings, listening to Radio channels, EPG and Timer
+    - Supports setting / reading resume bookmarks and watched state on
+    MythTV backend
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:55:00 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.changelog.old	2013-03-12 10:53:29.000000000 +0000
@@ -0,0 +1,40 @@
+xbmc-pvr-addons (1.6.9-0quantal) quantal; urgency=low
+
+  * v1.6.9 - Added Live TV vs. recording conflict handling - Fixed
+    recovering from backend connection loss on Windows - Fixed error
+    when trying to set watched flag for recordings that already have
+    been marked as watched v1.6.8 - Performance improvements - Reduced
+    startup time (Faster loading of EPG, channels, recordings and
+    images) - Reduced resource usage for image caching - Cache recording
+    data (event triggered updates from backend) - Fixed lock when
+    stopping recording playback - Improved general response time - Live
+    TV improvements - Better handling of connection problems - Playback
+    does not stop anymore between program breaks - Fixed seek problems -
+    Timer improvements - Add optional internal recording rule template -
+    Correctly apply backend recording rule settings - Properly add title
+    and subtitle - Fixed Timer deletion - Added advanced option for
+    specifying database host/port - Fixed crash when loading invisibile
+    recordings - Improved Art-work loading - Combine channels with same
+    channum and callsign - Fixed IPv6 support - Fixed Windows XP support
+    - Improved logging, notifications and system labels - Refactored &
+    cleaned up libcmyth (inttypes, names, docs) v1.6.7 - Updated
+    language files from Transifex v1.6.6 - Updated language files from
+    Transifex v1.6.5 New version number by Team XBMC v0.5.0 - Support
+    MythTV 0.26 backends - Allow Timer Deletion - Support reconnecting
+    to backend - Reworked LiveTV (no more stops at show end, fixed USB
+    tuner support) - Performance improvements (adapted socket buffer
+    sizes, removed unnecessary locks) - Stability improvements - Fixed
+    crash on SetRecordingPlayCount and SetRecordingLastPlayedPosition -
+    Fixed crash when addon was restarted - Fixed crash when backend
+    connection was lost - Fixed memory leaks in libcmyth - Show correct
+    start/end time in recordings- and timer view v0.4.0 - OSX support
+    v0.3.0 - Transifex localizations - Support for recording images
+    (icon, thumbnail, fanart) - Fixed: Preview images of new recordings
+    were not cached v0.2.0 - Added setting to enable / disable Live TV
+    support (disbale to use the addon only for watching recordings)
+    v0.1.0 - Initial version based on Tonny Pettersen's work - Supports
+    Live TV &amp; Recordings, listening to Radio channels, EPG and Timer
+    - Supports setting / reading resume bookmarks and watched state on
+    MythTV backend
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:29 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-mythtv-cmyth.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-mythtv-cmyth.version	2013-03-12 10:54:57.000000000 +0000
@@ -0,0 +1 @@
+1.6.9-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog	2013-03-12 10:54:46.000000000 +0000
@@ -0,0 +1,16 @@
+xbmc-pvr-addons (1.6.4-0precise) precise; urgency=low
+
+  * v1.6.4 - small change to improve the performance of radio channels
+    v1.6.3 - updated language files from Transifex v1.6.2 - updated
+    language files from Transifex v1.6.0 - New version number by Team
+    XBMC v1.0.1.0 - added: new experimental timeshift support. This
+    requires updated backend components, otherwise falls back to
+    previous non-timeshift live tv. - added: new 'advanced' settings
+    page where timeshift can be enabled/disabled. - added: radio
+    support, mainly to workaround an XBMC channel group bug. - changed:
+    now using XBMC curl abstraction for HTTP requests - added: detection
+    of live tv having to exit if tuner was required for a recording.
+    Shows user a notification message when this was required. v1.0.0.0 -
+    Created
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:46 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.changelog.old	2013-03-12 10:53:15.000000000 +0000
@@ -0,0 +1,16 @@
+xbmc-pvr-addons (1.6.4-0quantal) quantal; urgency=low
+
+  * v1.6.4 - small change to improve the performance of radio channels
+    v1.6.3 - updated language files from Transifex v1.6.2 - updated
+    language files from Transifex v1.6.0 - New version number by Team
+    XBMC v1.0.1.0 - added: new experimental timeshift support. This
+    requires updated backend components, otherwise falls back to
+    previous non-timeshift live tv. - added: new 'advanced' settings
+    page where timeshift can be enabled/disabled. - added: radio
+    support, mainly to workaround an XBMC channel group bug. - changed:
+    now using XBMC curl abstraction for HTTP requests - added: detection
+    of live tv having to exit if tuner was required for a recording.
+    Shows user a notification message when this was required. v1.0.0.0 -
+    Created
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:15 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-nextpvr.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-nextpvr.version	2013-03-12 10:54:43.000000000 +0000
@@ -0,0 +1 @@
+1.6.4-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog	2013-03-12 10:54:57.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.2-0precise) precise; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:57 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.changelog.old	2013-03-12 10:53:26.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.2-0quantal) quantal; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:26 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-njoy.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-njoy.version	2013-03-12 10:54:54.000000000 +0000
@@ -0,0 +1 @@
+1.6.2-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog	2013-03-12 10:54:43.000000000 +0000
@@ -0,0 +1,35 @@
+xbmc-pvr-addons (1.6.19-0precise) precise; urgency=low
+
+  * - add timeshift skip support (FF/RW still not working) - fix bug in
+    tvh webroot processing 1.6.18 - ensure channel count is not cleared
+    after succesful sub - fix default webroot param - remove missing
+    files from recordings list - expand dvr directories to full
+    hierarchy 1.6.17 - fixed possible crash after reconnecting 1.6.16 -
+    correct some signed/unsigned mixups - added imagecache support
+    (icons on the backend) 1.6.15 - fix false disconnects by raising
+    default (hardcoded) read timeout value when opening streams from 10
+    to 20 seconds. 1.6.14 - fix errors sent by client when fetching
+    events for a channel with no epg data 1.6.13 - make channel.radio to
+    not reset to false during update if tvheadend not provided channel
+    services - change handling of EPG events to not fail all events if
+    only one/few events were broken/malformed 1.6.12 - fix instant
+    recordings when channel has no epg data 1.6.11 - disable read
+    timeout check while the stream is paused 1.6.10 - fixed
+    authentication - display an error message when an error is detected
+    1.6.9 - call to Close() didn't work in CHTSPData::Open() - don't
+    delete and create CHTSPReconnect each time, just stop the thread -
+    don't wait for an iframe but let tvheadend handle it - fixed missing
+    htsmsg_destroy() call after processing an incoming message 1.6.8 -
+    refactor CHTSPConnection - fixed disconnection checks and reconnect
+    when needed - consider the connection dropped if no data has been
+    received for a while - more efficient data reading - shared
+    connection between CHTSPDemux and CHTSPData 1.6.7 - add support for
+    servers with transcoding capabilities 1.6.6 - fixed radio playback
+    1.6.5 - fixed channel and channel group update triggers - ensure
+    that the first demux is an I-frame - add
+    CHTSPConnection::CheckConnection() that waits for a connection to be
+    restored when it was dropped - cleaner CHTSPConnection::Connect() -
+    removed unneeded member in CHTSPDemux - better handling of
+    disconnect and reconnects 1.6.4 - initial release
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:43 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.changelog.old	2013-03-12 10:53:12.000000000 +0000
@@ -0,0 +1,35 @@
+xbmc-pvr-addons (1.6.19-0quantal) quantal; urgency=low
+
+  * - add timeshift skip support (FF/RW still not working) - fix bug in
+    tvh webroot processing 1.6.18 - ensure channel count is not cleared
+    after succesful sub - fix default webroot param - remove missing
+    files from recordings list - expand dvr directories to full
+    hierarchy 1.6.17 - fixed possible crash after reconnecting 1.6.16 -
+    correct some signed/unsigned mixups - added imagecache support
+    (icons on the backend) 1.6.15 - fix false disconnects by raising
+    default (hardcoded) read timeout value when opening streams from 10
+    to 20 seconds. 1.6.14 - fix errors sent by client when fetching
+    events for a channel with no epg data 1.6.13 - make channel.radio to
+    not reset to false during update if tvheadend not provided channel
+    services - change handling of EPG events to not fail all events if
+    only one/few events were broken/malformed 1.6.12 - fix instant
+    recordings when channel has no epg data 1.6.11 - disable read
+    timeout check while the stream is paused 1.6.10 - fixed
+    authentication - display an error message when an error is detected
+    1.6.9 - call to Close() didn't work in CHTSPData::Open() - don't
+    delete and create CHTSPReconnect each time, just stop the thread -
+    don't wait for an iframe but let tvheadend handle it - fixed missing
+    htsmsg_destroy() call after processing an incoming message 1.6.8 -
+    refactor CHTSPConnection - fixed disconnection checks and reconnect
+    when needed - consider the connection dropped if no data has been
+    received for a while - more efficient data reading - shared
+    connection between CHTSPDemux and CHTSPData 1.6.7 - add support for
+    servers with transcoding capabilities 1.6.6 - fixed radio playback
+    1.6.5 - fixed channel and channel group update triggers - ensure
+    that the first demux is an I-frame - add
+    CHTSPConnection::CheckConnection() that waits for a connection to be
+    restored when it was dropped - cleaner CHTSPConnection::Connect() -
+    removed unneeded member in CHTSPDemux - better handling of
+    disconnect and reconnects 1.6.4 - initial release
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:12 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-tvheadend-hts.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-tvheadend-hts.version	2013-03-12 10:54:40.000000000 +0000
@@ -0,0 +1 @@
+1.6.19-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog	2013-03-12 10:54:40.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.4-0precise) precise; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:40 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.changelog.old	2013-03-12 10:53:09.000000000 +0000
@@ -0,0 +1,5 @@
+xbmc-pvr-addons (1.6.4-0quantal) quantal; urgency=low
+
+  * no upstream changelog available
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:09 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vdr-vnsi.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vdr-vnsi.version	2013-03-12 10:54:38.000000000 +0000
@@ -0,0 +1 @@
+1.6.4-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.changelog xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.changelog	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog	2013-03-12 10:54:54.000000000 +0000
@@ -0,0 +1,51 @@
+xbmc-pvr-addons (1.6.7-0precise) precise; urgency=low
+
+  * 0.2.4 - fix: put username & password into the streaming url 0.2.3 -
+    fix: put username & password into recording-url 0.2.2: - fix: escape
+    xml entities in the stream-url before saving to channeldata.xml -
+    fix: fetch the version string from configure.in not the ChangeLog
+    (thanks to 'trans') - fix: rename changelog in addon-directory to
+    changelog.txt 0.2.1: - fix: encode the stream-url properly. Please
+    remove your channeldata.xml file after updating - change: add proper
+    version string to the addon.xml generated by buildzip.bat (thanks to
+    'trans') 0.2.0: - change: Complete rework of timer handling. Now it
+    will only show notifications for changed items - fix: Update / Add /
+    Delete Timers. Note that the timer names in the XBMC are sometimes
+    not updated properly (in the dialog it is OK) - fix: Instant
+    Recordings do now work again - fix: timer status is now shown
+    correctly (completed, recording, disabled) - fix: enabling /
+    disabling timers do now work - change: removed "show completed
+    timers" option (they are now always be shown) - add: added
+    buildzip.bat & xbmc-addon-vuplus.sln (thanks to 'trans') - fix:
+    Channel numbering / incorrect picons due to the change introduced in
+    0.1.15 0.1.15 - fix: when using the channeldata-store option not all
+    channel groups (bouquets) were loaded due to a nulled counter
+    variable 0.1.14 - change: change .gitignores and copy current
+    changelog into the addon folder. This will enable the user to view
+    the changelog in the addon settings window 0.1.13 - add: option to
+    set deepstandby powerstate on the DVB box on PVR-addon shutdown -
+    fix: error in settings.xml, causing crashes on linux 0.1.12 - add:
+    support to specify the folder for storing recordings 0.1.11 - fix:
+    some unicode string errors in german language file - change: add
+    categories to addon settings 0.1.10 - add: support for using only
+    the recording path currently active on the DVB box 0.1.9 - change:
+    add addon icon (copyied from the openelec guys, thanks!) - fix:
+    win32 release target (thanks to 'trans' for patch) 0.1.8 - change:
+    fetch the recording locations and use these locations when querying
+    the recordings - fix: Stop update thread when destroying the PVR
+    addon - fixes shutdown issues 0.1.7 - fix: Copy & Paste error 0.1.6
+    - fix: Change the logic to determine the picon file name from the
+    service reference. 0.1.5 - fix: Fix access violation errors on
+    windows (thanks to 'trans' for finding the correct compiler / linker
+    settings) - fix: do not return out of scope local variable for the
+    streaming URL - fix: remove the last '_' character from the filename
+    (if applicable). Should finally fix the picon path errors. 0.1.4 -
+    fix: limit length of the service reference part of the Icon-Path to
+    30 characters. - fix: Escape "&", "<" and ">" characters in XML
+    channeldata file. - add: support to disable all bouquet or channel
+    updates 0.1.3 - fix: order of timerlist cleanup and timerlist
+    updates 0.1.2 - add: support for storing channel data into a file
+    0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0
+    - Iniital Version
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:54:54 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.changelog.old xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog.old
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.changelog.old	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.changelog.old	2013-03-12 10:53:23.000000000 +0000
@@ -0,0 +1,51 @@
+xbmc-pvr-addons (1.6.7-0quantal) quantal; urgency=low
+
+  * 0.2.4 - fix: put username & password into the streaming url 0.2.3 -
+    fix: put username & password into recording-url 0.2.2: - fix: escape
+    xml entities in the stream-url before saving to channeldata.xml -
+    fix: fetch the version string from configure.in not the ChangeLog
+    (thanks to 'trans') - fix: rename changelog in addon-directory to
+    changelog.txt 0.2.1: - fix: encode the stream-url properly. Please
+    remove your channeldata.xml file after updating - change: add proper
+    version string to the addon.xml generated by buildzip.bat (thanks to
+    'trans') 0.2.0: - change: Complete rework of timer handling. Now it
+    will only show notifications for changed items - fix: Update / Add /
+    Delete Timers. Note that the timer names in the XBMC are sometimes
+    not updated properly (in the dialog it is OK) - fix: Instant
+    Recordings do now work again - fix: timer status is now shown
+    correctly (completed, recording, disabled) - fix: enabling /
+    disabling timers do now work - change: removed "show completed
+    timers" option (they are now always be shown) - add: added
+    buildzip.bat & xbmc-addon-vuplus.sln (thanks to 'trans') - fix:
+    Channel numbering / incorrect picons due to the change introduced in
+    0.1.15 0.1.15 - fix: when using the channeldata-store option not all
+    channel groups (bouquets) were loaded due to a nulled counter
+    variable 0.1.14 - change: change .gitignores and copy current
+    changelog into the addon folder. This will enable the user to view
+    the changelog in the addon settings window 0.1.13 - add: option to
+    set deepstandby powerstate on the DVB box on PVR-addon shutdown -
+    fix: error in settings.xml, causing crashes on linux 0.1.12 - add:
+    support to specify the folder for storing recordings 0.1.11 - fix:
+    some unicode string errors in german language file - change: add
+    categories to addon settings 0.1.10 - add: support for using only
+    the recording path currently active on the DVB box 0.1.9 - change:
+    add addon icon (copyied from the openelec guys, thanks!) - fix:
+    win32 release target (thanks to 'trans' for patch) 0.1.8 - change:
+    fetch the recording locations and use these locations when querying
+    the recordings - fix: Stop update thread when destroying the PVR
+    addon - fixes shutdown issues 0.1.7 - fix: Copy & Paste error 0.1.6
+    - fix: Change the logic to determine the picon file name from the
+    service reference. 0.1.5 - fix: Fix access violation errors on
+    windows (thanks to 'trans' for finding the correct compiler / linker
+    settings) - fix: do not return out of scope local variable for the
+    streaming URL - fix: remove the last '_' character from the filename
+    (if applicable). Should finally fix the picon path errors. 0.1.4 -
+    fix: limit length of the service reference part of the Icon-Path to
+    30 characters. - fix: Escape "&", "<" and ">" characters in XML
+    channeldata file. - add: support to disable all bouquet or channel
+    updates 0.1.3 - fix: order of timerlist cleanup and timerlist
+    updates 0.1.2 - add: support for storing channel data into a file
+    0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0
+    - Iniital Version
+
+ -- wsnipex <wsnipex@a1.net>  Tue, 12 Mar 2013 11:53:23 +0100
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.version xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.version
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/debian/xbmc-pvr-vuplus.version	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/debian/xbmc-pvr-vuplus.version	2013-03-12 10:54:52.000000000 +0000
@@ -0,0 +1 @@
+1.6.7-0precise
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/gensymbols.bat xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/gensymbols.bat
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/gensymbols.bat	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/gensymbols.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-dumpbin /symbols Release\*.obj | grep -E "SECT.. notype \(\) +External +\| \_[^\_]"
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.def xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.def
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.def	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,293 +0,0 @@
-EXPORTS
-	ref_alloc_show
-	ref_set_destroy
-	ref_strdup
-	ref_hold
-	ref_release
-	ref_realloc
-	cmyth_get_bookmark
-	cmyth_set_bookmark
-	cmyth_commbreaklist_create
-	cmyth_commbreak_destroy
-	cmyth_commbreak_create
-	cmyth_rcv_commbreaklist
-	cmyth_get_commbreaklist
-	cmyth_conn_connect_ctrl
-	cmyth_conn_reconnect_ctrl
-	cmyth_conn_connect_event
-	cmyth_conn_reconnect_event
-	cmyth_conn_connect_file
-	cmyth_conn_connect_ring
-	cmyth_conn_connect_recorder
-	cmyth_conn_check_block
-	cmyth_conn_get_recorder_from_num
-	cmyth_conn_get_free_recorder
-	cmyth_conn_get_freespace
-	cmyth_conn_hung
-	cmyth_conn_get_protocol_version
-	cmyth_conn_get_free_recorder_count
-	cmyth_dbg_level
-	cmyth_dbg_all
-	cmyth_dbg_none
-	cmyth_dbg
-	cmyth_set_dbg_msgcallback
-	refmem_dbg_level
-	refmem_dbg_all
-	refmem_dbg_none
-	refmem_dbg
-	cmyth_event_get
-	cmyth_event_select
-	cmyth_file_set_closed_callback
-	cmyth_file_data
-	cmyth_file_control
-	cmyth_file_start
-	cmyth_file_length
-	cmyth_file_get_block
-	cmyth_file_select
-	cmyth_file_request_block
-	cmyth_file_seek
-	cmyth_freespace_create
-	cmyth_inputlist_create
-	cmyth_input_destroy
-	cmyth_input_create
-	cmyth_rcv_free_inputlist
-	cmyth_get_free_inputlist
-	cmyth_keyframe_create
-	cmyth_keyframe_fill
-	cmyth_keyframe_string
-	cmyth_livetv_chain_create
-	cmyth_livetv_chain_get_block
-	cmyth_livetv_chain_switch
-	cmyth_livetv_chain_switch_last
-	cmyth_livetv_seek
-	cmyth_livetv_request_block
-	cmyth_livetv_select
-	cmyth_livetv_get_block
-	cmyth_livetv_chain_update
-	cmyth_livetv_chain_setup
-	cmyth_spawn_live_tv
-	cmyth_mysql_query_create
-	cmyth_mysql_query_reset
-	cmyth_mysql_query_param_long
-	cmyth_mysql_query_param_ulong
-	cmyth_mysql_query_param_int
-	cmyth_mysql_query_param_uint
-	cmyth_mysql_query_param_unixtime
-	cmyth_mysql_query_param_str
-	cmyth_mysql_query_string
-	cmyth_mysql_query_result
-	cmyth_database_close
-	cmyth_database_init
-	cmyth_database_set_host
-	cmyth_database_set_user
-	cmyth_database_set_pass
-	cmyth_database_set_name
-	cmyth_db_get_connection
-	cmyth_schedule_recording
-	cmyth_mysql_escape_chars
-	cmyth_get_offset_mysql
-	cmyth_get_recordid_mysql
-	cmyth_mysql_delete_scheduled_recording
-	cmyth_mysql_insert_into_record
-	cmyth_mysql_get_prev_recorded
-	cmyth_mysql_get_guide
-	cmyth_mysql_get_recgroups
-	cmyth_mysql_get_prog_finder_char_title
-	cmyth_mysql_get_prog_finder_time
-	fill_program_recording_status
-	cmyth_get_bookmark_mark
-	cmyth_get_bookmark_offset
-	cmyth_mysql_get_commbreak_list
-	cmyth_mythtv_remove_previous_recorded
-	cmyth_mysql_testdb_connection
-	cmyth_chanlist_create
-	cmyth_chanlist_get_item
-	cmyth_chanlist_get_count
-	cmyth_channel_chanid
-	cmyth_channel_channum
-	cmyth_channel_channumstr
-	cmyth_channel_name
-	cmyth_channel_icon
-	cmyth_channel_visible
-	cmyth_channel_create
-	cmyth_mysql_get_chanlist
-	cmyth_posmap_create
-	cmyth_proginfo_create
-	cmyth_proginfo_stop_recording
-	cmyth_proginfo_check_recording
-	cmyth_proginfo_delete_recording
-	cmyth_proginfo_forget_recording
-	cmyth_proginfo_get_recorder_num
-	cmyth_proginfo_chan_id
-	cmyth_proginfo_title
-	cmyth_proginfo_subtitle
-	cmyth_proginfo_description
-	cmyth_proginfo_category
-	cmyth_proginfo_seriesid
-	cmyth_proginfo_programid
-	cmyth_proginfo_recordid
-	cmyth_proginfo_priority
-	cmyth_proginfo_stars
-	cmyth_proginfo_playgroup
-	cmyth_proginfo_originalairdate
-	cmyth_proginfo_chanstr
-	cmyth_proginfo_chansign
-	cmyth_proginfo_channame
-	cmyth_proginfo_pathname
-	cmyth_proginfo_length
-	cmyth_proginfo_length_sec
-	cmyth_proginfo_start
-	cmyth_proginfo_end
-	cmyth_proginfo_rec_start
-	cmyth_proginfo_rec_end
-	cmyth_proginfo_rec_status
-	cmyth_proginfo_flags
-	cmyth_proginfo_get_detail
-	cmyth_proginfo_compare
-	cmyth_proginfo_host
-	cmyth_proginfo_card_id
-	cmyth_proginfo_recgroup
-	cmyth_proginfo_year
-	cmyth_get_delete_list
-	cmyth_proglist_create
-	cmyth_proglist_get_item
-	cmyth_proglist_delete_item
-	cmyth_proglist_get_count
-	cmyth_proglist_get_all_recorded
-	cmyth_proglist_get_all_pending
-	cmyth_proglist_get_all_scheduled
-	cmyth_proglist_get_conflicting
-	cmyth_proglist_sort
-	cmyth_recorder_create
-	cmyth_recorder_dup
-	cmyth_recorder_is_recording
-	cmyth_recorder_get_framerate
-	cmyth_recorder_get_frames_written
-	cmyth_recorder_get_free_space
-	cmyth_recorder_get_keyframe_pos
-	cmyth_recorder_get_position_map
-	cmyth_recorder_get_recording
-	cmyth_recorder_stop_playing
-	cmyth_recorder_frontend_ready
-	cmyth_recorder_cancel_next_recording
-	cmyth_recorder_pause
-	cmyth_recorder_finish_recording
-	cmyth_recorder_toggle_channel_favorite
-	cmyth_recorder_change_channel
-	cmyth_recorder_set_channel
-	cmyth_recorder_change_color
-	cmyth_recorder_change_brightness
-	cmyth_recorder_change_contrast
-	cmyth_recorder_change_hue
-	cmyth_recorder_check_channel
-	cmyth_recorder_check_channel_prefix
-	cmyth_recorder_get_cur_proginfo
-	cmyth_recorder_get_next_program_info
-	cmyth_recorder_get_next_proginfo
-	cmyth_recorder_get_input_name
-	cmyth_recorder_seek
-	cmyth_recorder_spawn_livetv
-	cmyth_recorder_spawn_chain_livetv
-	cmyth_recorder_stop_livetv
-	cmyth_recorder_done_ringbuf
-	cmyth_recorder_start_stream
-	cmyth_recorder_end_stream
-	cmyth_recorder_get_filename
-	cmyth_recorder_get_recorder_id
-	cmyth_rec_num_create
-	cmyth_rec_num_hold
-	cmyth_rec_num_release
-	cmyth_rec_num_get
-	cmyth_rec_num_string
-	cmyth_ringbuf_create
-	cmyth_ringbuf_setup
-	cmyth_ringbuf_pathname
-	cmyth_ringbuf_get_block
-	cmyth_ringbuf_select
-	cmyth_ringbuf_request_block
-	cmyth_ringbuf_seek
-	cmyth_timestamp_create
-	cmyth_timestamp_from_string
-	cmyth_timestamp_from_tm
-	cmyth_timestamp_from_unixtime
-	cmyth_timestamp_to_unixtime
-	cmyth_timestamp_to_string
-	cmyth_timestamp_to_isostring
-	cmyth_timestamp_to_display_string
-	cmyth_datetime_to_string
-	cmyth_timestamp_compare
-	cmyth_livetv_chain_switch_last
-	cmyth_proginfo_get_from_basename
-	cmyth_proginfo_delete_recording
-	cmyth_livetv_keep_recording
-	cmyth_conn_connect_path
-	cmyth_proginfo_chanicon
-	cmyth_ringbuf_read
-	cmyth_file_read
-	cmyth_livetv_read
-	cmyth_get_cutlist
-	cmyth_tuner_type_check
-	cmyth_update_bookmark_setting
-	cmyth_proginfo_port
-	cmyth_proginfo_season
-	cmyth_proginfo_episode
-	cmyth_mysql_update_timer
-	cmyth_mysql_delete_timer
-	cmyth_mysql_add_timer
-	cmyth_mysql_get_timers
-	cmyth_mysql_is_radio
-	cmyth_livetv_chain_duration
-	cmyth_timer_recordid
-	cmyth_timer_chanid
-	cmyth_timer_starttime
-	cmyth_timer_endtime
-	cmyth_timer_title
-	cmyth_timer_description
-	cmyth_timer_type
-	cmyth_timer_category
-	cmyth_timer_subtitle
-	cmyth_timer_priority
-	cmyth_timer_startoffset
-	cmyth_timer_endoffset
-	cmyth_timer_searchtype
-	cmyth_timer_inactive
-	cmyth_timer_callsign
-	cmyth_timer_dup_method
-	cmyth_timer_dup_in
-	cmyth_timer_rec_group
-	cmyth_timer_store_group
-	cmyth_timer_play_group
-	cmyth_timer_autotranscode
-	cmyth_timer_userjobs
-	cmyth_timer_autocommflag
-	cmyth_timer_autoexpire
-	cmyth_timer_maxepisodes
-	cmyth_timer_maxnewest
-	cmyth_timerlist_get_item
-	cmyth_timerlist_get_count
-	cmyth_mysql_get_channelgroups
-	cmyth_mysql_get_channelids_in_group
-	cmyth_channel_sourceid
-	cmyth_channel_multiplex
-	cmyth_mysql_get_recorder_list
-	cmyth_mysql_get_prog_finder_time_title_chan
-	cmyth_conn_set_setting
-	cmyth_conn_get_backend_hostname
-	cmyth_conn_get_client_hostname
-	cmyth_conn_get_setting
-	cmyth_timer_transcoder
-	cmyth_mysql_get_storagegroups
-	cmyth_mysql_get_playgroups
-	cmyth_mysql_get_recprofiles
-	cmyth_mysql_get_cardtype
-	cmyth_channel_callsign
-	cmyth_set_watched_status_mysql
-	cmyth_file_position
-	cmyth_update_file_length
-	cmyth_storagegroup_filelist
-	cmyth_storagegroup_filelist_get_item
-	cmyth_storagegroup_filelist_count
-	cmyth_storagegroup_get_filelist
-	cmyth_storagegroup_file_get_filename
-	cmyth_storagegroup_file_get_lastmodified
-	cmyth_storagegroup_file_get_size
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcproj xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcproj
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcproj	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcproj	1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libcmyth_dll"
-	ProjectGUID="{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
-	RootNamespace="libcmyth"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
-			IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;../include;include;../librefmem;../libcmyth"
-				PreprocessorDefinitions="WIN32;DEBUG;_LIB;inline=__inline; _CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/libcmythd.pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mysqlclient.lib"
-				OutputFile="..\..\..\..\system\libcmyth.dll"
-				AdditionalLibraryDirectories="$(ProjectDir)lib"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				ModuleDefinitionFile="libcmyth.def"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
-			IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../include;include;../librefmem;../libcmyth"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline; _CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mysqlclient.lib"
-				OutputFile="..\..\..\..\system\libcmyth.dll"
-				AdditionalLibraryDirectories="$(ProjectDir)lib"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				ModuleDefinitionFile="libcmyth.def"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="h;cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\libcmyth\bookmark.c"
-				>
-			</File>
-			<File
-				RelativePath="..\include\cmyth\cmyth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\cmyth_local.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\commbreak.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\connection.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\freespace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\keyframe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\livetv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\mysql_query.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\mythtv_mysql.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\posmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\proginfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\proglist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\rec_num.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\recorder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\ringbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\safe_string.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\socket.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\timestamp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libcmyth\utf8tolatin1.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="refmem"
-			>
-			<File
-				RelativePath="..\librefmem\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\librefmem\debug_refmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\librefmem\refmem_local.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcxproj xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcxproj
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcxproj	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcxproj	2013-03-12 10:51:22.000000000 +0000
@@ -12,6 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libcmyth\bookmark.c" />
+    <ClCompile Include="..\libcmyth\channel.c" />
     <ClCompile Include="..\libcmyth\commbreak.c" />
     <ClCompile Include="..\libcmyth\connection.c" />
     <ClCompile Include="..\libcmyth\debug.c" />
@@ -26,10 +27,12 @@
     <ClCompile Include="..\libcmyth\posmap.c" />
     <ClCompile Include="..\libcmyth\proginfo.c" />
     <ClCompile Include="..\libcmyth\proglist.c" />
+    <ClCompile Include="..\libcmyth\recordingrule.c" />
     <ClCompile Include="..\libcmyth\rec_num.c" />
     <ClCompile Include="..\libcmyth\recorder.c" />
     <ClCompile Include="..\libcmyth\ringbuf.c" />
     <ClCompile Include="..\libcmyth\socket.c" />
+    <ClCompile Include="..\libcmyth\storagegroup.c" />
     <ClCompile Include="..\libcmyth\timestamp.c" />
     <ClCompile Include="..\libcmyth\utf8tolatin1.c" />
     <ClCompile Include="..\librefmem\alloc.c" />
@@ -38,12 +41,10 @@
   <ItemGroup>
     <ClInclude Include="..\include\cmyth\cmyth.h" />
     <ClInclude Include="..\libcmyth\cmyth_local.h" />
+    <ClInclude Include="..\libcmyth\cmyth_msc.h" />
     <ClInclude Include="..\libcmyth\safe_string.h" />
     <ClInclude Include="..\librefmem\refmem_local.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="libcmyth.def" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>libcmyth</ProjectName>
     <ProjectGuid>{F9E6874D-60A8-49BA-9393-A2105E63ABCF}</ProjectGuid>
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcxproj.filters xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcxproj.filters
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/Win32/libcmyth.vcxproj.filters	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/Win32/libcmyth.vcxproj.filters	2013-03-12 10:51:22.000000000 +0000
@@ -79,6 +79,15 @@
     <ClCompile Include="..\librefmem\debug_refmem.c">
       <Filter>refmem</Filter>
     </ClCompile>
+    <ClCompile Include="..\libcmyth\channel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libcmyth\recordingrule.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libcmyth\storagegroup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\cmyth\cmyth.h">
@@ -93,8 +102,8 @@
     <ClInclude Include="..\librefmem\refmem_local.h">
       <Filter>refmem</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libcmyth.def" />
+    <ClInclude Include="..\libcmyth\cmyth_msc.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/include/cmyth/cmyth.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/include/cmyth/cmyth.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/include/cmyth/cmyth.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/include/cmyth/cmyth.h	2013-03-12 10:51:22.000000000 +0000
@@ -40,12 +40,14 @@
 #ifndef __CMYTH_H
 #define __CMYTH_H
 
-#ifdef __APPLE__ 
+#ifdef __APPLE__
 #include <sys/time.h>
 #else
 #include <time.h>
 #endif
 
+#include <stdint.h>
+
 /*
  * -----------------------------------------------------------------
  * Types
@@ -76,6 +78,11 @@
 struct cmyth_database;
 typedef struct cmyth_database *cmyth_database_t;
 
+typedef enum {
+	ANN_NONE = 0,
+	ANN_MONITOR = 1,
+	ANN_PLAYBACK,
+} cmyth_conn_ann_t;
 
 typedef enum {
 	CHANNEL_DIRECTION_UP = 0,
@@ -146,47 +153,19 @@
 typedef struct cmyth_file *cmyth_file_t;
 
 struct cmyth_commbreak {
-        long long start_mark;
-        long long start_offset;
-        long long end_mark;
-        long long end_offset;
+        int64_t start_mark;
+        int64_t start_offset;
+        int64_t end_mark;
+        int64_t end_offset;
 };
 typedef struct cmyth_commbreak *cmyth_commbreak_t;
 
 struct cmyth_commbreaklist {
         cmyth_commbreak_t *commbreak_list;
-        long commbreak_count;
+        int commbreak_count;
 };
 typedef struct cmyth_commbreaklist *cmyth_commbreaklist_t;
 
-/* Sergio: Added to support the tvguide functionality */
-
-struct cmyth_channel;
-typedef struct cmyth_channel *cmyth_channel_t;
-
-struct cmyth_chanlist;
-typedef struct cmyth_chanlist *cmyth_chanlist_t;
-
-struct cmyth_tvguide_progs;
-typedef struct cmyth_tvguide_progs *cmyth_tvguide_progs_t;
-
-/* fetzerch: Added to support querying of free inputs (is tunable on) */
-struct cmyth_input {
-        char *inputname;
-        unsigned long sourceid;
-        unsigned long inputid;
-        unsigned long cardid;
-        unsigned long multiplexid;
-        unsigned long livetvorder; /* new in V71 */
-};
-typedef struct cmyth_input *cmyth_input_t;
-
-struct cmyth_inputlist {
-        cmyth_input_t *input_list;
-        long input_count;
-};
-typedef struct cmyth_inputlist *cmyth_inputlist_t;
-
 /*
  * -----------------------------------------------------------------
  * Debug Output Control
@@ -251,13 +230,14 @@
  * \return control handle
  */
 extern cmyth_conn_t cmyth_conn_connect_ctrl(char *server,
-					    unsigned short port,
-					    unsigned buflen, int tcp_rcvbuf);
+					    uint16_t port,
+					    uint32_t buflen, int32_t tcp_rcvbuf);
 
 /**
- * Create a control connection to a backend.
+ * Reconnect control connection to a backend.
  * \param control control handle
- * \return integer success
+ * \return success: 1
+ * \return failure: 0
  */
 extern int cmyth_conn_reconnect_ctrl(cmyth_conn_t control);
 
@@ -270,13 +250,14 @@
  * \return event handle
  */
 extern cmyth_conn_t cmyth_conn_connect_event(char *server,
-					     unsigned short port,
-					     unsigned buflen, int tcp_rcvbuf);
+					     uint16_t port,
+					     uint32_t buflen, int32_t tcp_rcvbuf);
 
 /**
- * Re-create an event connection to a backend.
+ * Reconnect event connection to a backend.
  * \param conn control handle
- * \return integer success
+ * \return success: 1
+ * \return failure: 0
  */
 extern int cmyth_conn_reconnect_event(cmyth_conn_t conn);
 
@@ -290,8 +271,7 @@
  */
 extern cmyth_file_t cmyth_conn_connect_file(cmyth_proginfo_t prog,
 					    cmyth_conn_t control,
-					    unsigned buflen, int tcp_rcvbuf);
-
+					    uint32_t buflen, int32_t tcp_rcvbuf);
 
 /**
  * Create a file connection to a backend.
@@ -303,39 +283,39 @@
  * \return file handle
  */
 extern cmyth_file_t cmyth_conn_connect_path(char* path, cmyth_conn_t control,
-					    unsigned buflen, int tcp_rcvbuf, char* storage_group);
+					    uint32_t buflen, int32_t tcp_rcvbuf, char* storage_group);
 
 /**
  * Create a ring buffer connection to a recorder.
  * \param rec recorder handle
  * \param buflen buffer size for the connection to use
  * \param tcp_rcvbuf if non-zero, the TCP receive buffer size for the socket
- * \retval 0 success
- * \retval -1 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
-extern int cmyth_conn_connect_ring(cmyth_recorder_t rec, unsigned buflen,
-				   int tcp_rcvbuf);
+extern int cmyth_conn_connect_ring(cmyth_recorder_t rec, uint32_t buflen,
+				   int32_t tcp_rcvbuf);
 
 /**
  * Create a connection to a recorder.
  * \param rec recorder to connect to
  * \param buflen buffer size for the connection to use
  * \param tcp_rcvbuf if non-zero, the TCP receive buffer size for the socket
- * \retval 0 success
- * \retval -1 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_conn_connect_recorder(cmyth_recorder_t rec,
-				       unsigned buflen, int tcp_rcvbuf);
+				       uint32_t buflen, int32_t tcp_rcvbuf);
 
 /**
  * Check whether a block has finished transfering from a backend.
  * \param conn control handle
  * \param size size of block
- * \retval 0 not complete
- * \retval 1 complete
- * \retval <0 error
+ * \return complete: 1
+ * \return not complete: 0
+ * \return failure: -(errno)
  */
-extern int cmyth_conn_check_block(cmyth_conn_t conn, unsigned long size);
+extern int cmyth_conn_check_block(cmyth_conn_t conn, uint32_t size);
 
 /**
  * Obtain a recorder from a connection by its recorder number.
@@ -344,7 +324,7 @@
  * \return recorder handle
  */
 extern cmyth_recorder_t cmyth_conn_get_recorder_from_num(cmyth_conn_t conn,
-							 int num);
+							 int32_t id);
 
 /**
  * Obtain the next available free recorder on a backend.
@@ -358,18 +338,18 @@
  * \param control control handle
  * \param[out] total total disk space
  * \param[out] used used disk space
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_conn_get_freespace(cmyth_conn_t control,
-				    long long *total, long long *used);
+				    int64_t *total, int64_t *used);
 
 /**
  * Determine if a control connection is not responding.
  * \param control control handle
- * \retval 0 not hung
- * \retval 1 hung
- * \retval <0 error
+ * \return not hung: 0
+ * \return hung: 1
+ * \return failure: -(errno)
  */
 extern int cmyth_conn_hung(cmyth_conn_t control);
 
@@ -378,14 +358,14 @@
  * \param conn connection handle
  * \return number of free recorders
  */
-extern int cmyth_conn_get_free_recorder_count(cmyth_conn_t conn);
+extern int32_t cmyth_conn_get_free_recorder_count(cmyth_conn_t conn);
 
 /**
  * Determine the MythTV protocol version being used.
  * \param conn connection handle
  * \return protocol version
  */
-extern int cmyth_conn_get_protocol_version(cmyth_conn_t conn);
+extern int32_t cmyth_conn_get_protocol_version(cmyth_conn_t conn);
 
 /**
  * Return a MythTV setting for a hostname
@@ -403,7 +383,8 @@
  * \param hostname hostname to apply the setting to
  * \param setting the setting name to set
  * \param value the value of the setting
- * \retval <0 for failure
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_conn_set_setting(cmyth_conn_t conn,
                const char* hostname, const char* setting, const char* value);
@@ -411,7 +392,7 @@
 /**
  * Get the backend hostname used in the settings database
  * \param conn connection handle
- * \retval ref counted string with backend hostname
+ * \return ref counted string with backend hostname
  */
 extern char* cmyth_conn_get_backend_hostname(cmyth_conn_t conn);
 
@@ -425,10 +406,11 @@
 /**
  * Issues a run of the re-scheduler
  * \param conn connection handle
- * \param recordid or -1 performs a full run
- * \retval <0 for failure
+ * \param recordid or -1 (0xFFFFFFFF) performs a full run
+ * \return success: 0
+ * \return failure: -(errno)
  */
-extern int cmyth_conn_reschedule_recordings(cmyth_conn_t conn, int recordid);
+extern int cmyth_conn_reschedule_recordings(cmyth_conn_t conn, uint32_t recordid);
 
 /*
  * -----------------------------------------------------------------
@@ -443,15 +425,26 @@
  * \param len size of data buffer
  * \return event type
  */
-extern cmyth_event_t cmyth_event_get(cmyth_conn_t conn, char * data, int len);
+extern cmyth_event_t cmyth_event_get(cmyth_conn_t conn, char * data, int32_t len);
 
 /**
  * Selects on the event socket, waiting for an event to show up.
  * allows nonblocking access to events.
- * \return <= 0 on failure
+ * \return success: >0
+ * \retutn timeout: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_event_select(cmyth_conn_t conn, struct timeval *timeout);
 
+/**
+ * Retrieve an event from a backend.
+ * \param conn connection handle
+ * \param[out] data data, if the event returns any
+ * \param len size of data buffer
+ * \return event message handle
+ */
+extern cmyth_event_t cmyth_event_get_message(cmyth_conn_t conn, char * data, int32_t len, cmyth_proginfo_t * proginfo);
+
 /*
  * -----------------------------------------------------------------
  * Recorder Operations
@@ -474,9 +467,9 @@
 /**
  * Determine if a recorder is in use.
  * \param rec recorder handle
- * \retval 0 not recording
- * \retval 1 recording
- * \retval <0 error
+ * \return recording: 1
+ * \return not recording: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_recorder_is_recording(cmyth_recorder_t rec);
 
@@ -484,22 +477,22 @@
  * Determine the framerate for a recorder.
  * \param rec recorder handle
  * \param[out] rate framerate
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_recorder_get_framerate(cmyth_recorder_t rec,
 					double *rate);
 
-extern long long cmyth_recorder_get_frames_written(cmyth_recorder_t rec);
+extern int64_t cmyth_recorder_get_frames_written(cmyth_recorder_t rec);
 
-extern long long cmyth_recorder_get_free_space(cmyth_recorder_t rec);
+extern int64_t cmyth_recorder_get_free_space(cmyth_recorder_t rec);
 
-extern long long cmyth_recorder_get_keyframe_pos(cmyth_recorder_t rec,
-						 unsigned long keynum);
+extern int64_t cmyth_recorder_get_keyframe_pos(cmyth_recorder_t rec,
+						 uint32_t keynum);
 
 extern cmyth_posmap_t cmyth_recorder_get_position_map(cmyth_recorder_t rec,
-						      unsigned long start,
-						      unsigned long end);
+						      uint32_t start,
+						      uint32_t end);
 
 extern cmyth_proginfo_t cmyth_recorder_get_recording(cmyth_recorder_t rec);
 
@@ -507,13 +500,19 @@
 
 extern int cmyth_recorder_frontend_ready(cmyth_recorder_t rec);
 
-extern int cmyth_recorder_cancel_next_recording(cmyth_recorder_t rec);
+/**
+ * Cancel the next pending recording.
+ * \param rec recorder handle
+ * \return success: 0
+ * \return failure: -(errno)
+ */
+extern int cmyth_recorder_cancel_next_recording(cmyth_recorder_t rec, int cancel);
 
 /**
  * Request that the recorder stop transmitting data.
  * \param rec recorder handle
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_recorder_pause(cmyth_recorder_t rec);
 
@@ -525,8 +524,8 @@
  * Request that the recorder change the channel being recorded.
  * \param rec recorder handle
  * \param direction direction in which to change channel
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_recorder_change_channel(cmyth_recorder_t rec,
 					 cmyth_channeldir_t direction);
@@ -535,8 +534,8 @@
  * Set the channel for a recorder.
  * \param rec recorder handle
  * \param channame channel name to change to
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_recorder_set_channel(cmyth_recorder_t rec,
 				      char *channame);
@@ -571,8 +570,8 @@
  * \param rec recorder handle
  * \param current current program
  * \param direction direction of next program
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern cmyth_proginfo_t cmyth_recorder_get_next_proginfo(
 	cmyth_recorder_t rec,
@@ -583,10 +582,10 @@
 					 char *name,
 					 unsigned len);
 
-extern long long cmyth_recorder_seek(cmyth_recorder_t rec,
-				     long long pos,
-				     cmyth_whence_t whence,
-				     long long curpos);
+extern int64_t cmyth_recorder_seek(cmyth_recorder_t rec,
+				     int64_t pos,
+				     int8_t whence,
+				     int64_t curpos);
 
 extern int cmyth_recorder_spawn_chain_livetv(cmyth_recorder_t rec, char* channame);
 
@@ -598,7 +597,7 @@
 extern char*cmyth_recorder_get_filename(cmyth_recorder_t rec);
 extern int cmyth_recorder_stop_livetv(cmyth_recorder_t rec);
 extern int cmyth_recorder_done_ringbuf(cmyth_recorder_t rec);
-extern int cmyth_recorder_get_recorder_id(cmyth_recorder_t rec);
+extern uint32_t cmyth_recorder_get_recorder_id(cmyth_recorder_t rec);
 
 /*
  * -----------------------------------------------------------------
@@ -610,7 +609,7 @@
 
 extern cmyth_file_t cmyth_livetv_get_cur_file(cmyth_recorder_t rec);
 
-extern long long cmyth_livetv_chain_duration(cmyth_recorder_t rec);
+extern int64_t cmyth_livetv_chain_duration(cmyth_recorder_t rec);
 
 extern int cmyth_livetv_chain_switch(cmyth_recorder_t rec, int dir);
 
@@ -625,50 +624,47 @@
 extern int cmyth_livetv_done_recording(cmyth_recorder_t rec, char * msg);
 
 extern cmyth_recorder_t cmyth_spawn_live_tv(cmyth_recorder_t rec,
-										unsigned buflen,
-										int tcp_rcvbuf,
-                    void (*prog_update_callback)(cmyth_proginfo_t),
-										char ** err, char * channame);
+				uint32_t buflen,
+				int32_t tcp_rcvbuf,
+				void (*prog_update_callback)(cmyth_proginfo_t),
+				char ** err, char * channame);
 
 extern cmyth_recorder_t cmyth_livetv_chain_setup(cmyth_recorder_t old_rec,
-						 int tcp_rcvbuf,
-						 void (*prog_update_callback)(cmyth_proginfo_t));
+				int32_t tcp_rcvbuf,
+				void (*prog_update_callback)(cmyth_proginfo_t));
 
-extern int cmyth_livetv_get_block(cmyth_recorder_t rec, char *buf,
-                                  unsigned long len);
+extern int32_t cmyth_livetv_get_block(cmyth_recorder_t rec, char *buf,
+                                int32_t len);
 
 extern int cmyth_livetv_select(cmyth_recorder_t rec, struct timeval *timeout);
 
-extern int cmyth_livetv_request_block(cmyth_recorder_t rec, unsigned long len);
+extern int32_t cmyth_livetv_request_block(cmyth_recorder_t rec, int32_t len);
 
-extern long long cmyth_livetv_seek(cmyth_recorder_t rec,
-						long long offset, int whence);
+extern int64_t cmyth_livetv_seek(cmyth_recorder_t rec,
+				int64_t offset, int8_t whence);
 
-extern int cmyth_livetv_read(cmyth_recorder_t rec,
-			     char *buf,
-			     unsigned long len);
+extern int32_t cmyth_livetv_read(cmyth_recorder_t rec,
+				char *buf,
+				int32_t len);
 
-extern int cmyth_livetv_keep_recording(cmyth_recorder_t rec, cmyth_database_t db, int keep);
-
-extern int mythtv_new_livetv(void);
-extern int cmyth_tuner_type_check(cmyth_database_t db, cmyth_recorder_t rec, int check_tuner_enabled);
+extern int cmyth_mysql_tuner_type_check(cmyth_database_t db, cmyth_recorder_t rec, int check_tuner_enabled);
 
 /*
  * -----------------------------------------------------------------
- * Database Operations 
+ * Database Operations
  * -----------------------------------------------------------------
  */
 
-extern cmyth_database_t cmyth_database_init(char *host, char *db_name, char *user, char *pass);
+extern cmyth_database_t cmyth_database_init(char *host, char *db_name, char *user, char *pass, unsigned short port);
 extern void             cmyth_database_close(cmyth_database_t db);
-extern cmyth_chanlist_t myth_tvguide_load_channels(cmyth_database_t db,
-																									 int sort_desc);
+
 extern int cmyth_database_set_host(cmyth_database_t db, char *host);
 extern int cmyth_database_set_user(cmyth_database_t db, char *user);
 extern int cmyth_database_set_pass(cmyth_database_t db, char *pass);
 extern int cmyth_database_set_name(cmyth_database_t db, char *name);
+extern int cmyth_database_set_port(cmyth_database_t db, uint16_t port);
 
-extern int cmyth_set_watched_status_mysql(cmyth_database_t db, cmyth_proginfo_t prog, int watchedStat);
+extern uint32_t cmyth_database_get_version(cmyth_database_t db);
 
 extern int cmyth_database_setup(cmyth_database_t db);
 
@@ -683,22 +679,22 @@
 
 extern cmyth_recorder_t cmyth_ringbuf_setup(cmyth_recorder_t old_rec);
 
-extern int cmyth_ringbuf_request_block(cmyth_recorder_t rec,
-				       unsigned long len);
+extern int32_t cmyth_ringbuf_request_block(cmyth_recorder_t rec,
+				       int32_t len);
 
 extern int cmyth_ringbuf_select(cmyth_recorder_t rec, struct timeval *timeout);
 
-extern int cmyth_ringbuf_get_block(cmyth_recorder_t rec,
+extern int32_t cmyth_ringbuf_get_block(cmyth_recorder_t rec,
 				   char *buf,
-				   unsigned long len);
+				   int32_t len);
 
-extern long long cmyth_ringbuf_seek(cmyth_recorder_t rec,
-				    long long offset,
-				    int whence);
+extern int64_t cmyth_ringbuf_seek(cmyth_recorder_t rec,
+				    int64_t offset,
+				    int8_t whence);
 
-extern int cmyth_ringbuf_read(cmyth_recorder_t rec,
+extern int32_t cmyth_ringbuf_read(cmyth_recorder_t rec,
 			      char *buf,
-			      unsigned long len);
+			      int32_t len);
 /*
  * -----------------------------------------------------------------
  * Recorder Number Operations
@@ -707,8 +703,8 @@
 extern cmyth_rec_num_t cmyth_rec_num_create(void);
 
 extern cmyth_rec_num_t cmyth_rec_num_get(char *host,
-					 unsigned short port,
-					 unsigned id);
+					 uint16_t port,
+					 int32_t id);
 
 extern char *cmyth_rec_num_string(cmyth_rec_num_t rn);
 
@@ -719,7 +715,7 @@
  */
 extern cmyth_timestamp_t cmyth_timestamp_create(void);
 
-extern cmyth_timestamp_t cmyth_timestamp_from_string(char *str);
+extern cmyth_timestamp_t cmyth_timestamp_from_string(const char *str);
 
 extern cmyth_timestamp_t cmyth_timestamp_from_unixtime(time_t l);
 
@@ -730,7 +726,7 @@
 extern int cmyth_timestamp_to_isostring(char *str, cmyth_timestamp_t ts);
 
 extern int cmyth_timestamp_to_display_string(char *str, cmyth_timestamp_t ts,
-																						 int time_format_12);
+				   int time_format_12);
 
 extern int cmyth_datetime_to_string(char *str, cmyth_timestamp_t ts);
 
@@ -746,10 +742,6 @@
  */
 extern cmyth_keyframe_t cmyth_keyframe_create(void);
 
-extern cmyth_keyframe_t cmyth_keyframe_tcmyth_keyframe_get(
-	unsigned long keynum,
-	unsigned long long pos);
-
 extern char *cmyth_keyframe_string(cmyth_keyframe_t kf);
 
 /*
@@ -811,8 +803,8 @@
  * Delete a program.
  * \param control backend control handle
  * \param prog proginfo handle
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_proginfo_delete_recording(cmyth_conn_t control,
 					   cmyth_proginfo_t prog);
@@ -821,8 +813,8 @@
  * Delete a program such that it may be recorded again.
  * \param control backend control handle
  * \param prog proginfo handle
- * \retval 0 success
- * \retval <0 error
+ * \return success: 0
+ * \return failure: -(errno)
  */
 extern int cmyth_proginfo_forget_recording(cmyth_conn_t control,
 					   cmyth_proginfo_t prog);
@@ -832,7 +824,20 @@
 					   cmyth_proginfo_t prog);
 
 extern cmyth_proginfo_t cmyth_proginfo_get_from_basename(cmyth_conn_t control,
-							 const char* basename);
+					   const char* basename);
+
+/**
+ * Retrieve the program with its timeslot.
+ * 'recstartts' is the timeslot start time received from the message of backend
+ *  event 'RECORDING LIST CHANGE'.  Uses UTC time since protocol 75.
+ * \param control backend control handle
+ * \param chanid channel id
+ * \param recstartts recstartts
+ * \return NULL or proginfo handle
+ */
+extern cmyth_proginfo_t cmyth_proginfo_get_from_timeslot(cmyth_conn_t control,
+					   uint32_t chanid,
+					   time_t recstartts);
 
 /**
  * Retrieve the title of a program.
@@ -860,14 +865,14 @@
  * \param prog proginfo handle
  * \return season
  */
-extern unsigned short cmyth_proginfo_season(cmyth_proginfo_t prog);
+extern uint16_t cmyth_proginfo_season(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the episode of a program.
  * \param prog proginfo handle
  * \return episode
  */
-extern unsigned short cmyth_proginfo_episode(cmyth_proginfo_t prog);
+extern uint16_t cmyth_proginfo_episode(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the category of a program.
@@ -902,7 +907,7 @@
  * \param prog proginfo handle
  * \return channel number
  */
-extern long cmyth_proginfo_chan_id(cmyth_proginfo_t prog);
+extern uint32_t cmyth_proginfo_chan_id(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the pathname of a program file.
@@ -935,16 +940,16 @@
 /**
  * Retrieve the record ID of the matching record rule
  * \param prog proginfo handle
- * \return unsigned long
+ * \return uint32_t
  */
-extern unsigned long cmyth_proginfo_recordid(cmyth_proginfo_t prog);
+extern uint32_t cmyth_proginfo_recordid(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the priority of a program
  * \param prog proginfo handle
- * \return long
+ * \return int32_t
  */
-extern long cmyth_proginfo_priority(cmyth_proginfo_t prog);
+extern int8_t cmyth_proginfo_priority(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the critics rating (number of stars) of a program.
@@ -987,7 +992,7 @@
  * \param prog proginfo handle
  * \return flags
  */
-extern unsigned long cmyth_proginfo_flags(
+extern uint32_t cmyth_proginfo_flags(
   cmyth_proginfo_t prog);
 
 /**
@@ -995,7 +1000,7 @@
  * \param prog proginfo handle
  * \return program length
  */
-extern long long cmyth_proginfo_length(cmyth_proginfo_t prog);
+extern int64_t cmyth_proginfo_length(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the hostname of the MythTV backend that recorded a program.
@@ -1004,14 +1009,14 @@
  */
 extern char *cmyth_proginfo_host(cmyth_proginfo_t prog);
 
-extern int cmyth_proginfo_port(cmyth_proginfo_t prog);
+extern uint16_t cmyth_proginfo_port(cmyth_proginfo_t prog);
 
 /**
  * Determine if two proginfo handles refer to the same program.
  * \param a proginfo handle a
  * \param b proginfo handle b
- * \retval 0 programs are the same
- * \retval -1 programs are different
+ * \return programs are the same: 0
+ * \return programs are different: -1
  */
 extern int cmyth_proginfo_compare(cmyth_proginfo_t a, cmyth_proginfo_t b);
 
@@ -1020,7 +1025,7 @@
  * \param prog proginfo handle
  * \return program length in seconds
  */
-extern int cmyth_proginfo_length_sec(cmyth_proginfo_t prog);
+extern uint32_t cmyth_proginfo_length_sec(cmyth_proginfo_t prog);
 
 extern cmyth_proginfo_t cmyth_proginfo_get_detail(cmyth_conn_t control,
 						  cmyth_proginfo_t p);
@@ -1044,7 +1049,7 @@
  * \param prog proginfo handle
  * \return card ID
  */
-extern long cmyth_proginfo_card_id(cmyth_proginfo_t prog);
+extern uint32_t cmyth_proginfo_card_id(cmyth_proginfo_t prog);
 
 /**
  * Retrieve the recording group of a program.
@@ -1066,7 +1071,7 @@
  * \param prog proginfo handle
  * \return production year
  */
-extern unsigned short cmyth_proginfo_year(cmyth_proginfo_t prog);
+extern uint16_t cmyth_proginfo_year(cmyth_proginfo_t prog);
 
 /*
  * -----------------------------------------------------------------
@@ -1102,58 +1107,29 @@
  */
 extern cmyth_conn_t cmyth_file_data(cmyth_file_t file);
 
-extern unsigned long long cmyth_file_start(cmyth_file_t file);
+extern int64_t cmyth_file_start(cmyth_file_t file);
 
-extern unsigned long long cmyth_file_length(cmyth_file_t file);
+extern int64_t cmyth_file_length(cmyth_file_t file);
 
-extern unsigned long long cmyth_file_position(cmyth_file_t file);
+extern int64_t cmyth_file_position(cmyth_file_t file);
 
-extern int cmyth_update_file_length(cmyth_file_t file, unsigned long long newLength);
+extern int cmyth_file_update_length(cmyth_file_t file, int64_t newlen);
 
-extern int cmyth_file_get_block(cmyth_file_t file, char *buf,
-				unsigned long len);
+extern int32_t cmyth_file_get_block(cmyth_file_t file, char *buf, int32_t len);
 
-extern int cmyth_file_request_block(cmyth_file_t file, unsigned long len);
+extern int32_t cmyth_file_request_block(cmyth_file_t file, int32_t len);
 
-extern long long cmyth_file_seek(cmyth_file_t file,
-				 long long offset, int whence);
+extern int64_t cmyth_file_seek(cmyth_file_t file, int64_t offset, int8_t whence);
 
 extern int cmyth_file_select(cmyth_file_t file, struct timeval *timeout);
 
-extern void cmyth_file_set_closed_callback(cmyth_file_t file,
-					void (*callback)(cmyth_file_t));
+extern void cmyth_file_set_closed_callback(cmyth_file_t file, void (*callback)(cmyth_file_t));
 
-extern int cmyth_file_read(cmyth_file_t file,
-			   char *buf,
-			   unsigned long len);
+extern int32_t cmyth_file_read(cmyth_file_t file, char *buf, int32_t len);
 
 extern int cmyth_file_is_open(cmyth_file_t file);
 
-extern int cmyth_file_set_timeout(cmyth_file_t file, int fast);
-
-/*
- * -----------------------------------------------------------------
- * Channel Operations
- * -----------------------------------------------------------------
- */
-
-extern long cmyth_channel_chanid(cmyth_channel_t channel);
-
-extern long cmyth_channel_channum(cmyth_channel_t channel);
-
-extern char * cmyth_channel_channumstr(cmyth_channel_t channel);
-
-extern char * cmyth_channel_callsign(cmyth_channel_t channel);
-
-extern char * cmyth_channel_name(cmyth_channel_t channel);
-
-extern char * cmyth_channel_icon(cmyth_channel_t channel);
-
-extern int cmyth_channel_visible(cmyth_channel_t channel);
-
-extern cmyth_channel_t cmyth_chanlist_get_item(cmyth_chanlist_t pl, int index);
-
-extern int cmyth_chanlist_get_count(cmyth_chanlist_t pl);
+extern int cmyth_file_set_timeout(cmyth_file_t file, int32_t fast);
 
 /*
  * -----------------------------------------------------------------
@@ -1167,12 +1143,11 @@
  * Bookmark,Commercial Skip Operations
  * -------
  */
-extern long long cmyth_get_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog);
-extern int cmyth_get_bookmark_offset(cmyth_database_t db, long chanid, long long mark, time_t starttime, int mode);
-extern int cmyth_update_bookmark_setting(cmyth_database_t, cmyth_proginfo_t);
-extern long long cmyth_get_bookmark_mark(cmyth_database_t, cmyth_proginfo_t, long long, int);
-extern int cmyth_set_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog,
-	long long bookmark);
+extern int64_t cmyth_get_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog);
+extern int64_t cmyth_mysql_get_bookmark_offset(cmyth_database_t db, uint32_t chanid, int64_t mark, time_t starttime, int mode);
+extern int cmyth_mysql_update_bookmark_setting(cmyth_database_t db, cmyth_proginfo_t prog);
+extern int64_t cmyth_mysql_get_bookmark_mark(cmyth_database_t db, cmyth_proginfo_t prog, int64_t bk, int mode);
+extern int cmyth_set_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog, int64_t bookmark);
 extern cmyth_commbreaklist_t cmyth_commbreaklist_create(void);
 extern cmyth_commbreak_t cmyth_commbreak_create(void);
 extern cmyth_commbreaklist_t cmyth_mysql_get_commbreaklist(cmyth_database_t db, cmyth_conn_t conn, cmyth_proginfo_t prog);
@@ -1181,187 +1156,1128 @@
 extern int cmyth_rcv_commbreaklist(cmyth_conn_t conn, int *err, cmyth_commbreaklist_t breaklist, int count);
 
 /*
- * -------
+ * mysql info
+ */
+
+
+typedef struct cmyth_program {
+	uint32_t chanid;
+	char callsign[21];
+	char name[65];
+	uint32_t sourceid;
+	char title[129];
+	char subtitle[129];
+	char description[1921];
+	time_t starttime;
+	time_t endtime;
+	char programid[65];
+	char seriesid[65];
+	char category[65];
+	char category_type[65];
+	int8_t rec_status;
+	uint32_t channum;
+} cmyth_program_t;
+
+typedef struct cmyth_recgrougs {
+	char recgroups[33];
+} cmyth_recgroups_t;
+
+extern int cmyth_mysql_get_recgroups(cmyth_database_t, cmyth_recgroups_t **);
+
+extern int cmyth_mysql_get_prog_finder_char_title(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, char *program_name);
+extern int cmyth_mysql_get_prog_finder_time(cmyth_database_t db, cmyth_program_t **prog,  time_t starttime, char *program_name);
+extern int cmyth_mysql_get_prog_finder_time_title_chan(cmyth_database_t db, cmyth_program_t *prog, time_t starttime, char *program_name, uint32_t chanid);
+extern int cmyth_mysql_get_guide(cmyth_database_t db, cmyth_program_t **prog, uint32_t chanid, time_t starttime, time_t endtime);
+extern int cmyth_mysql_testdb_connection(cmyth_database_t db,char **message);
+extern char *cmyth_mysql_escape_chars(cmyth_database_t db, char * string);
+extern int cmyth_mysql_get_commbreak_list(cmyth_database_t db, uint32_t chanid, time_t start_ts_dt, cmyth_commbreaklist_t breaklist, uint32_t conn_version);
+
+extern int cmyth_mysql_get_prev_recorded(cmyth_database_t db, cmyth_program_t **prog);
+
+extern int cmyth_get_delete_list(cmyth_conn_t, char *, cmyth_proglist_t);
+
+extern int cmyth_mysql_set_watched_status(cmyth_database_t db, cmyth_proginfo_t prog, int watchedStat);
+
+
+/*
+ * -----------------------------------------------------------------
  * Card Input Operations
- * -------
+ * -----------------------------------------------------------------
  */
+
+struct cmyth_input {
+	char *inputname;
+	uint32_t sourceid;
+	uint32_t inputid;
+	uint32_t cardid;
+	uint32_t multiplexid;
+	uint32_t livetvorder; /* new in V71 */
+};
+
+typedef struct cmyth_input *cmyth_input_t;
+
+struct cmyth_inputlist {
+	cmyth_input_t *input_list;
+	int input_count;
+};
+
+typedef struct cmyth_inputlist *cmyth_inputlist_t;
+
 extern cmyth_inputlist_t cmyth_inputlist_create(void);
+
 extern cmyth_input_t cmyth_input_create(void);
+
 extern cmyth_inputlist_t cmyth_get_free_inputlist(cmyth_recorder_t rec);
-extern int cmyth_rcv_free_inputlist(cmyth_conn_t conn, int *err, cmyth_inputlist_t inputlist, int count);
 
+extern int cmyth_rcv_free_inputlist(cmyth_conn_t conn, int *err, cmyth_inputlist_t inputlist, int count);
 
 /*
- * mysql info
+ * -----------------------------------------------------------------
+ * Recording Schedule Operations
+ * -----------------------------------------------------------------
  */
 
+struct cmyth_recordingrule;
+typedef struct cmyth_recordingrule *cmyth_recordingrule_t;
 
-typedef struct cmyth_program {
-	int chanid;
-	char callsign[30];
-	char name[84];
-	int sourceid;
-	char title[150];
-	char subtitle[150];
-	char description[280];
-	time_t starttime;
-	time_t endtime;
-	char programid[30];
-	char seriesid[24];
-	char category[84];
-	int recording;
-	int rec_status;
-	int channum;
-	int event_flags;
-	int startoffset;
-	int endoffset;
-}cmyth_program_t;
+struct cmyth_recordingrulelist;
+typedef struct cmyth_recordingrulelist *cmyth_recordingrulelist_t;
 
-typedef struct cmyth_recgrougs {
-	char recgroups[33];
-}cmyth_recgroups_t;
+typedef enum {
+	RRULE_NOT_RECORDING = 0,
+	RRULE_SINGLE_RECORD = 1,
+	RRULE_TIME_SLOT_RECORD,
+	RRULE_CHANNEL_RECORD,
+	RRULE_ALL_RECORD,
+	RRULE_WEEK_SLOT_RECORD,
+	RRULE_FIND_ONE_RECORD,
+	RRULE_OVERRIDE_RECORD,
+	RRULE_DONT_RECORD,
+	RRULE_FIND_DAILY_RECORD,
+	RRULE_FIND_WEEKLY_RECORD,
+	RRULE_TEMPLATE_RECORD
+} cmyth_recordingruletype_t;
 
-extern int cmyth_mysql_get_recgroups(cmyth_database_t, cmyth_recgroups_t **);
+typedef enum {
+	RRULE_NO_SEARCH = 0,
+	RRULE_POWER_SEARCH = 1,
+	RRULE_TITLE_SEARCH,
+	RRULE_KEYWORD_SEARCH,
+	RRULE_PEOPLE_SEARCH,
+	RRULE_MANUAL_SEARCH
+} cmyth_recordingrulesearch_t;
+
+typedef enum {
+	RRULE_CHECK_NONE = 0x01,
+	RRULE_CHECK_SUBTITLE = 0x02,
+	RRULE_CHECK_DESCRIPTION = 0x04,
+	RRULE_CHECK_SUBTITLE_AND_DESCRIPTION = 0x06,
+	RRULE_CHECK_SUBTITLE_THEN_DESCRIPTION = 0x08
+} cmyth_recordingruledupmethod_t;
+
+typedef enum {
+	RRULE_IN_RECORDED = 0x01,
+	RRULE_IN_OLD_RECORDED = 0x02,
+	RRULE_IN_ALL = 0x0F,
+	RRULE_NEW_EPI = 0x10
+} cmyth_recordingruledupin_t;
+
+/**
+ * Initialize a new recording rule structure.  The structure is initialized
+ * to default values.
+ * Before forgetting the reference to this recording rule structure
+ * the caller must call ref_release().
+ * \return success: A new recording rule
+ * \return failure: NULL
+ */
+extern cmyth_recordingrule_t cmyth_recordingrule_init(void);
 
 /**
- * Run SQL query from param (backdoor)
- * \deprecated alternative: cmyth_mysql_delete_timer
+ * Retrieves the 'recordid' field of a recording rule structure.
+ * \param rr
+ * \return success: recordid
+ * \return failure: -(errno)
  */
-extern int cmyth_mysql_delete_scheduled_recording(cmyth_database_t db, char * query);
+extern uint32_t cmyth_recordingrule_recordid(cmyth_recordingrule_t rr);
 
 /**
- * Run SQL query from param (backdoor)
- * \deprecated alternative: cmyth_mysql_add_timer
+ * Set the 'recordid' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param recordid
  */
-extern int cmyth_mysql_insert_into_record(cmyth_database_t db, char * query, char * query1, char * query2, char *title, char * subtitle, char * description, char * callsign);
+extern void cmyth_recordingrule_set_recordid(cmyth_recordingrule_t rr, uint32_t recordid);
 
-extern char* cmyth_get_recordid_mysql(cmyth_database_t, int, char *, char *, char *, char *, char *);
-extern int cmyth_get_offset_mysql(cmyth_database_t, int, char *, int, char *, char *, char *, char *, char *);
+/**
+ * Retrieves the 'chanid' field of a recording rule structure.
+ * \param rr
+ * \return success: chanid
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_recordingrule_chanid(cmyth_recordingrule_t rr);
 
-extern int cmyth_mysql_get_prog_finder_char_title(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, char *program_name);
-extern int cmyth_mysql_get_prog_finder_time(cmyth_database_t db, cmyth_program_t **prog,  time_t starttime, char *program_name);
-extern int cmyth_mysql_get_guide(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, time_t endtime);
-extern int cmyth_mysql_testdb_connection(cmyth_database_t db,char **message);
+/**
+ * Set the 'chanid' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param chanid
+ */
+extern void cmyth_recordingrule_set_chanid(cmyth_recordingrule_t rr, uint32_t chanid);
 
 /**
- * Send control message from param (backdoor)
- * \deprecated alternative: cmyth_conn_reschedule_recordings
+ * Retrieves the 'starttime' field of a recording rule structure.
+ * \param rr
+ * \return success: time_t starttime
+ * \return failure: -(errno)
  */
-extern int cmyth_schedule_recording(cmyth_conn_t conn, char * msg);
+extern time_t cmyth_recordingrule_starttime(cmyth_recordingrule_t rr);
 
-extern char * cmyth_mysql_escape_chars(cmyth_database_t db, char * string);
-extern int cmyth_mysql_get_commbreak_list(cmyth_database_t db, int chanid, time_t start_ts_dt, cmyth_commbreaklist_t breaklist, int conn_version);
+/**
+ * Set the 'starttime' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param starttime
+ */
+extern void cmyth_recordingrule_set_starttime(cmyth_recordingrule_t rr, time_t starttime);
 
-extern int cmyth_mysql_get_prev_recorded(cmyth_database_t db, cmyth_program_t **prog);
+/**
+ * Retrieves the 'endtime' field of a recording rule structure.
+ * \param rr
+ * \return success: time_t endtime
+ * \return failure: -(errno)
+ */
+extern time_t cmyth_recordingrule_endtime(cmyth_recordingrule_t rr);
 
-extern int cmyth_get_delete_list(cmyth_conn_t, char *, cmyth_proglist_t);
+/**
+ * Set the 'endtime' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param endtime
+ */
+extern void cmyth_recordingrule_set_endtime(cmyth_recordingrule_t rr, time_t endtime);
 
-#define PROGRAM_ADJUST  3600
+/**
+ * Retrieves the 'title' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: title
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_title(cmyth_recordingrule_t rr);
 
-extern int cmyth_mythtv_remove_previous_recorded(cmyth_database_t db,char *query);
+/**
+ * Set the 'title' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param title
+ */
+extern void cmyth_recordingrule_set_title(cmyth_recordingrule_t rr, char *title);
 
-extern cmyth_chanlist_t cmyth_mysql_get_chanlist(cmyth_database_t db);
+/**
+ * Retrieves the 'description' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: description
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_description(cmyth_recordingrule_t rr);
 
-/* tsp */
-extern int cmyth_mysql_is_radio(cmyth_database_t db, int chanid);
+/**
+ * Set the 'description' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param description
+ */
+extern void cmyth_recordingrule_set_description(cmyth_recordingrule_t rr, char *description);
 
-/* timers */
-struct cmyth_timer;
-typedef struct cmyth_timer* cmyth_timer_t;
-
-struct cmyth_timerlist;
-typedef struct cmyth_timerlist* cmyth_timerlist_t;
-
-extern int cmyth_timer_recordid(cmyth_timer_t timer);
-extern int cmyth_timer_chanid(cmyth_timer_t timer);
-extern time_t cmyth_timer_starttime(cmyth_timer_t timer);
-extern time_t cmyth_timer_endtime(cmyth_timer_t timer);
-extern char* cmyth_timer_title(cmyth_timer_t timer);
-extern char* cmyth_timer_description(cmyth_timer_t timer);
-extern int cmyth_timer_type(cmyth_timer_t timer);
-extern char* cmyth_timer_category(cmyth_timer_t timer);
-extern char* cmyth_timer_subtitle(cmyth_timer_t timer);
-extern int cmyth_timer_priority(cmyth_timer_t timer);
-extern int cmyth_timer_startoffset(cmyth_timer_t timer);
-extern int cmyth_timer_endoffset(cmyth_timer_t timer);
-extern int cmyth_timer_searchtype(cmyth_timer_t timer);
-extern int cmyth_timer_inactive(cmyth_timer_t timer);
-extern char* cmyth_timer_callsign(cmyth_timer_t timer);
-extern int cmyth_timer_dup_method(cmyth_timer_t timer);
-extern int cmyth_timer_dup_in(cmyth_timer_t timer);
-extern char* cmyth_timer_rec_group(cmyth_timer_t timer);
-extern char* cmyth_timer_store_group(cmyth_timer_t timer);
-extern char* cmyth_timer_play_group(cmyth_timer_t timer);
-extern int cmyth_timer_autotranscode(cmyth_timer_t timer);
-extern int cmyth_timer_userjobs(cmyth_timer_t timer);
-extern int cmyth_timer_autocommflag(cmyth_timer_t timer);
-extern int cmyth_timer_autoexpire(cmyth_timer_t timer);
-extern int cmyth_timer_maxepisodes(cmyth_timer_t timer);
-extern int cmyth_timer_maxnewest(cmyth_timer_t timer);
-extern int cmyth_timer_transcoder(cmyth_timer_t timer);
-
-
-extern cmyth_timer_t cmyth_timerlist_get_item(cmyth_timerlist_t pl, int index);
-extern int cmyth_timerlist_get_count(cmyth_timerlist_t pl);
-
-extern cmyth_timerlist_t cmyth_mysql_get_timers(cmyth_database_t db);
-
-
-extern int cmyth_mysql_add_timer(cmyth_database_t db, int chanid, char* callsign, char* description, time_t starttime, time_t endtime, char* title, char* category, int type, char* subtitle, int priority, int startoffset,int endoffset,int searchtype, int inactive,
-  int dup_method, int dup_in, char* rec_group, char* store_group, char* play_group, int autotranscode, int userjobs, int autocommflag, int autoexpire, int maxepisodes, int maxnewest, int transcoder);
-extern int cmyth_mysql_delete_timer(cmyth_database_t db, int recordid);
-extern int cmyth_mysql_update_timer(cmyth_database_t db, int recordid, int chanid, char* callsign, char* description, time_t starttime, time_t endtime, char* title, char* category, int type, char* subtitle, int priority, int startoffset, int endoffset, int searchtype, int inactive,
-  int dup_method, int dup_in, char* rec_group, char* store_group, char* play_group, int autotranscode, int userjobs, int autocommflag, int autoexpire, int maxepisodes, int maxnewest, int transcoder);
-
-typedef struct cmyth_channelgroups {
-	char channelgroup[65];
-	unsigned int ID;
-} cmyth_channelgroups_t;
-
-extern int cmyth_mysql_get_channelgroups(cmyth_database_t db, cmyth_channelgroups_t** changroups);
-extern int cmyth_mysql_get_channelids_in_group(cmyth_database_t db, unsigned int groupid, int** chanids);
-
-extern int cmyth_channel_sourceid(cmyth_channel_t channel);
-extern int cmyth_channel_multiplex(cmyth_channel_t channel);
-
-typedef struct cmyth_rec {
-	int recid;
-	int sourceid;
-} cmyth_rec_t;
+/**
+ * Retrieves the 'type' field of a recording rule structure.
+ * \param rr
+ * \return success: type
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_type(cmyth_recordingrule_t rr);
 
-extern int cmyth_mysql_get_recorder_list(cmyth_database_t db, cmyth_rec_t** reclist);
+/**
+ * Set the 'type' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param type
+ */
+extern void cmyth_recordingrule_set_type(cmyth_recordingrule_t rr, uint8_t type);
 
-extern int cmyth_mysql_get_prog_finder_time_title_chan(cmyth_database_t db, cmyth_program_t *prog, char* title, time_t starttime, int chanid);
+/**
+ * Retrieves the 'category' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: category
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_category(cmyth_recordingrule_t rr);
 
-extern int cmyth_mysql_get_storagegroups(cmyth_database_t db, char** *profiles);
-extern int cmyth_mysql_get_playgroups(cmyth_database_t db, char** *profiles);
+/**
+ * Set the 'category' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param category
+ */
+extern void cmyth_recordingrule_set_category(cmyth_recordingrule_t rr, char *category);
 
-typedef struct cmyth_recprofile {
-	int id;
-	char name[128];
-	char cardtype[32];
-} cmyth_recprofile_t;
+/**
+ * Retrieves the 'subtitle' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: subtitle
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_subtitle(cmyth_recordingrule_t rr);
 
-extern int cmyth_mysql_get_recprofiles(cmyth_database_t db, cmyth_recprofile_t** profiles);
+/**
+ * Set the 'subtitle' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param subtitle
+ */
+extern void cmyth_recordingrule_set_subtitle(cmyth_recordingrule_t rr, char *subtitle);
 
-extern char* cmyth_mysql_get_cardtype(cmyth_database_t db, int chanid);
+/**
+ * Retrieves the 'recpriority' field of a recording rule structure.
+ * \param rr
+ * \return success: recpriority
+ * \return failure: -(errno)
+ */
+extern int8_t cmyth_recordingrule_recpriority(cmyth_recordingrule_t rr);
 
-/* Get a storage group file list */
-extern int cmyth_storagegroup_filelist(cmyth_conn_t control, char** *sgFilelist, char* sg2List, char* hostname);
+/**
+ * Set the 'recpriority' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param recpriority
+ */
+extern void cmyth_recordingrule_set_recpriority(cmyth_recordingrule_t rr, int8_t recpriority);
 
-struct cmyth_storagegroup_filelist;
-typedef struct cmyth_storagegroup_filelist* cmyth_storagegroup_filelist_t;
+/**
+ * Retrieves the 'startoffset' field of a recording rule structure.
+ * \param rr
+ * \return success: startoffset
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_startoffset(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'startoffset' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param startoffset
+ */
+extern void cmyth_recordingrule_set_startoffset(cmyth_recordingrule_t rr, uint8_t startoffset);
+
+/**
+ * Retrieves the 'endoffset' field of a recording rule structure.
+ * \param rr
+ * \return success: endoffset
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_endoffset(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'endoffset' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param endoffset
+ */
+extern void cmyth_recordingrule_set_endoffset(cmyth_recordingrule_t rr, uint8_t endoffset);
+
+/**
+ * Retrieves the 'searchtype' field of a recording rule structure.
+ * \param rr
+ * \return success: searchtype
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_searchtype(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'searchtype' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param searchtype
+ */
+extern void cmyth_recordingrule_set_searchtype(cmyth_recordingrule_t rr, uint8_t searchtype);
+
+/**
+ * Retrieves the 'inactive' field of a recording rule structure.
+ * \param rr
+ * \return success: inactive flag
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_inactive(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'inactive' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param inactive
+ */
+extern void cmyth_recordingrule_set_inactive(cmyth_recordingrule_t rr, uint8_t inactive);
+
+/**
+ * Retrieves the 'callsign' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: callsign
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_callsign(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'callsign' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param callsign
+ */
+extern void cmyth_recordingrule_set_callsign(cmyth_recordingrule_t rr, char *callsign);
+
+/**
+ * Retrieves the 'dupmethod' field of a recording rule structure.
+ * \param rr
+ * \return success: dupmethod
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_dupmethod(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'dupmethod' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param dupmethod
+ */
+extern void cmyth_recordingrule_set_dupmethod(cmyth_recordingrule_t rr, uint8_t dupmethod);
+
+/**
+ * Retrieves the 'dupin' field of a recording rule structure.
+ * \param rr
+ * \return success: dupin
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_dupin(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'dupin' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param dupin
+ */
+extern void cmyth_recordingrule_set_dupin(cmyth_recordingrule_t rr, uint8_t dupin);
+
+/**
+ * Retrieves the 'recgroup' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: recgroup
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_recgroup(cmyth_recordingrule_t rr);
+
+/**
+ *Set the 'recgroup' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param recgroup
+ */
+extern void cmyth_recordingrule_set_recgroup(cmyth_recordingrule_t rr, char *recgroup);
+
+/**
+ * Retrieves the 'storagegroup' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: storagegroup
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_storagegroup(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'storagegroup' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param storagegroup
+ */
+extern void cmyth_recordingrule_set_storagegroup(cmyth_recordingrule_t rr, char *storagegroup);
+
+/**
+ * Retrieves the 'playgroup' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: playgroup
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_playgroup(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'playgroup' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param playgroup
+ */
+extern void cmyth_recordingrule_set_playgroup(cmyth_recordingrule_t rr, char *playgroup);
+
+/**
+ * Retrieves the 'autotranscode' field of a recording rule structure.
+ * \param rr
+ * \return success: autotranscode
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_autotranscode(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'autotranscode' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param autotranscode
+ */
+extern void cmyth_recordingrule_set_autotranscode(cmyth_recordingrule_t rr, uint8_t autotranscode);
+
+/**
+ * Retrieves the 'userjobs' field of a recording rule structure.
+ * \param rr
+ * \return success: userjobs mask
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_userjobs(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'userjobs' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param userjobs
+ */
+extern void cmyth_recordingrule_set_userjobs(cmyth_recordingrule_t rr, uint8_t userjobs);
+
+/**
+ * Retrieves the 'autocommflag' field of a recording rule structure.
+ * \param rr
+ * \return success: autocommflag
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_autocommflag(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'autocommflag' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param autocommflag
+ */
+extern void cmyth_recordingrule_set_autocommflag(cmyth_recordingrule_t rr, uint8_t autocommflag);
+
+/**
+ * Retrieves the 'autoexpire' field of a recording rule structure.
+ * \param rr
+ * \return success: autoexpire
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_autoexpire(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'autoexpire' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param autoexpire
+ */
+extern void cmyth_recordingrule_set_autoexpire(cmyth_recordingrule_t rr, uint8_t autoexpire);
+
+/**
+ * Retrieves the 'maxepisodes' field of a recording rule structure.
+ * \param rr
+ * \return success: maxepisodes
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_recordingrule_maxepisodes(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'maxepisodes' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param maxepisodes
+ */
+extern void cmyth_recordingrule_set_maxepisodes(cmyth_recordingrule_t rr, uint32_t maxepisodes);
+
+/**
+ * Retrieves the 'maxnewest' field of a recording rule structure.
+ * \param rr
+ * \return success: maxnewest
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_recordingrule_maxnewest(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'maxnewest' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param maxnewest
+ */
+extern void cmyth_recordingrule_set_maxnewest(cmyth_recordingrule_t rr, uint8_t maxnewest);
+
+/**
+ * Retrieves the 'transcoder' field of a recording rule structure.
+ * \param rr
+ * \return success: transcoder
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_recordingrule_transcoder(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'transcoder' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param transcoder
+ */
+extern void cmyth_recordingrule_set_transcoder(cmyth_recordingrule_t rr, uint32_t transcoder);
+
+/**
+ * Retrieves the 'profile' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: profile
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_profile(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'profile' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param profile
+ */
+extern void cmyth_recordingrule_set_profile(cmyth_recordingrule_t rr, char *profile);
+
+/**
+ * Retrieves the 'prefinput' field of a recording rule structure.
+ * \param rr
+ * \return success: prefinput
+ */
+extern uint32_t cmyth_recordingrule_prefinput(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'prefinput' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param prefinput
+ */
+extern void cmyth_recordingrule_set_prefinput(cmyth_recordingrule_t rr, uint32_t prefinput);
+
+/**
+ * Retrieves the 'autometadata' field of a recording rule structure.
+ * \param rr
+ * \return success: autometadata
+ */
+extern uint8_t cmyth_recordingrule_autometadata(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'autometadata' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param autometadata
+ */
+extern void cmyth_recordingrule_set_autometadata(cmyth_recordingrule_t rr, uint8_t autometadata);
+
+/**
+ * Retrieves the 'inetref' field of a recording rule structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param rr
+ * \return success: inetref
+ * \return failure: NULL
+ */
+extern char *cmyth_recordingrule_inetref(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'inetref' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param inetref
+ */
+extern void cmyth_recordingrule_set_inetref(cmyth_recordingrule_t rr, char *inetref);
+
+/**
+ * Retrieves the 'season' field of a recording rule structure.
+ * \param rr
+ * \return success: season
+ */
+extern uint16_t cmyth_recordingrule_season(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'season' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param season
+ */
+extern void cmyth_recordingrule_set_season(cmyth_recordingrule_t rr, uint16_t season);
+
+/**
+ * Retrieves the 'episode' field of a recording rule structure.
+ * \param rr
+ * \return success: episode
+ */
+extern uint16_t cmyth_recordingrule_episode(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'episode' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param episode
+ */
+extern void cmyth_recordingrule_set_episode(cmyth_recordingrule_t rr, uint16_t episode);
+
+/**
+ * Retrieves the 'filter' field of a recording rule structure.
+ * \param rr
+ * \return success: filter
+ */
+extern uint32_t cmyth_recordingrule_filter(cmyth_recordingrule_t rr);
+
+/**
+ * Set the 'filter' field of the recording rule structure 'rr'.
+ * \param rr
+ * \param filter
+ */
+extern void cmyth_recordingrule_set_filter(cmyth_recordingrule_t rr, uint32_t filter);
+
+/**
+ * Retrieve the recording rule structure found at index 'index' in the list
+ * in 'rrl'.  Return the recording rule structure held.
+ * Before forgetting the reference to this recording rule structure the
+ * caller must call ref_release().
+ * \param rrl recordingrulelist handle
+ * \param index index in list
+ * \return success: recording rule handle
+ * \return failure: NULL
+ */
+extern cmyth_recordingrule_t cmyth_recordingrulelist_get_item(cmyth_recordingrulelist_t rrl, int index);
+
+/**
+ * Retrieves the number of elements in the recording rule list structure.
+ * \param rrl
+ * \return success: A number indicating the number of items in rrl
+ * \return failure: -(errno)
+ */
+extern int cmyth_recordingrulelist_get_count(cmyth_recordingrulelist_t rrl);
+
+/**
+ * Returns the recording rule list structure filled from database.
+ * \param db
+ * \return success: recording rule list handle
+ * \return failure: NULL
+ */
+extern int cmyth_mysql_get_recordingrules(cmyth_database_t db, cmyth_recordingrulelist_t *rll);
+
+/**
+ * Add a recording rule within the database.
+ * \param db database
+ * \param rr recording rule to add
+ * \return success: 0 , a new recordid is assigned
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_add_recordingrule(cmyth_database_t db, cmyth_recordingrule_t rr);
+
+/**
+ * Delete recording rule from the database.
+ * \param db database
+ * \param recordid handle
+ * \return success: 0
+ * \return failure: -(errno)
+ * \see cmyth_recordingrule_recordid
+ */
+extern int cmyth_mysql_delete_recordingrule(cmyth_database_t db, uint32_t recordid);
+
+/**
+ * Update recording rule within the database.
+ * \param db database
+ * \param rr recording rule handle
+ * \return success: 0
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_update_recordingrule(cmyth_database_t db, cmyth_recordingrule_t rr);
+
+/**
+ * Initialize a new rule from database template.
+ * Before forgetting the reference to this recording rule structure
+ * the caller must call ref_release().
+ * \param db database
+ * \param category program category
+ * \param category_type program category type
+ * \param rr recording rule handle
+ * \return success: 0
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_recordingrule_from_template(cmyth_database_t db, const char *category, const char *category_type, cmyth_recordingrule_t *rr);
+
+/*
+ * -----------------------------------------------------------------
+ * Channel Operations
+ * -----------------------------------------------------------------
+ */
+
+struct cmyth_channel;
+typedef struct cmyth_channel *cmyth_channel_t;
+
+struct cmyth_chanlist;
+typedef struct cmyth_chanlist *cmyth_chanlist_t;
+
+/**
+ * Retrieves the 'chanid' field of a channel structure.
+ * \param channel
+ * \return success: chanid
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_channel_chanid(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'channum' field of a channel structure.
+ * \param channel
+ * \return success: channum
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_channel_channum(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'chanstr' field of a channel structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param channel
+ * \return success: channumstr
+ * \return failure: NULL
+ */
+extern char *cmyth_channel_channumstr(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'callsign' field of a channel structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param channel
+ * \return success: callsign
+ * \return failure: NULL
+ */
+extern char *cmyth_channel_callsign(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'name' field of a channel structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param channel
+ * \return success: name
+ * \return failure: NULL
+ */
+extern char *cmyth_channel_name(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'icon' field of a channel structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param channel
+ * \return success: icon
+ * \return failure: NULL
+ */
+extern char *cmyth_channel_icon(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'visible' field of a channel structure.
+ * \param channel
+ * \return success: visible flag
+ * \return failure: -(errno)
+ */
+extern uint8_t cmyth_channel_visible(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'sourceid' field of a channel structure.
+ * \param channel
+ * \return success: sourceid
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_channel_sourceid(cmyth_channel_t channel);
+
+/**
+ * Retrieves the 'multiplex' field of a channel structure.
+ * \param channel
+ * \return success: multiplex
+ * \return failure: -(errno)
+ */
+extern uint32_t cmyth_channel_multiplex(cmyth_channel_t channel);
+
+/**
+ * Retrieve the channel structure found at index 'index' in the list in 'cl'.
+ * Return the channel structure held.
+ * Before forgetting the reference to this channel structure the caller
+ * must call ref_release().
+ * \param channel
+ * \return success: non-null cmyth_channel_t (this is a pointer type)
+ * \return failure: NULL
+ */
+extern cmyth_channel_t cmyth_chanlist_get_item(cmyth_chanlist_t cl, int index);
+
+/**
+ * Retrieves the number of elements in the channels list structure.
+ * \param cl
+ * \return success: A number indicating the number of items in cl
+ * \return failure: -(errno)
+ */
+extern int cmyth_chanlist_get_count(cmyth_chanlist_t cl);
+
+/**
+ * Returns the channels list structure filled from database.
+ * Before forgetting the reference to this channels list structure the caller
+ * must call ref_release().
+ * \param db
+ * \return success: channels list handle
+ * \return failure: NULL
+ */
+extern int cmyth_mysql_get_chanlist(cmyth_database_t db, cmyth_chanlist_t *chanlist);
+
+/**
+ * Returns 'radio' flag of the channel identified by its 'chanid' from database.
+ * \param db
+ * \param chanid
+ * \return success: radio flag
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_is_radio(cmyth_database_t db, uint32_t chanid);
+
+/**
+ * Returns capture card type for the channel identified by its 'chanid' from database.
+ * \param db
+ * \param chanid
+ * \return success: capture card type
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_cardtype(cmyth_database_t db, uint32_t chanid, char* *cardtype);
+
+/*
+ * -----------------------------------------------------------------
+ * Storage Group operations
+ * -----------------------------------------------------------------
+ */
 
 struct cmyth_storagegroup_file;
-typedef struct cmyth_storagegroup_file* cmyth_storagegroup_file_t;
+typedef struct cmyth_storagegroup_file *cmyth_storagegroup_file_t;
 
-extern cmyth_storagegroup_file_t cmyth_storagegroup_filelist_get_item(cmyth_storagegroup_filelist_t fl, int index);
+struct cmyth_storagegroup_filelist;
+typedef struct cmyth_storagegroup_filelist *cmyth_storagegroup_filelist_t;
+
+/**
+ * Returns the storagegroup files list structure of storagegroup.
+ * Before forgetting the reference to this storagegroup files list structure
+ * the caller must call ref_release().
+ * \param control
+ * \param storagegroup
+ * \param hostname
+ * \return success: storage files list handle
+ * \return failure: NULL
+ */
+extern cmyth_storagegroup_filelist_t cmyth_storagegroup_get_filelist(cmyth_conn_t control, char *storagegroup, char *hostname);
+
+/**
+ * Returns the storagegroup file structure of storagegroup file.
+ * Before forgetting the reference to this storagegroup file structure
+ * the caller must call ref_release().
+ * \param control
+ * \param storagegroup
+ * \param hostname
+ * \param filename
+ * \return success: storage file handle
+ * \return failure: NULL
+ */
+extern cmyth_storagegroup_file_t cmyth_storagegroup_get_fileinfo(cmyth_conn_t control, char *storagegroup, char *hostname, char *filename);
+
+/**
+ * Retrieves the number of elements in the storagegroup files list structure.
+ * \param fl
+ * \return success: A number indicating the number of items in fl
+ * \return failure: -(errno)
+ */
 extern int cmyth_storagegroup_filelist_count(cmyth_storagegroup_filelist_t fl);
 
-extern cmyth_storagegroup_filelist_t cmyth_storagegroup_get_filelist(cmyth_conn_t control, char* storagegroup, char* hostname);
+/**
+ * Retrieve the storagegroup file structure found at index 'index' in the list
+ * in 'fl'.
+ * Return the storagegroup file structure held.
+ * Before forgetting the reference to this storagegroup file structure the
+ * caller must call ref_release().
+ * \param fl
+ * \return success: non-null cmyth_storagegroup_file_t (this is a pointer type)
+ * \return failure: NULL
+ */
+extern cmyth_storagegroup_file_t cmyth_storagegroup_filelist_get_item(cmyth_storagegroup_filelist_t fl, int index);
+
+/**
+ * Retrieves the 'filename' field of a storagegroup file structure.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ * \param file
+ * \return success: filename
+ * \return failure: NULL
+ */
+extern char *cmyth_storagegroup_file_filename(cmyth_storagegroup_file_t file);
+
+/**
+ * Retrieves the 'lastmodified' field of a storagegroup file structure.
+ * \param file
+ * \return success: time_t lastmodified
+ * \return failure: 0
+ */
+extern time_t cmyth_storagegroup_file_lastmodified(cmyth_storagegroup_file_t file);
+
+/**
+ * Retrieves the 'filesize' field of a storagegroup file structure.
+ * \param file
+ * \return success: int64_t file size
+ * \return failure: 0
+ */
+extern int64_t cmyth_storagegroup_file_size(cmyth_storagegroup_file_t file);
+
+/*
+ * -----------------------------------------------------------------
+ * Backend configuration infos
+ * -----------------------------------------------------------------
+ */
+
+typedef struct cmyth_recorder_source {
+	uint32_t recid;
+	uint32_t sourceid;
+} cmyth_recorder_source_t;
+
+/**
+ * Retrieves recorder source list from database.
+ * \param db
+ * \param rsrc recorder source list handle
+ * \return success: A number indicating the number of recorder source in rsrc
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_recorder_source_list(cmyth_database_t db, cmyth_recorder_source_t **rsrc);
+
+/**
+ * Retrieves recorder source list from database and available for 'channum'.
+ * \param db
+ * \param channum desired channel number
+ * \param rsrc recorder source list handle
+ * \return success: A number indicating the number of recorder source in rsrc
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_recorder_source_channum(cmyth_database_t db, char *channum, cmyth_recorder_source_t **rsrc);
+
+typedef struct cmyth_channelgroup {
+	char name[65];
+	uint32_t grpid;
+} cmyth_channelgroup_t;
+
+/**
+ * Retrieves channel group list from database.
+ * \param db
+ * \param changroups channel group list handle
+ * \return success: A number indicating the number of channel group in changroups
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_channelgroups(cmyth_database_t db, cmyth_channelgroup_t **changroups);
 
-extern char* cmyth_storagegroup_file_get_filename(cmyth_storagegroup_file_t file);
-extern unsigned long cmyth_storagegroup_file_get_lastmodified(cmyth_storagegroup_file_t file);
-extern unsigned long long cmyth_storagegroup_file_get_size(cmyth_storagegroup_file_t file);
+/**
+ * Retrieves channel ID list in group from database.
+ * \param db
+ * \param chanids channel ID list handle
+ * \return success: A number indicating the number of channel group in changroups
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_channelids_in_group(cmyth_database_t db, uint32_t grpid, uint32_t **chanids);
+
+/**
+ * Retrieves storagegroup name list from database.
+ * \param db
+ * \param sg storagegroup name list handle
+ * \return success: A number indicating the number of storagegroup name in sg
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_storagegroups(cmyth_database_t db, char** *sg);
+
+typedef struct cmyth_recprofile {
+	uint32_t id;
+	char name[128];
+	char cardtype[32];
+} cmyth_recprofile_t;
+
+/**
+ * Retrieves recording profile list from database.
+ * \param db
+ * \param profiles recording profile list handle
+ * \return success: A number indicating the number of profile in profiles
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_recprofiles(cmyth_database_t db, cmyth_recprofile_t **profiles);
+
+/**
+ * Retrieves play group list from database.
+ * \param db
+ * \param pg play group list handle
+ * \return success: A number indicating the number of playgroup in pg
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_playgroups(cmyth_database_t db, char** *pg);
+
+/**
+ * Retrieves global (non host specific) setting from database.
+ * Before forgetting the reference to data
+ * the caller must call ref_release().
+ * \param db
+ * \param global setting name
+ * \param data setting data handle
+ * \return success: 0 not available, 1 available
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_setting(cmyth_database_t db, char *setting, char **data);
+
+/*
+ * -----------------------------------------------------------------
+ * Recording Markup and associated infos
+ * -----------------------------------------------------------------
+ */
+
+typedef enum {
+	MARK_UNSET = -10,
+	MARK_TMP_CUT_END = -5,
+	MARK_TMP_CUT_START = -4,
+	MARK_UPDATED_CUT = -3,
+	MARK_PLACEHOLDER = -2,
+	MARK_CUT_END = 0,
+	MARK_CUT_START = 1,
+	MARK_BOOKMARK = 2,
+	MARK_BLANK_FRAME = 3,
+	MARK_COMM_START = 4,
+	MARK_COMM_END = 5,
+	MARK_GOP_START = 6,
+	MARK_KEYFRAME = 7,
+	MARK_SCENE_CHANGE = 8,
+	MARK_GOP_BYFRAME = 9,
+	MARK_ASPECT_1_1 = 10, //< deprecated, it is only 1:1 sample aspect ratio
+	MARK_ASPECT_4_3 = 11,
+	MARK_ASPECT_16_9 = 12,
+	MARK_ASPECT_2_21_1 = 13,
+	MARK_ASPECT_CUSTOM = 14,
+	MARK_VIDEO_WIDTH = 30,
+	MARK_VIDEO_HEIGHT = 31,
+	MARK_VIDEO_RATE = 32,
+	MARK_DURATION_MS = 33,
+	MARK_TOTAL_FRAMES = 34
+} cmyth_recording_markup_t;
+
+/**
+ * Retrieve data for a specific type of recording markup
+ * \param db
+ * \param prog program info
+ * \param type of markup
+ * \return success: markup data
+ * \return failure: -(errno)
+ */
+extern int64_t cmyth_mysql_get_recording_markup(cmyth_database_t db, cmyth_proginfo_t prog, cmyth_recording_markup_t type);
+
+/**
+ * Retrieve recording framerate (fps x 1000)
+ * \param db
+ * \param prog program info
+ * \return success: recording framerate >0
+ * \return unknown: 0
+ * \return failure: -(errno)
+ */
+extern int64_t cmyth_mysql_get_recording_framerate(cmyth_database_t db, cmyth_proginfo_t prog);
+
+/*
+ * -----------------------------------------------------------------
+ * Recording artworks
+ * -----------------------------------------------------------------
+ */
+
+/**
+ * Retrieve recording artworks
+ * Before forgetting the reference to artworks
+ * the caller must call ref_release() for each.
+ * \param db
+ * \param prog program info
+ * \param coverart corverart filename handle
+ * \param fanart fanart filename handle
+ * \param banner banner filename handle
+ * \return success: 0 not available, 1 available
+ * \return failure: -(errno)
+ */
+extern int cmyth_mysql_get_recording_artwork(cmyth_database_t db, cmyth_proginfo_t prog, char **coverart, char **fanart, char **banner);
 
 #endif /* __CMYTH_H */
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/Makefile.am
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/Makefile.am	2012-12-01 01:00:27.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/Makefile.am	2013-03-12 10:51:22.000000000 +0000
@@ -20,7 +20,10 @@
                      socket.c \
                      timestamp.c \
                      debug.c \
-                     utf8tolatin1.c
+                     utf8tolatin1.c \
+                     recordingrule.c \
+                     channel.c \
+                     storagegroup.c
 
 INCLUDES=-I../include/ $(MYSQL_INCLUDES)
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/bookmark.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/bookmark.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/bookmark.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/bookmark.c	2013-03-12 10:51:22.000000000 +0000
@@ -25,14 +25,13 @@
 #include <cmyth_local.h>
 
 
-long long cmyth_get_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog)
+int64_t cmyth_get_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog)
 {
 	char *buf;
-	unsigned int len = CMYTH_TIMESTAMP_LEN + CMYTH_LONGLONG_LEN + 18;
+	unsigned int len = CMYTH_TIMESTAMP_LEN + CMYTH_INT64_LEN + 18;
 	int err;
-	long long ret;
+	int64_t ret;
 	int count;
-	int64_t ll;
 	int r;
 	char start_ts_dt[CMYTH_TIMESTAMP_LEN + 1];
 	cmyth_datetime_to_string(start_ts_dt, prog->proginfo_rec_start_ts);
@@ -40,7 +39,7 @@
 	if (!buf) {
 		return -ENOMEM;
 	}
-	sprintf(buf,"%s %ld %s","QUERY_BOOKMARK",prog->proginfo_chanId,
+	sprintf(buf,"%s %"PRIu32" %s","QUERY_BOOKMARK",prog->proginfo_chanId,
 		start_ts_dt);
 	pthread_mutex_lock(&mutex);
 	if ((err = cmyth_send_message(conn,buf)) < 0) {
@@ -58,7 +57,7 @@
 		ret = count;
 		goto out;
 	}
-	if ((r=cmyth_rcv_int64(conn, &err, &ll, count)) < 0) {
+	if ((r=cmyth_rcv_int64(conn, &err, &ret, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			"%s: cmyth_rcv_int64() failed (%d)\n",
 			__FUNCTION__, r);
@@ -66,16 +65,15 @@
 		goto out;
 	}
 
-	ret = ll;
    out:
 	pthread_mutex_unlock(&mutex);
 	return ret;
 }
-	
-int cmyth_set_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog, long long bookmark)
+
+int cmyth_set_bookmark(cmyth_conn_t conn, cmyth_proginfo_t prog, int64_t bookmark)
 {
 	char *buf;
-	unsigned int len = CMYTH_TIMESTAMP_LEN + CMYTH_LONGLONG_LEN * 2 + 18 + 2;
+	unsigned int len = CMYTH_TIMESTAMP_LEN + CMYTH_INT64_LEN * 2 + 18 + 2;
 	int ret;
 	char start_ts_dt[CMYTH_TIMESTAMP_LEN + 1];
 	cmyth_datetime_to_string(start_ts_dt, prog->proginfo_rec_start_ts);
@@ -89,11 +87,11 @@
 		 * hi and lo integers. Nevertheless the backend (at least up to 0.25) checks
 		 * the existence of the 4th parameter, so adding a 0.
 		 */
-		sprintf(buf, "SET_BOOKMARK %ld %s %"PRIu64" 0", prog->proginfo_chanId,
-				start_ts_dt, (int64_t)bookmark);
+		sprintf(buf, "SET_BOOKMARK %"PRIu32" %s %"PRId64" 0", prog->proginfo_chanId,
+				start_ts_dt, bookmark);
 	}
 	else {
-		sprintf(buf, "SET_BOOKMARK %ld %s %d %d", prog->proginfo_chanId,
+		sprintf(buf, "SET_BOOKMARK %"PRIu32" %s %"PRId32" %"PRId32, prog->proginfo_chanId,
 				start_ts_dt, (int32_t)(bookmark >> 32), (int32_t)(bookmark & 0xffffffff));
 	}
 	pthread_mutex_lock(&mutex);
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/channel.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/channel.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/channel.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/channel.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,477 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <cmyth_local.h>
+
+/*
+ * cmyth_chanlist_destroy()
+ *
+ * Scope: PRIVATE (static)
+ *
+ * Description
+ *
+ * Destroy the channels list structure pointed to by 'cl' and release
+ * its storage.  This should only be called by ref_release(). All others should
+ * use ref_release() to release references to a channels list structure.
+ *
+ * Return Value:
+ *
+ * None.
+ */
+static void
+cmyth_chanlist_destroy(cmyth_chanlist_t cl)
+{
+	int i;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!cl) {
+		return;
+	}
+	for (i  = 0; i < cl->chanlist_count; ++i) {
+		if (cl->chanlist_list[i]) {
+			ref_release(cl->chanlist_list[i]);
+		}
+		cl->chanlist_list[i] = NULL;
+	}
+	if (cl->chanlist_list) {
+		free(cl->chanlist_list);
+	}
+}
+
+/*
+ * cmyth_chanlist_create()
+ *
+ * Scope: PRIVATE
+ *
+ * Description
+ *
+ * Create a channels list structure and return a pointer to the structure.
+ * Before forgetting the reference to this channel list structure the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_chanlist_t (this type is a pointer)
+ *
+ * Failure: A NULL cmyth_chanlist_t
+ */
+cmyth_chanlist_t
+cmyth_chanlist_create(void)
+{
+	cmyth_chanlist_t ret;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	ret = ref_alloc(sizeof(*ret));
+	if (!ret) {
+		return(NULL);
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_chanlist_destroy);
+
+	ret->chanlist_list = NULL;
+	ret->chanlist_count = 0;
+	return ret;
+}
+
+/*
+ * cmyth_chanlist_get_item()
+ *
+ * Scope: PUBLIC
+ *
+ * Description:
+ *
+ * Retrieve the channel structure found at index 'index' in the list in 'cl'.
+ * Return the channel structure held.
+ * Before forgetting the reference to this channel structure the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-null cmyth_channel_t (this is a pointer type)
+ *
+ * Failure: A NULL cmyth_channel_t
+ */
+cmyth_channel_t
+cmyth_chanlist_get_item(cmyth_chanlist_t cl, int index)
+{
+	if (!cl) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL program list\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+	if (!cl->chanlist_list) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL list\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+	if ((index < 0) || (index >= cl->chanlist_count)) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: index %d out of range\n",
+			  __FUNCTION__, index);
+		return NULL;
+	}
+	ref_hold(cl->chanlist_list[index]);
+	return cl->chanlist_list[index];
+}
+
+/*
+ * cmyth_chanlist_get_count()
+ *
+ * Scope: PUBLIC
+ *
+ * Description:
+ *
+ * Retrieve the number of elements in the channels list
+ * structure in 'cl'.
+ *
+ * Return Value:
+ *
+ * Success: A number >= 0 indicating the number of items in 'cl'
+ *
+ * Failure: -(errno)
+ */
+int
+cmyth_chanlist_get_count(cmyth_chanlist_t cl)
+{
+	if (!cl) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL program list\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+	return cl->chanlist_count;
+}
+
+/*
+ * cmyth_channel_destroy()
+ *
+ * Scope: PRIVATE (static)
+ *
+ * Description
+ *
+ * Destroy the channel structure pointed to by 'c' and release
+ * its storage.  This should only be called by ref_release().
+ * All others should use ref_release() to release references to
+ * a channel structure.
+ *
+ * Return Value:
+ *
+ * None.
+ */
+static void
+cmyth_channel_destroy(cmyth_channel_t c)
+{
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!c) {
+		return;
+	}
+
+	if(c->name)
+		ref_release(c->name);
+	if(c->callsign)
+		ref_release(c->callsign);
+	if(c->icon)
+		ref_release(c->icon);
+}
+
+/*
+ * cmyth_channel_create()
+ *
+ * Scope: PRIVATE
+ *
+ * Description
+ *
+ * Create a channel structure to be used to hold channel and return
+ * a pointer to the structure.  The structure is initialized to
+ * default values.
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_channel_t (this type is a pointer)
+ *
+ * Failure: A NULL cmyth_channel_t
+ */
+cmyth_channel_t
+cmyth_channel_create(void)
+{
+	cmyth_channel_t ret = ref_alloc(sizeof(*ret));
+	memset(ret, 0, sizeof(*ret));
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s }!\n", __FUNCTION__);
+		return NULL;
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_channel_destroy);
+
+	return ret;
+}
+
+/*
+ * cmyth_channel_chanid()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'chanid' field of a channel structure.
+ *
+ * Return Value:
+ *
+ * Success: long chan ID.
+ *
+ * Failure: 0
+ */
+uint32_t
+cmyth_channel_chanid(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return 0;
+	}
+	return channel->chanid;
+}
+
+/*
+ * cmyth_channel_channum()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'channum' field of a channel structure.
+ *
+ * Return Value:
+ *
+ * Success: long channel number.
+ *
+ * Failure: 0
+ */
+uint32_t
+cmyth_channel_channum(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return 0;
+	}
+	return channel->channum;
+}
+
+/*
+ * cmyth_channel_channumstr()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'chanstr' field of a channel structure.
+ *
+ * The returned string is a pointer to the string within the channel
+ * structure, so it should not be modified by the caller.  The
+ * return value is a 'char *' for this reason.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A pointer to a 'char *' pointing to the field.
+ *
+ * Failure: NULL
+ */
+char *
+cmyth_channel_channumstr(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return NULL;
+	}
+	return ref_hold(channel->chanstr);
+}
+
+/*
+ * cmyth_channel_name()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'name' field of a channel structure.
+ *
+ * The returned string is a pointer to the string within the channel
+ * structure, so it should not be modified by the caller.  The
+ * return value is a 'char *' for this reason.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A pointer to a 'char *' pointing to the field.
+ *
+ * Failure: NULL
+ */
+char *
+cmyth_channel_name(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return NULL;
+	}
+	return ref_hold(channel->name);
+}
+
+/*
+ * cmyth_channel_callsign()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'callsign' field of a channel structure.
+ *
+ * The returned string is a pointer to the string within the channel
+ * structure, so it should not be modified by the caller.  The
+ * return value is a 'char *' for this reason.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A pointer to a 'char *' pointing to the field.
+ *
+ * Failure: NULL
+ */
+char *
+cmyth_channel_callsign(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return NULL;
+	}
+	return ref_hold(channel->callsign);
+}
+
+/*
+ * cmyth_channel_icon()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'icon' field of a channel structure.
+ *
+ * The returned string is a pointer to the string within the channel
+ * structure, so it should not be modified by the caller.  The
+ * return value is a 'char *' for this reason.
+ * Before forgetting the reference to this string the caller
+ * must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A pointer to a 'char *' pointing to the field.
+ *
+ * Failure: NULL
+ */
+char *
+cmyth_channel_icon(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return NULL;
+	}
+	return ref_hold(channel->icon);
+}
+
+/*
+ * cmyth_channel_visible()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'visible' field of a channel structure.
+ *
+ * Return Value:
+ *
+ * Success: visible flag.
+ *
+ * Failure: 0
+ */
+uint8_t
+cmyth_channel_visible(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return 0;
+	}
+	return channel->visible;
+}
+
+/*
+ * cmyth_channel_sourceid()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'sourceid' field of a channel structure.
+ *
+ * Return Value:
+ *
+ * Success: long source ID.
+ *
+ * Failure: 0
+ */
+uint32_t
+cmyth_channel_sourceid(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return 0;
+	}
+	return channel->sourceid;
+}
+
+/*
+ * cmyth_channel_multiplex()
+ *
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieves the 'multiplex' field of a channel structure.
+ *
+ * Return Value:
+ *
+ * Success: long multiplex ID.
+ *
+ * Failure: 0
+ */
+uint32_t
+cmyth_channel_multiplex(cmyth_channel_t channel)
+{
+	if (!channel) {
+		return 0;
+	}
+	return channel->multiplex;
+}
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/cmyth_local.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/cmyth_local.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/cmyth_local.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/cmyth_local.h	2013-03-12 10:51:22.000000000 +0000
@@ -35,7 +35,7 @@
 #include <refmem/refmem.h>
 #include <cmyth/cmyth.h>
 #include <time.h>
-#include <stdint.h>
+#include <inttypes.h>
 #include <mysql/mysql.h>
 
 #if defined(_MSC_VER)
@@ -64,10 +64,10 @@
 /*
  * Some useful constants
  */
-#define CMYTH_LONGLONG_LEN (sizeof("-18446744073709551616") - 1)
-#define CMYTH_LONG_LEN (sizeof("-4294967296") - 1)
-#define CMYTH_SHORT_LEN (sizeof("-65536") - 1)
-#define CMYTH_BYTE_LEN (sizeof("-256") - 1)
+#define CMYTH_INT64_LEN (sizeof("-18446744073709551616") - 1)
+#define CMYTH_INT32_LEN (sizeof("-4294967296") - 1)
+#define CMYTH_INT16_LEN (sizeof("-65536") - 1)
+#define CMYTH_INT8_LEN (sizeof("-256") - 1)
 #define CMYTH_TIMESTAMP_LEN (sizeof("YYYY-MM-DDTHH:MM:SS") - 1)
 #define CMYTH_DATESTAMP_LEN (sizeof("YYYY-MM-DD") - 1)
 #define CMYTH_UTC_LEN (sizeof("1240120680") - 1)
@@ -80,31 +80,32 @@
  * MythTV backend connection
  */
 struct cmyth_conn {
-	cmyth_socket_t	conn_fd;	/**< socket file descriptor */
-	unsigned char	*conn_buf;	/**< connection buffer */
-	int		conn_buflen;	/**< buffer size */
-	int		conn_len;	/**< amount of data in buffer */
-	int		conn_pos;	/**< current position in buffer */
-	unsigned long	conn_version;	/**< protocol version */
-	volatile int	conn_hang;	/**< is connection stuck? */
-	int		conn_tcp_rcvbuf;/**< TCP receive buffer size */
-	char *          server;         /**< hostname of server */
-	unsigned short  port;           /**< port of server */
+	cmyth_socket_t   conn_fd;        /**< socket file descriptor */
+	unsigned char    *conn_buf;      /**< connection buffer */
+	uint32_t         conn_buflen;    /**< buffer size */
+	int32_t          conn_len;       /**< amount of data in buffer */
+	int32_t          conn_pos;       /**< current position in buffer */
+	uint32_t         conn_version;   /**< protocol version */
+	volatile int8_t  conn_hang;      /**< is connection stuck? */
+	int32_t          conn_tcp_rcvbuf;/**< TCP receive buffer size */
+	char *           server;         /**< hostname of server */
+	uint16_t         port;           /**< port of server */
+	cmyth_conn_ann_t conn_ann;       /**< connection announcement */
 };
 
 /* Sergio: Added to support new livetv protocol */
 struct cmyth_livetv_chain {
 	char *chainid;
-	int chain_ct;
-	int chain_switch_on_create;
-	int chain_current;
+	int32_t chain_ct;
+	volatile int8_t chain_switch_on_create;
+	int32_t chain_current;
 	void (*prog_update_callback)(cmyth_proginfo_t prog);
 	cmyth_proginfo_t *progs;
 	char **chain_urls;
 	cmyth_file_t *chain_files; /* File pointers for the urls */
-	int livetv_watch; /* JLB: Manage program breaks */
-	int livetv_tcp_rcvbuf;
-	unsigned long livetv_block_len;
+	volatile int8_t livetv_watch; /* JLB: Manage program breaks */
+	int32_t livetv_tcp_rcvbuf;
+	int32_t livetv_block_len;
 };
 
 /* Sergio: Added to clean up database interaction */
@@ -113,87 +114,19 @@
 	char * db_user;
 	char * db_pass;
 	char * db_name;
+	uint16_t db_port;
 	MYSQL * mysql;
-	int db_version; /* JLB: -1 = No set, 0 = unknown else DBSchemaVer */
-	int db_tz_utc; /* JLB: 0 = No conversion, 1 = Enable UTC time zone conversion */
+	int8_t db_setup; /* JLB: 0 = No setup, 1 = setup done */
+	uint32_t db_version; /* 0 = unknown else DBSchemaVer */
+	int8_t db_tz_utc; /* JLB: 0 = No conversion, 1 = Enable UTC time zone conversion */
 	char db_tz_name[64]; /* JLB: db time zone name to convert query projection */
-};	
-
-/* Sergio: Added to clean up channel list handling */
-struct cmyth_channel {
-	long chanid;
-	int channum;
-	char chanstr[10];
-	long cardids;/* A bit array of recorders/tuners supporting the channel */
-	char *callsign;
-	char *name;
-	char *icon;
-	int visible;
-	/* tsp - added sourceID and multiplex */
-	int sourceid;
-	int multiplex;
-};
-
-struct cmyth_chanlist {
-	cmyth_channel_t *chanlist_list;
-	int chanlist_count;
-};
-
-
-/* tsp: Added timer */
-
-struct cmyth_timer {
-	int recordid;
-	int chanid;
-	time_t starttime;
-	time_t endtime;
-	char* title;
-	char* description;
-	int type;
-	char* category;
-	char* subtitle;
-	int priority;
-	int startoffset;
-	int endoffset;
-	int searchtype;
-	int inactive;
-	char* callsign;
-
-	int dup_method;
-	int dup_in;
-	char* rec_group;
-	char* store_group;
-	char* play_group;
-	int autotranscode;
-	int userjobs;
-	int autocommflag;
-	int autoexpire;
-	int maxepisodes;
-	int maxnewest;
-	int transcoder;
-	/*
-	char* profile;
-	int prefinput;
-	*/
-	};
-
-struct cmyth_timerlist {
-	cmyth_timer_t *timerlist_list;
-	int timerlist_count;
-};
-
-/* Sergio: Added to support the tvguide functionality */
-struct cmyth_tvguide_progs {
-	cmyth_program_t * progs;
-	int count;
-	int alloc;
 };
 
 struct cmyth_recorder {
-	unsigned rec_have_stream;
-	unsigned rec_id;
+	int8_t rec_have_stream;
+	uint32_t rec_id;
 	char *rec_server;
-	int rec_port;
+	uint16_t rec_port;
 	cmyth_ringbuf_t rec_ring;
 	cmyth_conn_t rec_conn;
 	/* Sergio: Added to support new livetv protocol */
@@ -203,72 +136,51 @@
 };
 
 /**
- * MythTV proglist
- */
-
-struct cmyth_storagegroup_filelist {
-	cmyth_storagegroup_file_t *storagegroup_filelist_list;
-	int storagegroup_filelist_count;
-};
-
-
-struct cmyth_storagegroup_file {
-	char* filename;
-	char* storagegroup;
-	char* hostname;
-	unsigned long modified;
-	unsigned long size;
-};
-
-
-/**
  * MythTV file connection
  */
 struct cmyth_file {
 	cmyth_conn_t file_data;		/**< backend connection */
-	long file_id;			/**< file identifier */
+	uint32_t file_id;		/**< file identifier */
 	/** callback when close is completed */
 	void (*closed_callback)(cmyth_file_t file);
-	uint64_t file_start;	/**< file start offest */
-	uint64_t file_length;	/**< file length */
-	uint64_t file_pos;	/**< current file position */
-	uint64_t file_req;	/**< current file position requested */
+	int64_t file_start;	/**< file start offest */
+	int64_t file_length;	/**< file length */
+	int64_t file_pos;	/**< current file position */
+	int64_t file_req;	/**< current file position requested */
 	cmyth_conn_t file_control;	/**< master backend connection */
 };
 
-long long cmyth_file_seek_unlocked(cmyth_file_t file, long long offset, int whence);
-
 struct cmyth_ringbuf {
 	cmyth_conn_t conn_data;
-	long file_id;
+	uint32_t file_id;
 	char *ringbuf_url;
-	uint64_t ringbuf_size;
-	uint64_t file_length;
-	uint64_t file_pos;
-	uint64_t ringbuf_fill;
+	int64_t ringbuf_size;
+	int64_t file_length;
+	int64_t file_pos;
+	int64_t ringbuf_fill;
 	char *ringbuf_hostname;
-	int ringbuf_port;
+	uint16_t ringbuf_port;
 };
 
 struct cmyth_rec_num {
 	char *recnum_host;
-	unsigned short recnum_port;
-	unsigned recnum_id;
+	uint16_t recnum_port;
+	int32_t recnum_id;
 };
 
 struct cmyth_keyframe {
-	unsigned long keyframe_number;
-	uint64_t keyframe_pos;
+	uint32_t keyframe_number;
+	int64_t keyframe_pos;
 };
 
 struct cmyth_posmap {
-	unsigned posmap_count;
 	struct cmyth_keyframe **posmap_list;
+	int posmap_count;
 };
 
 struct cmyth_freespace {
-	uint64_t freespace_total;
-	uint64_t freespace_used;
+	int64_t freespace_total;
+	int64_t freespace_used;
 };
 
 struct cmyth_timestamp {
@@ -285,10 +197,10 @@
 	char *proginfo_title;
 	char *proginfo_subtitle;
 	char *proginfo_description;
-	unsigned short proginfo_season;    /* new in V67 */
-	unsigned short proginfo_episode;    /* new in V67 */
+	uint16_t proginfo_season;    /* new in V67 */
+	uint16_t proginfo_episode;    /* new in V67 */
 	char *proginfo_category;
-	long proginfo_chanId;
+	uint32_t proginfo_chanId;
 	char *proginfo_chanstr;
 	char *proginfo_chansign;
 	char *proginfo_channame;  /* Deprecated in V8, simulated for compat. */
@@ -297,24 +209,24 @@
 	int64_t proginfo_Length;
 	cmyth_timestamp_t proginfo_start_ts;
 	cmyth_timestamp_t proginfo_end_ts;
-	unsigned long proginfo_conflicting; /* Deprecated in V8, always 0 */
+	uint32_t proginfo_conflicting; /* Deprecated in V8, always 0 */
 	char *proginfo_unknown_0;   /* May be new 'conflicting' in V8 */
-	unsigned long proginfo_recording;
-	unsigned long proginfo_override;
+	uint32_t proginfo_recording;
+	uint32_t proginfo_override;
 	char *proginfo_hostname;
-	long proginfo_source_id; /* ??? in V8 */
-	long proginfo_card_id;   /* ??? in V8 */
-	long proginfo_input_id;  /* ??? in V8 */
-	char *proginfo_rec_priority;  /* ??? in V8 */
-	long proginfo_rec_status; /* ??? in V8 */
-	unsigned long proginfo_record_id;  /* ??? in V8 */
-	unsigned long proginfo_rec_type;   /* ??? in V8 */
-	unsigned long proginfo_rec_dups;   /* ??? in V8 */
-	unsigned long proginfo_unknown_1;  /* new in V8 */
+	uint32_t proginfo_source_id; /* ??? in V8 */
+	uint32_t proginfo_card_id;   /* ??? in V8 */
+	uint32_t proginfo_input_id;  /* ??? in V8 */
+	int8_t proginfo_rec_priority;  /* ??? in V8 */
+	int8_t proginfo_rec_status; /* ??? in V8 */
+	uint32_t proginfo_record_id;  /* ??? in V8 */
+	uint8_t proginfo_rec_type;   /* ??? in V8 */
+	uint8_t proginfo_rec_dupin;   /* ??? in V8 */
+	uint8_t proginfo_rec_dupmethod;  /* new in V8 */
 	cmyth_timestamp_t proginfo_rec_start_ts;
 	cmyth_timestamp_t proginfo_rec_end_ts;
-	unsigned long proginfo_repeat;   /* ??? in V8 */
-	unsigned long proginfo_program_flags;
+	uint8_t proginfo_repeat;   /* ??? in V8 */
+	uint32_t proginfo_program_flags;
 	char *proginfo_rec_profile;  /* new in V8 */
 	char *proginfo_recgroup;    /* new in V8 */
 	char *proginfo_chancommfree;    /* new in V8 */
@@ -326,23 +238,23 @@
 	char *proginfo_stars;    /* new in V12 */
 	cmyth_timestamp_t proginfo_originalairdate;	/* new in V12 */
 	char *proginfo_pathname;
-	int proginfo_port;
-        unsigned long proginfo_hasairdate;
+	uint16_t proginfo_port;
+        uint8_t proginfo_hasairdate;
 	char *proginfo_host;
-	unsigned long proginfo_version;
+	uint32_t proginfo_version;
 	char *proginfo_playgroup; /* new in v18 */
-	char *proginfo_recpriority_2;  /* new in V25 */
-	long proginfo_parentid; /* new in V31 */
+	int8_t proginfo_recpriority_2;  /* new in V25 */
+	uint32_t proginfo_parentid; /* new in V31 */
 	char *proginfo_storagegroup; /* new in v32 */
-	unsigned long proginfo_audioproperties; /* new in v35 */
-	unsigned long proginfo_videoproperties; /* new in v35 */
-	unsigned long proginfo_subtitletype; /* new in v35 */
-	unsigned short proginfo_year; /* new in v43 */
+	uint16_t proginfo_audioproperties; /* new in v35 */
+	uint16_t proginfo_videoproperties; /* new in v35 */
+	uint16_t proginfo_subtitletype; /* new in v35 */
+	uint16_t proginfo_year; /* new in v43 */
 };
 
 struct cmyth_proglist {
 	cmyth_proginfo_t *proglist_list;
-	long proglist_count;
+	int proglist_count;
 };
 
 /*
@@ -367,61 +279,36 @@
 extern int cmyth_rcv_feedback(cmyth_conn_t conn, char *fb);
 
 #define cmyth_rcv_version __cmyth_rcv_version
-extern int cmyth_rcv_version(cmyth_conn_t conn, unsigned long *vers);
+extern int cmyth_rcv_version(cmyth_conn_t conn, uint32_t *vers);
 
-#define cmyth_rcv_byte __cmyth_rcv_byte
-extern int cmyth_rcv_byte(cmyth_conn_t conn, int *err, char *buf, int count);
+#define cmyth_rcv_int8 __cmyth_rcv_int8
+extern int cmyth_rcv_int8(cmyth_conn_t conn, int *err, int8_t *buf, int count);
 
-#define cmyth_rcv_short __cmyth_rcv_short
-extern int cmyth_rcv_short(cmyth_conn_t conn, int *err, short *buf, int count);
+#define cmyth_rcv_int16 __cmyth_rcv_int16
+extern int cmyth_rcv_int16(cmyth_conn_t conn, int *err, int16_t *buf, int count);
 
-#define cmyth_rcv_long __cmyth_rcv_long
-extern int cmyth_rcv_long(cmyth_conn_t conn, int *err, long *buf, int count);
-#define cmyth_rcv_u_long(c, e, b, n) cmyth_rcv_long(c, e, (long*)b, n)
+#define cmyth_rcv_int32 __cmyth_rcv_int32
+extern int cmyth_rcv_int32(cmyth_conn_t conn, int *err, int32_t *buf, int count);
 
 #define cmyth_rcv_old_int64 __cmyth_rcv_old_int64
-extern int cmyth_rcv_old_int64(cmyth_conn_t conn, int *err, int64_t *buf,
-			       int count);
+extern int cmyth_rcv_old_int64(cmyth_conn_t conn, int *err, int64_t *buf, int count);
 
 #define cmyth_rcv_new_int64 __cmyth_rcv_new_int64
-extern int cmyth_rcv_new_int64(cmyth_conn_t conn, int *err, int64_t *buf,
-			       int count, int forced);
-
-#define cmyth_rcv_old_uint64 __cmyth_rcv_old_uint64
-extern int cmyth_rcv_old_uint64(cmyth_conn_t conn, int *err, uint64_t *buf,
-				int count);
-
-#define cmyth_rcv_new_uint64 __cmyth_rcv_new_uint64
-extern int cmyth_rcv_new_uint64(cmyth_conn_t conn, int *err, uint64_t *buf,
-				int count, int forced);
+extern int cmyth_rcv_new_int64(cmyth_conn_t conn, int *err, int64_t *buf, int count, int forced);
 
-#define cmyth_rcv_int64(conn, err, buf, count)	\
-	cmyth_rcv_new_int64(conn, err, buf, count, 0)
+#define cmyth_rcv_int64(conn, err, buf, count)	cmyth_rcv_new_int64(conn, err, buf, count, 0)
 
-#define cmyth_rcv_uint64(conn, err, buf, count)	\
-	cmyth_rcv_new_uint64(conn, err, buf, count, 0)
+#define cmyth_rcv_uint8 __cmyth_rcv_uint8
+extern int cmyth_rcv_uint8(cmyth_conn_t conn, int *err, uint8_t *buf, int count);
 
-#define cmyth_rcv_ubyte __cmyth_rcv_ubyte
-extern int cmyth_rcv_ubyte(cmyth_conn_t conn, int *err, unsigned char *buf,
-			   int count);
-
-#define cmyth_rcv_ushort __cmyth_rcv_ushort
-extern int cmyth_rcv_ushort(cmyth_conn_t conn, int *err, unsigned short *buf,
-			    int count);
+#define cmyth_rcv_uint16 __cmyth_rcv_uint16
+extern int cmyth_rcv_uint16(cmyth_conn_t conn, int *err, uint16_t *buf, int count);
 
-#define cmyth_rcv_ulong __cmyth_rcv_ulong
-extern int cmyth_rcv_ulong(cmyth_conn_t conn, int *err, unsigned long *buf,
-			   int count);
-
-#define cmyth_rcv_ulong_long __cmyth_rcv_ulong_long
-extern int cmyth_rcv_ulong_long(cmyth_conn_t conn,
-				int *err,
-				unsigned long long *buf,
-				int count);
+#define cmyth_rcv_uint32 __cmyth_rcv_uint32
+extern int cmyth_rcv_uint32(cmyth_conn_t conn, int *err, uint32_t *buf, int count);
 
 #define cmyth_rcv_data __cmyth_rcv_data
-extern int cmyth_rcv_data(cmyth_conn_t conn, int *err, unsigned char *buf,
-			  int count);
+extern int cmyth_rcv_data(cmyth_conn_t conn, int *err, unsigned char *buf, int count);
 
 #define cmyth_rcv_timestamp __cmyth_rcv_timestamp
 extern int cmyth_rcv_timestamp(cmyth_conn_t conn, int *err,
@@ -465,8 +352,6 @@
 #define cmyth_rcv_ringbuf __cmyth_rcv_ringbuf
 extern int cmyth_rcv_ringbuf(cmyth_conn_t conn, int *err, cmyth_ringbuf_t buf,
 			     int count);
-#define cmyth_datetime_to_dbstring __cmyth_datetime_to_dbstring
-extern int cmyth_datetime_to_dbstring(char *str, cmyth_timestamp_t ts);
 
 #define cmyth_toupper_string __cmyth_toupper_string
 extern void cmyth_toupper_string(char *str);
@@ -475,10 +360,7 @@
  * From proginfo.c
  */
 #define cmyth_proginfo_string __cmyth_proginfo_string
-extern char *cmyth_proginfo_string(cmyth_proginfo_t prog);
-
-#define cmyth_chaninfo_string __cmyth_chaninfo_string
-extern char *cmyth_chaninfo_string(cmyth_proginfo_t prog);
+extern char *cmyth_proginfo_string(cmyth_conn_t control, cmyth_proginfo_t prog);
 
 /*
  * From file.c
@@ -509,17 +391,15 @@
 
 extern void cmyth_mysql_query_reset(cmyth_mysql_query_t *query);
 
-extern int cmyth_mysql_query_param_long(cmyth_mysql_query_t * query,long param);
-
-extern int cmyth_mysql_query_param_ulong(cmyth_mysql_query_t * query,unsigned long param);
+extern int cmyth_mysql_query_param_int32(cmyth_mysql_query_t * query, int32_t param);
 
-extern int cmyth_mysql_query_param_int64(cmyth_mysql_query_t * query,int64_t param);
+extern int cmyth_mysql_query_param_uint32(cmyth_mysql_query_t * query, uint32_t param);
 
-extern int cmyth_mysql_query_param_uint64(cmyth_mysql_query_t * query,uint64_t param);
+extern int cmyth_mysql_query_param_int64(cmyth_mysql_query_t * query, int64_t param);
 
-extern int cmyth_mysql_query_param_int(cmyth_mysql_query_t * query,int param);
+extern int cmyth_mysql_query_param_int(cmyth_mysql_query_t * query, int param);
 
-extern int cmyth_mysql_query_param_uint(cmyth_mysql_query_t * query,int param);
+extern int cmyth_mysql_query_param_uint(cmyth_mysql_query_t * query, unsigned int param);
 
 extern int cmyth_mysql_query_param_unixtime(cmyth_mysql_query_t * query, time_t param, int tz_utc);
 
@@ -533,4 +413,103 @@
 
 extern char* cmyth_utf8tolatin1(char* s);
 
+/*
+ * From channel.c
+ */
+struct cmyth_channel {
+	uint32_t chanid;
+	uint32_t channum;
+	char *chanstr;
+	char *callsign;
+	char *name;
+	char *icon;
+	uint8_t visible;
+	uint32_t sourceid;
+	uint32_t multiplex;
+};
+
+struct cmyth_chanlist {
+	cmyth_channel_t *chanlist_list;
+	int chanlist_count;
+};
+
+#define cmyth_channel_create __cmyth_channel_create
+extern cmyth_channel_t cmyth_channel_create(void);
+
+#define cmyth_chanlist_create __cmyth_chanlist_create
+extern cmyth_chanlist_t cmyth_chanlist_create(void);
+
+/*
+ * From recordingrule.c
+ */
+struct cmyth_recordingrule {
+	uint32_t recordid;
+	uint32_t chanid;
+	cmyth_timestamp_t starttime;
+	cmyth_timestamp_t endtime;
+	char* title;
+	char* description;
+	uint8_t type;                    //enum
+	char* category;
+	char* subtitle;
+	int8_t recpriority;              //range -99,+99
+	uint8_t startoffset;             //nb minutes
+	uint8_t endoffset;               //nb minutes
+	uint8_t searchtype;              //enum
+	uint8_t inactive;                //bool
+	char* callsign;
+	uint8_t dupmethod;               //enum
+	uint8_t dupin;                   //enum
+	char* recgroup;
+	char* storagegroup;
+	char* playgroup;
+	uint8_t autotranscode;           //bool
+	uint8_t userjobs;                //#1111
+	uint8_t autocommflag;            //bool
+	uint8_t autoexpire;              //bool
+	uint32_t maxepisodes;            //range 0,100
+	uint8_t maxnewest;               //bool
+	uint32_t transcoder;             //recordingprofiles id
+	char* profile;
+	uint32_t prefinput;
+	uint8_t autometadata;            //DB version 1278
+	char* inetref;                   //DB version 1278
+	uint16_t season;                 //DB version 1278
+	uint16_t episode;                //DB version 1278
+	uint32_t filter;		 //DB version 1276
+	};
+
+struct cmyth_recordingrulelist {
+	cmyth_recordingrule_t *recordingrulelist_list;
+	int recordingrulelist_count;
+};
+
+#define cmyth_recordingrule_create __cmyth_recordingrule_create
+extern cmyth_recordingrule_t cmyth_recordingrule_create(void);
+
+#define cmyth_recordingrulelist_create __cmyth_recordingrulelist_create
+extern cmyth_recordingrulelist_t cmyth_recordingrulelist_create(void);
+
+/*
+ * From storagegroup.c
+ */
+struct cmyth_storagegroup_file {
+	char* filename;
+	char* storagegroup;
+	char* hostname;
+	time_t lastmodified;
+	int64_t size;
+};
+
+struct cmyth_storagegroup_filelist {
+	cmyth_storagegroup_file_t *storagegroup_filelist_list;
+	int storagegroup_filelist_count;
+};
+
+#define cmyth_storagegroup_file_create __cmyth_storagegroup_file_create
+extern cmyth_storagegroup_file_t cmyth_storagegroup_file_create(void);
+
+#define cmyth_storagegroup_filelist_create __cmyth_storagegroup_filelist_create
+extern cmyth_storagegroup_filelist_t cmyth_storagegroup_filelist_create(void);
+
 #endif /* __CMYTH_LOCAL_H */
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/cmyth_msc.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/cmyth_msc.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/cmyth_msc.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/cmyth_msc.h	2013-03-12 10:51:22.000000000 +0000
@@ -36,22 +36,12 @@
 #pragma warning(disable:4267)
 #pragma warning(disable:4996)
 
-//#define pthread_mutex_lock(a)
-//#define pthread_mutex_unlock(a)
 #define pthread_mutex_lock(a) EnterCriticalSection(a)
 #define pthread_mutex_unlock(a) LeaveCriticalSection(a)
-//#define PTHREAD_MUTEX_INITIALIZER NULL;
 #define PTHREAD_MUTEX_INITIALIZER InitializeCriticalSection(&mutex);
-//typedef void* pthread_mutex_t;
 typedef CRITICAL_SECTION pthread_mutex_t;
 extern pthread_mutex_t mutex;
-//#define mutex __cmyth_mutex
 
-#undef ECANCELED
-#undef ETIMEDOUT
-
-#define ECANCELED -1
-#define ETIMEDOUT -1
 #define SHUT_RDWR SD_BOTH
 
 typedef SOCKET cmyth_socket_t;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/commbreak.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/commbreak.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/commbreak.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/commbreak.c	2013-03-12 10:51:22.000000000 +0000
@@ -95,7 +95,7 @@
 cmyth_commbreaklist_t
 cmyth_get_commbreaklist(cmyth_conn_t conn, cmyth_proginfo_t prog)
 {
-	unsigned int len = CMYTH_UTC_LEN + CMYTH_LONGLONG_LEN + 19;
+	unsigned int len = CMYTH_UTC_LEN + CMYTH_INT64_LEN + 19;
 	int err;
 	int count;
 	char *buf;
@@ -108,8 +108,8 @@
 		return breaklist;
 	}
 
-	sprintf(buf,"%s %ld %i", "QUERY_COMMBREAK", prog->proginfo_chanId, 
-	        (int)cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts));
+	sprintf(buf,"%s %"PRIu32" %ld", "QUERY_COMMBREAK", prog->proginfo_chanId,
+	        (long)cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts));
 	pthread_mutex_lock(&mutex);
 	if ((err = cmyth_send_message(conn, buf)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -141,7 +141,7 @@
 cmyth_commbreaklist_t
 cmyth_get_cutlist(cmyth_conn_t conn, cmyth_proginfo_t prog)
 {
-	unsigned int len = CMYTH_UTC_LEN + CMYTH_LONGLONG_LEN + 17;
+	unsigned int len = CMYTH_UTC_LEN + CMYTH_INT64_LEN + 17;
 	int err;
 	int count;
 	char *buf;
@@ -154,8 +154,8 @@
 		return breaklist;
 	}
 
-	sprintf(buf,"%s %ld %i", "QUERY_CUTLIST", prog->proginfo_chanId, 
-	        (int)cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts));
+	sprintf(buf,"%s %"PRIu32" %ld", "QUERY_CUTLIST", prog->proginfo_chanId,
+	        (long)cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts));
 
 	if ((err = cmyth_send_message(conn, buf)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -184,18 +184,19 @@
 	return breaklist;
 }
 
-int cmyth_rcv_commbreaklist(cmyth_conn_t conn, int *err, 
+int cmyth_rcv_commbreaklist(cmyth_conn_t conn, int *err,
 			cmyth_commbreaklist_t breaklist, int count)
 {
 	int consumed;
 	int total = 0;
-	long rows;
+	int rows;
 	int64_t mark;
-	long long start = -1;
+	int64_t start_mark;
 	char *failed = NULL;
 	cmyth_commbreak_t commbreak;
-	unsigned short type;
-	unsigned short start_type;
+	uint8_t type;
+	uint8_t start_type;
+	int started = 0;
 	int i;
 
 	if (count <= 0) {
@@ -206,7 +207,7 @@
 	/*
 	 * Get number of rows
 	 */
-	consumed = cmyth_rcv_long(conn, err, &rows, count);
+	consumed = cmyth_rcv_int32(conn, err, &rows, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -221,7 +222,7 @@
 	}
 
 	for (i = 0; i < rows; i++) {
-		consumed = cmyth_rcv_ushort(conn, err, &type, count);
+		consumed = cmyth_rcv_uint8(conn, err, &type, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
@@ -233,28 +234,29 @@
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_long long";
+			failed = "cmyth_rcv_long_long";
 			goto fail;
 		}
 		if (type == CMYTH_COMMBREAK_START || type == CMYTH_CUTLIST_START) {
-			start = mark;
+			start_mark = mark;
 			start_type = type;
+			started = 1;
 		} else if (type == CMYTH_COMMBREAK_END || type == CMYTH_CUTLIST_END) {
-			if (start >= 0 &&
+			if (started &&
 			    ((type == CMYTH_COMMBREAK_END && start_type == CMYTH_COMMBREAK_START)
 			     || (type == CMYTH_CUTLIST_END && start_type == CMYTH_CUTLIST_START)))
 			{
 				commbreak = cmyth_commbreak_create();
-				commbreak->start_mark = start;
+				commbreak->start_mark = start_mark;
 				commbreak->end_mark = mark;
-				start = -1;
+				started = 0;
 				breaklist->commbreak_list = realloc(breaklist->commbreak_list,
 					(++breaklist->commbreak_count) * sizeof(cmyth_commbreak_t));
 				breaklist->commbreak_list[breaklist->commbreak_count - 1] = commbreak;
 			} else {
 				cmyth_dbg(CMYTH_DBG_WARN,
-					"%s: ignoring 'end' marker without a 'start' marker at %lld\n",
-					__FUNCTION__, type, mark);
+					"%s: ignoring 'end' marker without a 'start' marker at %"PRId64"\n",
+					__FUNCTION__, mark);
 			}
 		} else {
 				cmyth_dbg(CMYTH_DBG_WARN,
@@ -293,10 +295,10 @@
 		goto out;
 	}
 
-	fprintf(stderr, "Found %li commercial breaks for current program.\n", breaklist->commbreak_count);
+	fprintf(stderr, "Found %d commercial breaks for current program.\n", breaklist->commbreak_count);
 	if (r != breaklist->commbreak_count) {
 		fprintf(stderr, "commbreak error.  Setting number of commercial breaks to zero\n");
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s  - returned rows=%d commbreak_count=%li\n",__FUNCTION__, r,breaklist->commbreak_count);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s  - returned rows=%d commbreak_count=%d\n",__FUNCTION__, r,breaklist->commbreak_count);
 		breaklist->commbreak_count = 0;
 	}
 	out:
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/connection.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/connection.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/connection.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/connection.c	2013-03-12 10:51:22.000000000 +0000
@@ -20,7 +20,7 @@
 /**
  * \file connection.c
  * Functions to handle creating connections to a MythTV backend and
- * interacting with those connections.  
+ * interacting with those connections.
  */
 
 #include <stdlib.h>
@@ -82,8 +82,8 @@
 };
 
 /*
- * cmyth_conn_destroy(cmyth_conn_t conn)
- * 
+ * cmyth_conn_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -97,6 +97,32 @@
  * None.
  */
 static void
+cmyth_conn_done(cmyth_conn_t conn)
+{
+	int err;
+	char msg[5] = "DONE";
+
+	if (!conn) {
+		return;
+	}
+	if (!conn->conn_hang && conn->conn_ann != ANN_NONE) {
+		pthread_mutex_lock(&mutex);
+
+		/*
+		 * Try to shut down the connection.  Can't do much
+		 * if it fails other than log it.
+		 */
+		if ((err = cmyth_send_message(conn, msg)) < 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR,
+				  "%s: cmyth_send_message() failed (%d)\n",
+				  __FUNCTION__, err);
+		}
+
+		pthread_mutex_unlock(&mutex);
+	}
+}
+
+static void
 cmyth_conn_destroy(cmyth_conn_t conn)
 {
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
@@ -104,16 +130,18 @@
 		cmyth_dbg(CMYTH_DBG_DEBUG, "%s } !\n", __FUNCTION__);
 		return;
 	}
-	if (conn->conn_buf) {
-		free(conn->conn_buf);
-	}
 	if (conn->conn_fd >= 0) {
+		/* Try to close nicely before shutdown */
+		cmyth_conn_done(conn);
 		cmyth_dbg(CMYTH_DBG_PROTO,
 			  "%s: shutdown and close connection fd = %d\n",
 			  __FUNCTION__, conn->conn_fd);
 		shutdown(conn->conn_fd, SHUT_RDWR);
 		closesocket(conn->conn_fd);
 	}
+	if (conn->conn_buf) {
+		free(conn->conn_buf);
+	}
 	if (conn->server)
 	{
 		free( conn->server );
@@ -122,8 +150,8 @@
 }
 
 /*
- * cmyth_conn_create(void)
- * 
+ * cmyth_conn_create()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -157,13 +185,14 @@
 	ret->conn_hang = 0;
 	ret->server = NULL;
 	ret->port = 0;
+	ret->conn_ann = ANN_NONE;
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s }\n", __FUNCTION__);
 	return ret;
 }
 
 /*
- * cmyth_connect(char *server, unsigned short port, unsigned buflen)
- * 
+ * cmyth_connect()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -198,8 +227,8 @@
 }
 
 static cmyth_conn_t
-cmyth_connect_addr(struct addrinfo* addr, unsigned buflen,
-		    int tcp_rcvbuf)
+cmyth_connect_addr(struct addrinfo* addr, uint32_t buflen,
+		    int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t ret = NULL;
 	unsigned char *buf = NULL;
@@ -406,8 +435,8 @@
 }
 
 static cmyth_conn_t
-cmyth_connect(char *server, unsigned short port, unsigned buflen,
-		    int tcp_rcvbuf)
+cmyth_connect(char *server, uint16_t port, uint32_t buflen,
+		    int32_t tcp_rcvbuf)
 {
 	struct   addrinfo hints;
 	struct   addrinfo *result, *addr;
@@ -419,7 +448,7 @@
 	hints.ai_family   = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = IPPROTO_TCP;
-	sprintf(service, "%d", port);
+	sprintf(service, "%"PRIu16, port);
 
 	res = getaddrinfo(server, service, &hints, &result);
 	if(res) {
@@ -479,7 +508,7 @@
 	hints.ai_family   = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = IPPROTO_TCP;
-	sprintf(service, "%d", conn->port);
+	sprintf(service, "%"PRIu16, conn->port);
 
 	res = getaddrinfo(conn->server, service, &hints, &result);
 	if (res) {
@@ -523,19 +552,19 @@
 }
 
 static cmyth_conn_t
-cmyth_conn_connect(char *server, unsigned short port, unsigned buflen,
-		   int tcp_rcvbuf, int event)
+cmyth_conn_connect(char *server, uint16_t port, uint32_t buflen,
+		   int32_t tcp_rcvbuf, int event, cmyth_conn_ann_t ann)
 {
 	cmyth_conn_t conn;
-	char announcement[256];
-	unsigned long tmp_ver;
+	char msg[256];
+	uint32_t tmp_ver;
 	int attempt = 0;
 
     top:
 	conn = cmyth_connect(server, port, buflen, tcp_rcvbuf);
 	if (!conn) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_connect(%s, %d, %d) failed\n",
+			  "%s: cmyth_connect(%s, %"PRIu16", %"PRIu32") failed\n",
 			  __FUNCTION__, server, port, buflen);
 		return NULL;
 	}
@@ -564,14 +593,14 @@
 				  __FUNCTION__);
 			goto shut;
 		}
-		sprintf(announcement, "MYTH_PROTO_VERSION %ld %s", conn->conn_version, map->token);
+		sprintf(msg, "MYTH_PROTO_VERSION %"PRIu32" %s", conn->conn_version, map->token);
 	} else {
-		sprintf(announcement, "MYTH_PROTO_VERSION %ld", conn->conn_version);
+		sprintf(msg, "MYTH_PROTO_VERSION %"PRIu32, conn->conn_version);
 	}
-	if (cmyth_send_message(conn, announcement) < 0) {
+	if (cmyth_send_message(conn, msg) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
-			  __FUNCTION__, announcement);
+			  __FUNCTION__, msg);
 		goto shut;
 	}
 	if (cmyth_rcv_version(conn, &tmp_ver) < 0) {
@@ -581,7 +610,7 @@
 		goto shut;
 	}
 	cmyth_dbg(CMYTH_DBG_ERROR,
-		  "%s: asked for version %ld, got version %ld\n",
+		  "%s: asked for version %"PRIu32", got version %"PRIu32"\n",
 		  __FUNCTION__, conn->conn_version, tmp_ver);
 	if (conn->conn_version != tmp_ver) {
 		if (attempt == 1) {
@@ -594,14 +623,14 @@
 		ref_release(conn);
 		goto top;
 	}
-	cmyth_dbg(CMYTH_DBG_PROTO, "%s: agreed on Version %ld protocol\n",
+	cmyth_dbg(CMYTH_DBG_PROTO, "%s: agreed on Version %"PRIu32" protocol\n",
 		  __FUNCTION__, conn->conn_version);
 
-	sprintf(announcement, "ANN Playback %s %d", my_hostname, event);
-	if (cmyth_send_message(conn, announcement) < 0) {
+	sprintf(msg, "ANN %s %s %d", (ann == ANN_MONITOR ? "Monitor" : "Playback"), my_hostname, event);
+	if (cmyth_send_message(conn, msg) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
-			  __FUNCTION__, announcement);
+			  __FUNCTION__, msg);
 		goto shut;
 	}
 	if (cmyth_rcv_okay(conn) < 0) {
@@ -609,6 +638,7 @@
 			  __FUNCTION__);
 		goto shut;
 	}
+	conn->conn_ann = ann;
 
 	/*
 	 * All of the downstream code in libcmyth assumes a monotonically increasing version number.
@@ -630,10 +660,10 @@
 }
 
 static int
-cmyth_conn_reconnect(cmyth_conn_t conn, int event)
+cmyth_conn_reconnect(cmyth_conn_t conn, int event, cmyth_conn_ann_t ann)
 {
-	char announcement[256];
-	unsigned long tmp_ver;
+	char msg[256];
+	uint32_t tmp_ver;
 	int attempt = 0;
 	int ret = 0;
 
@@ -669,13 +699,13 @@
 				  __FUNCTION__);
 			goto shut;
 		}
-		sprintf(announcement, "MYTH_PROTO_VERSION %ld %s", conn->conn_version, map->token);
+		sprintf(msg, "MYTH_PROTO_VERSION %"PRIu32" %s", conn->conn_version, map->token);
 	} else {
-		sprintf(announcement, "MYTH_PROTO_VERSION %ld", conn->conn_version);
+		sprintf(msg, "MYTH_PROTO_VERSION %"PRIu32, conn->conn_version);
 	}
-	if (cmyth_send_message(conn, announcement) < 0) {
+	if (cmyth_send_message(conn, msg) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message('%s') failed\n",
-			  __FUNCTION__, announcement);
+			  __FUNCTION__, msg);
 		goto shut;
 	}
 	if (cmyth_rcv_version(conn, &tmp_ver) < 0) {
@@ -683,7 +713,7 @@
 			  __FUNCTION__);
 		goto shut;
 	}
-	cmyth_dbg(CMYTH_DBG_ERROR, "%s: asked for version %ld, got version %ld\n",
+	cmyth_dbg(CMYTH_DBG_ERROR, "%s: asked for version %"PRIu32", got version %"PRIu32"\n",
 		  __FUNCTION__, conn->conn_version, tmp_ver);
 	if (conn->conn_version != tmp_ver) {
 		if (attempt == 1) {
@@ -694,13 +724,13 @@
 		attempt = 1;
 		goto top;
 	}
-	cmyth_dbg(CMYTH_DBG_PROTO, "%s: agreed on Version %ld protocol\n",
+	cmyth_dbg(CMYTH_DBG_PROTO, "%s: agreed on Version %"PRIu32" protocol\n",
 		  __FUNCTION__, conn->conn_version);
 
-	sprintf(announcement, "ANN Playback %s %d", my_hostname, event);
-	if (cmyth_send_message(conn, announcement) < 0) {
+	sprintf(msg, "ANN %s %s %d", (ann == ANN_MONITOR ? "Monitor" : "Playback"), my_hostname, event);
+	if (cmyth_send_message(conn, msg) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message('%s') failed\n",
-			  __FUNCTION__, announcement);
+			  __FUNCTION__, msg);
 		goto shut;
 	}
 	if (cmyth_rcv_okay(conn) < 0) {
@@ -708,6 +738,7 @@
 			  __FUNCTION__);
 		goto shut;
 	}
+	conn->conn_ann = ann;
 
 	/*
 	 * All of the downstream code in libcmyth assumes a monotonically increasing version number.
@@ -728,7 +759,7 @@
 }
 
 /*
- * cmyth_conn_connect_ctrl(char *server, unsigned short port, unsigned buflen)
+ * cmyth_conn_connect_ctrl()
  *
  * Scope: PUBLIC
  *
@@ -746,21 +777,21 @@
  * Failure: NULL cmyth_conn_t
  */
 cmyth_conn_t
-cmyth_conn_connect_ctrl(char *server, unsigned short port, unsigned buflen,
-			int tcp_rcvbuf)
+cmyth_conn_connect_ctrl(char *server, uint16_t port, uint32_t buflen,
+			int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t ret;
 
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: connecting control connection\n",
 		  __FUNCTION__);
-	ret = cmyth_conn_connect(server, port, buflen, tcp_rcvbuf, 0);
+	ret = cmyth_conn_connect(server, port, buflen, tcp_rcvbuf, 0, ANN_PLAYBACK);
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: done connecting control connection ret = %p\n",
 		  __FUNCTION__, ret);
 	return ret;
 }
 
 /*
- * cmyth_conn_reconnect_ctrl(cmyth_conn_t control)
+ * cmyth_conn_reconnect_ctrl()
  *
  * Scope: PUBLIC
  *
@@ -785,7 +816,7 @@
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: reconnecting control connection\n",
 		  __FUNCTION__);
 	if (control)
-		ret = cmyth_conn_reconnect(control, 0);
+		ret = cmyth_conn_reconnect(control, 0, ANN_PLAYBACK);
 	else
 		ret = 0;
 	if (ret)
@@ -796,13 +827,13 @@
 }
 
 cmyth_conn_t
-cmyth_conn_connect_event(char *server, unsigned short port, unsigned buflen,
-			 int tcp_rcvbuf)
+cmyth_conn_connect_event(char *server, uint16_t port, uint32_t buflen,
+			 int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t ret;
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: connecting event channel connection\n",
 		  __FUNCTION__);
-	ret = cmyth_conn_connect(server, port, buflen, tcp_rcvbuf, 1);
+	ret = cmyth_conn_connect(server, port, buflen, tcp_rcvbuf, 1, ANN_MONITOR);
 	cmyth_dbg(CMYTH_DBG_PROTO,
 		  "%s: done connecting event channel connection ret = %p\n",
 		  __FUNCTION__, ret);
@@ -816,7 +847,7 @@
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: re-connecting event channel connection\n",
 		  __FUNCTION__);
 	if (conn)
-		ret = cmyth_conn_reconnect(conn, 1);
+		ret = cmyth_conn_reconnect(conn, 1, ANN_MONITOR);
 	else
 		ret = 0;
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: done re-connecting event channel connection ret = %d\n",
@@ -825,8 +856,7 @@
 }
 
 /*
- * cmyth_conn_connect_file(char *server, unsigned short port, unsigned buflen
- *                         cmyth_proginfo_t prog)
+ * cmyth_conn_connect_file()
  *
  * Scope: PUBLIC
  *
@@ -847,7 +877,7 @@
  */
 cmyth_file_t
 cmyth_conn_connect_file(cmyth_proginfo_t prog,  cmyth_conn_t control,
-			unsigned buflen, int tcp_rcvbuf)
+			uint32_t buflen, int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t conn = NULL;
 	char *announcement = NULL;
@@ -858,6 +888,8 @@
 	int r;
 	int ann_size = sizeof("ANN FileTransfer  0 0 0000[]:[][]:[]");
 	cmyth_file_t ret = NULL;
+	uint32_t file_id;
+	int64_t file_length;
 
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: prog is NULL\n", __FUNCTION__);
@@ -873,16 +905,10 @@
 			  __FUNCTION__);
 		goto shut;
 	}
-	ret = cmyth_file_create(control);
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_file_create() failed\n",
-			  __FUNCTION__);
-		goto shut;
-	}
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: connecting data connection\n",
 		  __FUNCTION__);
 	if (control->conn_version >= 17) {
-		myth_host = cmyth_conn_get_setting_unlocked(control, prog->proginfo_host,
+		myth_host = cmyth_conn_get_setting(control, prog->proginfo_host,
 		                                   "BackendServerIP");
 		if (myth_host && (strcmp(myth_host, "-1") == 0)) {
 			ref_release(myth_host);
@@ -903,7 +929,7 @@
 		  __FUNCTION__, conn);
 	if (!conn) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_connect(%s, %d, %d) failed\n",
+			  "%s: cmyth_connect(%s, %"PRIu16", %"PRIu32") failed\n",
 			  __FUNCTION__,
 			  myth_host, prog->proginfo_port, buflen);
 		goto shut;
@@ -935,9 +961,10 @@
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
 			  __FUNCTION__, announcement);
+		free(announcement);
 		goto shut;
 	}
-	ret->file_data = ref_hold(conn);
+	free(announcement);
 	count = cmyth_rcv_length(conn);
 	if (count < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -946,7 +973,7 @@
 		goto shut;
 	}
 	reply[sizeof(reply) - 1] = '\0';
-	r = cmyth_rcv_string(conn, &err, reply, sizeof(reply) - 1, count); 
+	r = cmyth_rcv_string(conn, &err, reply, sizeof(reply) - 1, count);
 	if (err != 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_string() failed (%d)\n",
@@ -959,7 +986,7 @@
 		goto shut;
 	}
 	count -= r;
-	r = cmyth_rcv_long(conn, &err, &ret->file_id, count);
+	r = cmyth_rcv_uint32(conn, &err, &file_id, count);
 	if (err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: (id) cmyth_rcv_long() failed (%d)\n",
@@ -967,10 +994,10 @@
 		goto shut;
 	}
 	count -= r;
-	r = cmyth_rcv_uint64(conn, &err, &ret->file_length, count);
+	r = cmyth_rcv_int64(conn, &err, &file_length, count);
 	if (err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: (length) cmyth_rcv_uint64() failed (%d)\n",
+			  "%s: (length) cmyth_rcv_int64() failed (%d)\n",
 			  __FUNCTION__, err);
 		goto shut;
 	}
@@ -979,24 +1006,27 @@
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: %d leftover bytes\n",
 			  __FUNCTION__, count);
 	}
-	free(announcement);
-	ref_release(conn);
+
+	ret = cmyth_file_create(control);
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_file_create() failed\n",
+			  __FUNCTION__);
+		goto shut;
+	}
+	ret->file_data = conn;
+	ret->file_id = file_id;
+	ret->file_length = file_length;
 	ref_release(myth_host);
 	return ret;
 
     shut:
-	if (announcement) {
-		free(announcement);
-	}
-	ref_release(ret);
 	ref_release(conn);
 	ref_release(myth_host);
 	return NULL;
 }
 
 /*
- * cmyth_conn_connect_path(char* path, cmyth_conn_t control,
- *                         unsigned buflen, int tcp_rcvbuf)
+ * cmyth_conn_connect_path()
  *
  * Scope: PUBLIC
  *
@@ -1017,28 +1047,18 @@
  */
 cmyth_file_t
 cmyth_conn_connect_path(char* path, cmyth_conn_t control,
-			unsigned buflen, int tcp_rcvbuf, char* storage_group)
+			uint32_t buflen, int32_t tcp_rcvbuf, char* storage_group)
 {
 	cmyth_conn_t conn = NULL;
 	char *announcement = NULL;
 	char reply[16];
-	char host[256];
 	int err = 0;
 	int count = 0;
-	int r, port;
+	int r;
 	int ann_size = sizeof("ANN FileTransfer  0 0 0000[]:[][]:[]");
-	struct sockaddr_in addr;
-        socklen_t addr_size = sizeof(addr);
 	cmyth_file_t ret = NULL;
-
-	if (getpeername(control->conn_fd, (struct sockaddr*)&addr, &addr_size)<0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: getpeername() failed\n",
-			  __FUNCTION__);
-		goto shut;
-	}
-
-	inet_ntop(addr.sin_family, &addr.sin_addr, host, sizeof(host));
-	port = ntohs(addr.sin_port);
+	uint32_t file_id;
+	int64_t file_length;
 
 	ret = cmyth_file_create(control);
 	if (!ret) {
@@ -1049,14 +1069,14 @@
 
 	cmyth_dbg(CMYTH_DBG_PROTO, "%s: connecting data connection\n",
 		  __FUNCTION__);
-	conn = cmyth_connect(host, port, buflen, tcp_rcvbuf);
+	conn = cmyth_connect(control->server, control->port, buflen, tcp_rcvbuf);
 	cmyth_dbg(CMYTH_DBG_PROTO,
 		  "%s: done connecting data connection, conn = %p\n",
 		  __FUNCTION__, conn);
 	if (!conn) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_connect(%s, %d, %d) failed\n",
-			  __FUNCTION__, host, port, buflen);
+			  "%s: cmyth_connect(%s, %"PRIu16", %"PRIu32") failed\n",
+			  __FUNCTION__, control->server, control->port, buflen);
 		goto shut;
 	}
 	/*
@@ -1089,9 +1109,10 @@
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
 			  __FUNCTION__, announcement);
+		free(announcement);
 		goto shut;
 	}
-	ret->file_data = ref_hold(conn);
+	free(announcement);
 	count = cmyth_rcv_length(conn);
 	if (count < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -1100,7 +1121,7 @@
 		goto shut;
 	}
 	reply[sizeof(reply) - 1] = '\0';
-	r = cmyth_rcv_string(conn, &err, reply, sizeof(reply) - 1, count); 
+	r = cmyth_rcv_string(conn, &err, reply, sizeof(reply) - 1, count);
 	if (err != 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_string() failed (%d)\n",
@@ -1113,7 +1134,7 @@
 		goto shut;
 	}
 	count -= r;
-	r = cmyth_rcv_long(conn, &err, &ret->file_id, count);
+	r = cmyth_rcv_uint32(conn, &err, &file_id, count);
 	if (err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: (id) cmyth_rcv_long() failed (%d)\n",
@@ -1121,30 +1142,37 @@
 		goto shut;
 	}
 	count -= r;
-	r = cmyth_rcv_uint64(conn, &err, &ret->file_length, count);
+	r = cmyth_rcv_int64(conn, &err, &file_length, count);
 	if (err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: (length) cmyth_rcv_uint64() failed (%d)\n",
+			  "%s: (length) cmyth_rcv_int64() failed (%d)\n",
 			  __FUNCTION__, err);
 		goto shut;
 	}
 	count -= r;
-	free(announcement);
-	ref_release(conn);
+	if (count != 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: %d leftover bytes\n",
+			  __FUNCTION__, count);
+	}
+
+	ret = cmyth_file_create(control);
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_file_create() failed\n",
+			  __FUNCTION__);
+		goto shut;
+	}
+	ret->file_data = conn;
+	ret->file_id = file_id;
+	ret->file_length = file_length;
 	return ret;
 
     shut:
-	if (announcement) {
-		free(announcement);
-	}
-	ref_release(ret);
 	ref_release(conn);
 	return NULL;
 }
 
 /*
- * cmyth_conn_connect_ring(char *server, unsigned short port, unsigned buflen
- *                         cmyth_recorder_t rec)
+ * cmyth_conn_connect_ring()
  *
  * Scope: PUBLIC
  *
@@ -1162,13 +1190,13 @@
  * Failure: NULL cmyth_conn_t
  */
 int
-cmyth_conn_connect_ring(cmyth_recorder_t rec, unsigned buflen, int tcp_rcvbuf)
+cmyth_conn_connect_ring(cmyth_recorder_t rec, uint32_t buflen, int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t conn;
 	char *announcement;
 	int ann_size = sizeof("ANN RingBuffer  ");
 	char *server;
-	unsigned short port;
+	uint16_t port;
 
 	if (!rec) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: rec is NULL\n", __FUNCTION__);
@@ -1186,12 +1214,12 @@
 		  __FUNCTION__, conn);
 	if (!conn) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_connect(%s, %d, %d) failed\n",
+			  "%s: cmyth_connect(%s, %"PRIu16", %"PRIu32") failed\n",
 			  __FUNCTION__, server, port, buflen);
 		return -1;
 	}
 
-	ann_size += CMYTH_LONG_LEN + strlen(my_hostname);
+	ann_size += CMYTH_INT32_LEN + strlen(my_hostname);
 	announcement = malloc(ann_size);
 	if (!announcement) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -1200,7 +1228,7 @@
 		goto shut;
 	}
 	sprintf(announcement,
-		"ANN RingBuffer %s %d", my_hostname, rec->rec_id);
+		"ANN RingBuffer %s %"PRIu32, my_hostname, rec->rec_id);
 	if (cmyth_send_message(conn, announcement) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
@@ -1224,12 +1252,12 @@
 }
 
 int
-cmyth_conn_connect_recorder(cmyth_recorder_t rec, unsigned buflen,
-			    int tcp_rcvbuf)
+cmyth_conn_connect_recorder(cmyth_recorder_t rec, uint32_t buflen,
+			    int32_t tcp_rcvbuf)
 {
 	cmyth_conn_t conn;
 	char *server;
-	unsigned short port;
+	uint16_t port;
 
 	if (!rec) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: rec is NULL\n", __FUNCTION__);
@@ -1247,7 +1275,7 @@
 		  __FUNCTION__, conn);
 	if (!conn) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_connect(%s, %d, %d) failed\n",
+			  "%s: cmyth_connect(%s, %"PRIu16", %"PRIu32") failed\n",
 			  __FUNCTION__, server, port, buflen);
 		return -1;
 	}
@@ -1260,8 +1288,8 @@
 }
 
 /*
- * cmyth_conn_check_block(cmyth_conn_t conn, unsigned long size)
- * 
+ * cmyth_conn_check_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -1278,13 +1306,13 @@
  * Failure: -(errno)
  */
 int
-cmyth_conn_check_block(cmyth_conn_t conn, unsigned long size)
+cmyth_conn_check_block(cmyth_conn_t conn, uint32_t size)
 {
 	fd_set check;
 	struct timeval timeout;
 	int length;
 	int err = 0;
-	unsigned long sent;
+	uint32_t sent;
 
 	if (!conn) {
 		return -EINVAL;
@@ -1305,7 +1333,7 @@
 		if (length < 0) {
 			return length;
 		}
-		cmyth_rcv_ulong(conn, &err, &sent, length);
+		cmyth_rcv_uint32(conn, &err, &sent, length);
 		if (err) {
 			return -err;
 		}
@@ -1314,12 +1342,12 @@
 			 * This block has been sent, return TRUE.
 			 */
 			cmyth_dbg(CMYTH_DBG_DEBUG,
-				  "%s: block finished (%d bytes)\n",
+				  "%s: block finished (%"PRIu32" bytes)\n",
 				  __FUNCTION__, sent);
 			return 1;
 		} else {
 			cmyth_dbg(CMYTH_DBG_ERROR,
-				  "%s: block finished short (%d bytes)\n",
+				  "%s: block finished short (%"PRIu32" bytes)\n",
 				  __FUNCTION__, sent);
 			return -ECANCELED;
 		}
@@ -1328,10 +1356,8 @@
 }
 
 /*
- * cmyth_conn_get_recorder_from_num(cmyth_conn_t control,
- *                                  cmyth_recorder_num_t num,
- *                                  cmyth_recorder_t rec)
- * 
+ * cmyth_conn_get_recorder_from_num()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -1344,16 +1370,16 @@
  *
  * Return Value:
  *
- * Success: 0 for not complete, 1 for complete
+ * Success: non-NULL cmyth_recorder_t (this type is a pointer)
  *
- * Failure: -(errno)
+ * Failure: NULL cmyth_recorder_t
  */
 cmyth_recorder_t
-cmyth_conn_get_recorder_from_num(cmyth_conn_t conn, int id)
+cmyth_conn_get_recorder_from_num(cmyth_conn_t conn, int32_t id)
 {
 	int err, count;
 	int r;
-	long port;
+	uint16_t port;
 	char msg[256];
 	char reply[256];
 	cmyth_recorder_t rec = NULL;
@@ -1369,7 +1395,7 @@
 	if ((rec=cmyth_recorder_create()) == NULL)
 		goto fail;
 
-	snprintf(msg, sizeof(msg), "GET_RECORDER_FROM_NUM[]:[]%d", id);
+	snprintf(msg, sizeof(msg), "GET_RECORDER_FROM_NUM[]:[]%"PRId32, id);
 
 	if ((err = cmyth_send_message(conn, msg)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -1395,16 +1421,13 @@
 	}
 	count -= r;
 
-	if ((r=cmyth_rcv_long(conn, &err, &port, count)) < 0) {
+	if ((r=cmyth_rcv_uint16(conn, &err, &port, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
 			  __FUNCTION__, r);
 		goto fail;
 	}
 
-	if (port == -1)
-		goto fail;
-
 	rec->rec_id = id;
 	rec->rec_server = ref_strdup(reply);
 	rec->rec_port = port;
@@ -1427,9 +1450,9 @@
 }
 
 /*
- * cmyth_conn_get_free_recorder(cmyth_conn_t control, cmyth_recorder_t rec)
- *                             
- * 
+ * cmyth_conn_get_free_recorder()
+ *
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -1439,16 +1462,17 @@
  *
  * Return Value:
  *
- * Success: 0 for not complete, 1 for complete
+ * Success: non-NULL cmyth_recorder_t (this type is a pointer)
  *
- * Failure: -(errno)
+ * Failure: NULL cmyth_recorder_t
  */
 cmyth_recorder_t
 cmyth_conn_get_free_recorder(cmyth_conn_t conn)
 {
 	int err, count;
 	int r;
-	long port, id;
+	uint16_t port;
+	uint32_t id;
 	char msg[256];
 	char reply[256];
 	cmyth_recorder_t rec = NULL;
@@ -1480,7 +1504,7 @@
 			  __FUNCTION__, count);
 		goto fail;
 	}
-	if ((r=cmyth_rcv_long(conn, &err, &id, count)) < 0) {
+	if ((r=cmyth_rcv_uint32(conn, &err, &id, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -1495,16 +1519,13 @@
 		goto fail;
 	}
 	count -= r;
-	if ((r=cmyth_rcv_long(conn, &err, &port, count)) < 0) {
+	if ((r=cmyth_rcv_uint16(conn, &err, &port, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
 			  __FUNCTION__, r);
 		goto fail;
 	}
 
-	if (port == -1)
-		goto fail;
-
 	rec->rec_id = id;
 	rec->rec_server = ref_strdup(reply);
 	rec->rec_port = port;
@@ -1528,7 +1549,7 @@
 
 int
 cmyth_conn_get_freespace(cmyth_conn_t control,
-			 long long *total, long long *used)
+			 int64_t *total, int64_t *used)
 {
 	int err, count, ret = 0;
 	int r;
@@ -1546,7 +1567,7 @@
 
 	if (control->conn_version >= 32)
 		{ snprintf(msg, sizeof(msg), "QUERY_FREE_SPACE_SUMMARY"); }
-	else if (control->conn_version >= 17)	
+	else if (control->conn_version >= 17)
 		{ snprintf(msg, sizeof(msg), "QUERY_FREE_SPACE"); }
 	else
 		{ snprintf(msg, sizeof(msg), "QUERY_FREESPACE"); }
@@ -1566,7 +1587,7 @@
 		ret = count;
 		goto out;
 	}
-	
+
 	if (control->conn_version >= 17) {
 		if ((r=cmyth_rcv_int64(control, &err, &lreply, count)) < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
@@ -1595,7 +1616,7 @@
 				ret = err;
 				goto out;
 			}
-			*total = atoi(reply);
+			*total = atol(reply);
 			if ((r=cmyth_rcv_string(control, &err, reply,
 						sizeof(reply)-1,
 						count-r)) < 0) {
@@ -1605,7 +1626,7 @@
 				ret = err;
 				goto out;
 			}
-			*used = atoi(reply);
+			*used = atol(reply);
 
 			*used *= 1024;
 			*total *= 1024;
@@ -1626,7 +1647,7 @@
 	return control->conn_hang;
 }
 
-int
+int32_t
 cmyth_conn_get_protocol_version(cmyth_conn_t conn)
 {
 	if (!conn) {
@@ -1639,12 +1660,13 @@
 }
 
 
-int
+int32_t
 cmyth_conn_get_free_recorder_count(cmyth_conn_t conn)
 {
 	char msg[256];
 	int count, err;
-	long c, r;
+	uint16_t c;
+	int r;
 	int ret;
 
 	if (!conn) {
@@ -1664,14 +1686,14 @@
 		goto err;
 	}
 
-	if ((count=cmyth_rcv_length(conn)) < 0) {
+	if ((count = cmyth_rcv_length(conn)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_length() failed (%d)\n",
 			  __FUNCTION__, count);
 		ret = count;
 		goto err;
 	}
-	if ((r=cmyth_rcv_long(conn, &err, &c, count)) < 0) {
+	if ((r = cmyth_rcv_uint16(conn, &err, &c, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -1679,7 +1701,7 @@
 		goto err;
 	}
 
-	ret = c;
+	ret = (int)c;
 
     err:
 	pthread_mutex_unlock(&mutex);
@@ -1713,7 +1735,7 @@
 		goto err;
 	}
 
-	if ((count=cmyth_rcv_length(conn)) < 0) {
+	if ((count = cmyth_rcv_length(conn)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_length() failed (%d)\n",
 			  __FUNCTION__, count);
@@ -1870,13 +1892,13 @@
 		return -4;
 	}
 
-	return 1;
+	return 0;
 }
 
 int cmyth_conn_set_setting(cmyth_conn_t conn,
                const char* hostname, const char* setting, const char* value)
 {
-	int result = -1;
+	int result;
 
 	pthread_mutex_lock(&mutex);
 	result = cmyth_conn_set_setting_unlocked(conn, hostname, setting, value);
@@ -1886,14 +1908,14 @@
 }
 
 /*
- * cmyth_conn_reschedule_recordings(cmyth_conn_t rec, int recordid)
+ * cmyth_conn_reschedule_recordings()
  *
  * Scope: PUBLIC
  *
  * Description
  *
  * Issues a run of the re-scheduler.
- * Takes an optional recordid, or -1 performs a full run.
+ * Takes an optional recordid, or -1 (0xFFFFFFFF) performs a full run.
  *
  * Return Value:
  *
@@ -1902,10 +1924,9 @@
  * Failure: -(ERRNO)
  */
 int
-cmyth_conn_reschedule_recordings(cmyth_conn_t conn, int recordid)
+cmyth_conn_reschedule_recordings(cmyth_conn_t conn, uint32_t recordid)
 {
 	int err = 0;
-	int id;
 	char msg[256];
 
 	if (conn->conn_version < 15) {
@@ -1934,14 +1955,18 @@
 	 *    <programid>
 	 */
 	if (conn->conn_version < 73) {
-		id = (recordid > 0 ? recordid : -1);
-		snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS %i", id);
+		if (recordid > 0 && recordid < UINT32_MAX)
+			snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS %"PRIu32, recordid);
+		else
+			snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS -1");
 	} else {
 		if (recordid == 0) {
 			strncpy(msg, "RESCHEDULE_RECORDINGS []:[]CHECK 0 0 0 cmyth[]:[][]:[][]:[][]:[]**any**", sizeof(msg));
 		} else {
-			id = (recordid > 0 ? recordid : 0);
-			snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS []:[]MATCH %i 0 0 - cmyth", id);
+			if (recordid > 0 && recordid < UINT32_MAX)
+				snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS []:[]MATCH %"PRIu32" 0 0 - cmyth", recordid);
+			else
+				snprintf(msg, sizeof(msg), "RESCHEDULE_RECORDINGS []:[]MATCH 0 0 0 - cmyth");
 		}
 	}
 
@@ -1964,4 +1989,4 @@
 out:
 	pthread_mutex_unlock(&mutex);
 	return err;
-}
+}
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/event.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/event.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/event.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/event.c	2013-03-12 10:51:22.000000000 +0000
@@ -24,7 +24,16 @@
 #include <cmyth_local.h>
 
 cmyth_event_t
-cmyth_event_get(cmyth_conn_t conn, char * data, int len)
+cmyth_event_get(cmyth_conn_t conn, char * data, int32_t len)
+{
+	cmyth_proginfo_t proginfo = NULL;
+	cmyth_event_t event = cmyth_event_get_message(conn, data, len, &proginfo);
+	ref_release(proginfo);
+	return event;
+}
+
+cmyth_event_t
+cmyth_event_get_message(cmyth_conn_t conn, char * data, int32_t len, cmyth_proginfo_t * prog)
 {
 	int count, err, consumed, i;
 	char tmp[1024];
@@ -68,9 +77,8 @@
 			goto fail;
 		}
 		consumed = cmyth_rcv_proginfo(conn, &err, proginfo, count);
-		ref_release(proginfo);
-		proginfo = NULL;
 		count -= consumed;
+		*prog = proginfo;
 	} else if (strncmp(tmp, "RECORDING_LIST_CHANGE DELETE", 28) == 0) {
 		event = CMYTH_EVENT_RECORDING_LIST_CHANGE_DELETE;
 		strncpy(data, tmp + 29, len);
@@ -88,8 +96,8 @@
 	} else if (strncmp(tmp, "LIVETV_CHAIN UPDATE", 19) == 0) {
 		event = CMYTH_EVENT_LIVETV_CHAIN_UPDATE;
 		strncpy(data, tmp + 20, len);
-	} else if (strncmp(tmp, "SIGNAL", 6) == 0) { 
-		int dstlen = len;
+	} else if (strncmp(tmp, "SIGNAL", 6) == 0) {
+		int32_t dstlen = len;
 		event = CMYTH_EVENT_SIGNAL;
 
 		/*Get Recorder ID */
@@ -99,29 +107,30 @@
 
 		/* get slock, signal, seen_pat, matching_pat */
 		while (count > 0) {
-			/* get signalmonitorvalue name */ 
-			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count); 
-			count -= consumed; 
+			/* get signalmonitorvalue name */
+			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count);
+			count -= consumed;
 			/*strncat(data,tmp,dstlen-2);
 			strncat(data,"=",2);
 			dstlen -= consumed;*/
-			/* get signalmonitorvalue status */ 
-			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count); 
-			count -= consumed; 
+			/* get signalmonitorvalue status */
+			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count);
+			count -= consumed;
 			strncat(data,tmp,dstlen-2);
 			strncat(data,";",2);
 			dstlen -= consumed;
 		}
 	} else if (strncmp(tmp, "ASK_RECORDING", 13) == 0) {
 		event = CMYTH_EVENT_ASK_RECORDING;
+		strncpy(data, tmp + 14, len);
 		if (cmyth_conn_get_protocol_version(conn) < 37) {
 			/* receive 4 string - do nothing with them */
+			/* title, chanstr, chansign, channame */
 			for (i = 0; i < 4; i++) {
 				consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) -1, count);
 				count -= consumed;
 			}
 		} else {
-			/* receive a proginfo structure - do nothing with it (yet?)*/
 			proginfo = cmyth_proginfo_create();
 			if (!proginfo) {
 				cmyth_dbg(CMYTH_DBG_ERROR,
@@ -130,9 +139,8 @@
 				goto fail;
 			}
 			consumed = cmyth_rcv_proginfo(conn, &err, proginfo, count);
-			ref_release(proginfo);
-			proginfo = NULL;
 			count -= consumed;
+			*prog = proginfo;
 		}
 	} else if (strncmp(tmp, "CLEAR_SETTINGS_CACHE", 20) == 0) {
 		event = CMYTH_EVENT_CLEAR_SETTINGS_CACHE;
@@ -197,4 +205,3 @@
 
 	return ret;
 }
-
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/file.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/file.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/file.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/file.c	2013-03-12 10:51:22.000000000 +0000
@@ -25,8 +25,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_file_destroy(cmyth_file_t file)
- * 
+ * cmyth_file_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -58,7 +58,7 @@
 		 * if it fails other than log it.
 		 */
 		snprintf(msg, sizeof(msg),
-			 "QUERY_FILETRANSFER %ld[]:[]DONE", file->file_id);
+			 "QUERY_FILETRANSFER %"PRIu32"[]:[]DONE", file->file_id);
 
 		if ((err = cmyth_send_message(file->file_control, msg)) < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
@@ -74,8 +74,8 @@
 			goto fail;
 		}
 	    fail:
-		ref_release(file->file_control);
 		pthread_mutex_unlock(&mutex);
+		ref_release(file->file_control);
 	}
 	if (file->closed_callback) {
 	    (file->closed_callback)(file);
@@ -88,7 +88,7 @@
 }
 
 /*
- * cmyth_file_set_closed_callback(cmyth_file_t file, void (*callback)(cmyth_file_t))
+ * cmyth_file_set_closed_callback()
  *
  * Scope: PUBLIC
  *
@@ -106,8 +106,8 @@
 }
 
 /*
- * cmyth_file_create(cmyth_conn_t control)
- * 
+ * cmyth_file_create()
+ *
  * Scope: PRIVATE (mapped to __cmyth_file_create)
  *
  * Description
@@ -136,7 +136,7 @@
 
 	ret->file_control = ref_hold(control);
 	ret->file_data = NULL;
-	ret->file_id = -1;
+	ret->file_id = 0;
 	ret->file_start = 0;
 	ret->file_length = 0;
 	ret->file_pos = 0;
@@ -147,8 +147,8 @@
 }
 
 /*
- * cmyth_file_data(cmyth_file_t p)
- * 
+ * cmyth_file_data()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -176,8 +176,8 @@
 }
 
 /*
- * cmyth_file_control(cmyth_file_t p)
- * 
+ * cmyth_file_control()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -205,8 +205,8 @@
 }
 
 /*
- * cmyth_file_start(cmyth_file_t p)
- * 
+ * cmyth_file_start()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -219,7 +219,7 @@
  *
  * Failure: a long long containing -errno
  */
-unsigned long long
+int64_t
 cmyth_file_start(cmyth_file_t file)
 {
 	if (!file) {
@@ -229,8 +229,8 @@
 }
 
 /*
- * cmyth_file_length(cmyth_file_t p)
- * 
+ * cmyth_file_length()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -243,7 +243,7 @@
  *
  * Failure: a long long containing -errno
  */
-unsigned long long
+int64_t
 cmyth_file_length(cmyth_file_t file)
 {
 	if (!file) {
@@ -253,7 +253,7 @@
 }
 
 /*
- * cmyth_update_file_length(cmyth_file_t file, unsigned long long newLength)
+ * cmyth_file_update_length()
  *
  * Scope: PUBLIC
  *
@@ -263,22 +263,22 @@
  *
  * Return Value:
  *
- * Sucess: a int value >= 0
+ * Success: a int value >= 0
  *
  * Failure: a int containing -errno
  */
 int
-cmyth_update_file_length(cmyth_file_t file, unsigned long long newLength)
+cmyth_file_update_length(cmyth_file_t file, int64_t newlen)
 {
 	if (!file) {
 		return -EINVAL;
 	}
-	file->file_length = newLength;
+	file->file_length = newlen;
 	return 0;
 }
 
 /*
- * cmyth_file_position(cmyth_file_t p)
+ * cmyth_file_position()
  *
  * Scope: PUBLIC
  *
@@ -292,7 +292,7 @@
  *
  * Failure: a long long containing -errno
  */
-unsigned long long
+int64_t
 cmyth_file_position(cmyth_file_t file)
 {
 	if (!file) {
@@ -303,8 +303,8 @@
 
 
 /*
- * cmyth_file_get_block(cmyth_file_t file, char *buf, unsigned long len)
- * 
+ * cmyth_file_get_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -317,8 +317,8 @@
  *
  * Failure: -1
  */
-int
-cmyth_file_get_block(cmyth_file_t file, char *buf, unsigned long len)
+int32_t
+cmyth_file_get_block(cmyth_file_t file, char *buf, int32_t len)
 {
 	struct timeval tv;
 	fd_set fds;
@@ -327,6 +327,9 @@
 	if (file == NULL || file->file_data == NULL)
 		return -EINVAL;
 
+	if(len > file->file_data->conn_tcp_rcvbuf)
+		len = file->file_data->conn_tcp_rcvbuf;
+
 	tv.tv_sec = 10;
 	tv.tv_usec = 0;
 	FD_ZERO(&fds);
@@ -377,8 +380,8 @@
 }
 
 /*
- * cmyth_file_request_block(cmyth_file_t file, unsigned long len)
- * 
+ * cmyth_file_request_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -392,12 +395,12 @@
  *
  * Failure: an int containing -errno
  */
-int
-cmyth_file_request_block(cmyth_file_t file, unsigned long len)
+int32_t
+cmyth_file_request_block(cmyth_file_t file, int32_t len)
 {
 	int err, count;
 	int r;
-	long c, ret;
+	int32_t c, ret;
 	char msg[256];
 
 	if (!file) {
@@ -408,11 +411,11 @@
 
 	pthread_mutex_lock(&mutex);
 
-	if(len > (unsigned int)file->file_control->conn_tcp_rcvbuf)
-		len = (unsigned int)file->file_control->conn_tcp_rcvbuf;
+	if(len > file->file_data->conn_tcp_rcvbuf)
+		len = file->file_data->conn_tcp_rcvbuf;
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_FILETRANSFER %ld[]:[]REQUEST_BLOCK[]:[]%ld",
+		 "QUERY_FILETRANSFER %"PRIu32"[]:[]REQUEST_BLOCK[]:[]%"PRId32,
 		 file->file_id, len);
 
 	if ((err = cmyth_send_message(file->file_control, msg)) < 0) {
@@ -430,7 +433,7 @@
 		ret = count;
 		goto out;
 	}
-	if ((r=cmyth_rcv_long(file->file_control, &err, &c, count)) < 0) {
+	if ((r=cmyth_rcv_int32(file->file_control, &err, &c, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -448,18 +451,18 @@
 }
 
 /*
- * cmyth_file_seek(cmyth_file_t file, long long offset, int whence)
- * 
+ * cmyth_file_seek()
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Seek to a new position in the file based on the value of whence:
- *	SEEK_SET
+ *	WHENCE_SET
  *		The offset is set to offset bytes.
- *	SEEK_CUR
+ *	WHENCE_CUR
  *		The offset is set to the current position plus offset bytes.
- *	SEEK_END
+ *	WHENCE_END
  *		The offset is set to the size of the file minus offset bytes.
  *
  * Return Value:
@@ -468,23 +471,23 @@
  *
  * Failure: an int containing -errno
  */
-long long
-cmyth_file_seek(cmyth_file_t file, long long offset, int whence)
+int64_t
+cmyth_file_seek(cmyth_file_t file, int64_t offset, int8_t whence)
 {
 	char msg[128];
 	int err;
 	int count;
 	int64_t c;
-	long r;
-	long long ret;
+	int r;
+	int64_t ret;
 
 	if (file == NULL)
 		return -EINVAL;
 
-	if ((offset == 0) && (whence == SEEK_CUR))
+	if ((offset == 0) && (whence == WHENCE_CUR))
 		return file->file_pos;
 
-	if ((offset == file->file_pos) && (whence == SEEK_SET))
+	if ((offset == file->file_pos) && (whence == WHENCE_SET))
 		return file->file_pos;
 
 	pthread_mutex_lock(&mutex);
@@ -495,7 +498,7 @@
 		if(c > sizeof(msg))
 			c = sizeof(msg);
 
-		if ((ret = cmyth_file_get_block(file, msg, (unsigned long)c)) < 0)
+		if ((ret = cmyth_file_get_block(file, msg, (size_t)c)) < 0)
 			break;
 	}
 	if (ret < 0)
@@ -507,15 +510,15 @@
 		 * two 32 bit hi and lo integers.
 		 */
 		snprintf(msg, sizeof(msg),
-			 "QUERY_FILETRANSFER %ld[]:[]SEEK[]:[]%"PRIu64"[]:[]%d[]:[]%"PRIu64,
+			 "QUERY_FILETRANSFER %"PRIu32"[]:[]SEEK[]:[]%"PRId64"[]:[]%"PRId8"[]:[]%"PRId64,
 			 file->file_id,
-			 (int64_t)offset,
+			 offset,
 			 whence,
-			 (int64_t)file->file_pos);
+			 file->file_pos);
 	}
 	else {
 		snprintf(msg, sizeof(msg),
-			 "QUERY_FILETRANSFER %ld[]:[]SEEK[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%d",
+			 "QUERY_FILETRANSFER %"PRIu32"[]:[]SEEK[]:[]%"PRId32"[]:[]%"PRId32"[]:[]%"PRId8"[]:[]%"PRId32"[]:[]%"PRId32,
 			 file->file_id,
 			 (int32_t)(offset >> 32),
 			 (int32_t)(offset & 0xffffffff),
@@ -547,18 +550,7 @@
 		goto out;
 	}
 
-	switch (whence) {
-	case SEEK_SET:
-		file->file_pos = offset;
-		break;
-	case SEEK_CUR:
-		file->file_pos += offset;
-		break;
-	case SEEK_END:
-		file->file_pos = file->file_length - offset;
-		break;
-	}
-
+	file->file_pos = c;
 	file->file_req = file->file_pos;
 	if(file->file_pos > file->file_length)
 		file->file_length = file->file_pos;
@@ -567,112 +559,13 @@
 
     out:
 	pthread_mutex_unlock(&mutex);
-	
-	return ret;
-}
-
-long long
-cmyth_file_seek_unlocked(cmyth_file_t file, long long offset, int whence)
-{
-	char msg[128];
-	int err;
-	int count;
-	int64_t c;
-	long r;
-	long long ret;
-
-	if (file == NULL)
-		return -EINVAL;
 
-	if ((offset == 0) && (whence == SEEK_CUR))
-		return file->file_pos;
-
-	if ((offset == file->file_pos) && (whence == SEEK_SET))
-		return file->file_pos;
-
-	ret = 0;
-	while(file->file_pos < file->file_req) {
-		c = file->file_req - file->file_pos;
-		if(c > sizeof(msg))
-			c = sizeof(msg);
-
-		if ((ret = cmyth_file_get_block(file, msg, (unsigned long)c)) < 0)
-			break;
-	}
-	if (ret < 0)
-		goto out;
-
-	if (file->file_control->conn_version >= 66) {
-		/*
-		 * Since protocol 66 mythbackend expects to receive a single 64 bit integer rather than
-		 * two 32 bit hi and lo integers.
-		 */
-		snprintf(msg, sizeof(msg),
-			 "QUERY_FILETRANSFER %ld[]:[]SEEK[]:[]%"PRIu64"[]:[]%d[]:[]%"PRIu64,
-			 file->file_id,
-			 (int64_t)offset,
-			 whence,
-			 (int64_t)file->file_pos);
-	}
-	else {
-		snprintf(msg, sizeof(msg),
-			 "QUERY_FILETRANSFER %ld[]:[]SEEK[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%d",
-			 file->file_id,
-			 (int32_t)(offset >> 32),
-			 (int32_t)(offset & 0xffffffff),
-			 whence,
-			 (int32_t)(file->file_pos >> 32),
-			 (int32_t)(file->file_pos & 0xffffffff));
-	}
-
-	if ((err = cmyth_send_message(file->file_control, msg)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_send_message() failed (%d)\n",
-			  __FUNCTION__, err);
-		ret = err;
-		goto out;
-	}
-
-	if ((count=cmyth_rcv_length(file->file_control)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_rcv_length() failed (%d)\n",
-			  __FUNCTION__, count);
-		ret = count;
-		goto out;
-	}
-	if ((r=cmyth_rcv_int64(file->file_control, &err, &c, count)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_rcv_int64() failed (%d)\n",
-			  __FUNCTION__, r);
-		ret = err;
-		goto out;
-	}
-
-	switch (whence) {
-	case SEEK_SET:
-		file->file_pos = offset;
-		break;
-	case SEEK_CUR:
-		file->file_pos += offset;
-		break;
-	case SEEK_END:
-		file->file_pos = file->file_length - offset;
-		break;
-	}
-
-	file->file_req = file->file_pos;
-	if(file->file_pos > file->file_length)
-		file->file_length = file->file_pos;
-
-	ret = file->file_pos;
-
-    out:
 	return ret;
 }
 
 /*
- * cmyth_file_read(cmyth_file_t file, char *buf, unsigned long len)
- * 
+ * cmyth_file_read()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -685,10 +578,11 @@
  *
  * Failure: an int containing -errno
  */
-int cmyth_file_read(cmyth_file_t file, char *buf, unsigned long len)
+int32_t cmyth_file_read(cmyth_file_t file, char *buf, int32_t len)
 {
 	int err, count;
-	int ret, req, nfds, rec;
+	int32_t ret;
+	int req, nfds, rec;
 	char *end, *cur;
 	char msg[256];
 	int64_t len64;
@@ -703,6 +597,9 @@
 	if (len == 0)
 		return 0;
 
+	if(len > file->file_data->conn_tcp_rcvbuf)
+		len = file->file_data->conn_tcp_rcvbuf;
+
 	pthread_mutex_lock (&mutex);
 
 	/* make sure we have outstanding requests that fill the buffer that was called with */
@@ -710,8 +607,8 @@
 	if (file->file_req < file->file_pos + len) {
 
 		snprintf (msg, sizeof (msg),
-	            "QUERY_FILETRANSFER %ld[]:[]REQUEST_BLOCK[]:[]%ld",
-	            file->file_id, (unsigned long)(file->file_pos + len - file->file_req));
+	            "QUERY_FILETRANSFER %"PRIu32"[]:[]REQUEST_BLOCK[]:[]%"PRId32,
+	            file->file_id, (int32_t)(file->file_pos + len - file->file_req));
 
 		if ( (err = cmyth_send_message (file->file_control, msg) ) < 0) {
 			cmyth_dbg (CMYTH_DBG_ERROR,
@@ -779,33 +676,33 @@
 			 * signed 64bit value in http://svn.mythtv.org/trac/changeset/18011 (1-Aug-2008).
 			 *
 			 * libcmyth now retrieves the 64-bit signed value, does error-checking,
-			 * and then converts to a 32bit unsigned.
+			 * and then converts to a 32bit signed.
 			 *
 			 * This rcv_ method needs to be forced to use new_int64 to pull back a
 			 * single 64bit number otherwise the handling in rcv_int64 will revert to
 			 * the old two 32bit hi and lo long values.
 			 */
-			if ((ret=cmyth_rcv_new_int64 (file->file_control, &err, &len64, count, 1))< 0) {
+			if ((ret = cmyth_rcv_new_int64(file->file_control, &err, &len64, count, 1))< 0) {
 				cmyth_dbg (CMYTH_DBG_ERROR,
 				           "%s: cmyth_rcv_new_int64() failed (%d)\n",
 				           __FUNCTION__, ret);
 				ret = err;
 				goto out;
 			}
-			if (len64 >= 0x100000000LL || len64 < 0) {
+			if (len64 > 0x7fffffff || len64 < 0) {
 				/* -1 seems to be a common result, but isn't valid so use 0 instead. */
 				cmyth_dbg (CMYTH_DBG_WARN,
 				           "%s: cmyth_rcv_new_int64() returned out of bound value (%"PRId64"). Using 0 instead.\n",
 				           __FUNCTION__, len64);
 				len64 = 0;
 			}
-			len = (unsigned long)len64;
+			len = (int32_t)len64;
 			req = 0;
 			file->file_req += len;
 
 			if (file->file_req < file->file_pos) {
 				cmyth_dbg (CMYTH_DBG_ERROR,
-				           "%s: received invalid invalid length, read position is ahead of request (req: %"PRIu64", pos: %"PRIu64", len: %"PRId64")\n",
+				           "%s: received invalid invalid length, read position is ahead of request (req: %"PRId64", pos: %"PRId64", len: %"PRId64")\n",
 				           __FUNCTION__, file->file_req, file->file_pos, len64);
 				ret = -1;
 				goto out;
@@ -829,7 +726,7 @@
 				ret = -1;
 				goto out;
 			}
-			if ((ret = recv (file->file_data->conn_fd, cur, (int)(end-cur), 0)) < 0) {
+			if ((ret = recv (file->file_data->conn_fd, cur, (int32_t)(end - cur), 0)) < 0) {
 				cmyth_dbg (CMYTH_DBG_ERROR,
 				           "%s: recv() failed (%d)\n",
 				           __FUNCTION__, ret);
@@ -846,14 +743,14 @@
 	if (file->file_pos > file->file_length)
 		file->file_length = file->file_pos;
 
-	ret = (int)(cur - buf);
+	ret = (int32_t)(cur - buf);
 out:
 	pthread_mutex_unlock (&mutex);
 	return ret;
 }
 
 /*
- * cmyth_file_is_open(cmyth_file_t file)
+ * cmyth_file_is_open()
  *
  * Scope: PUBLIC
  *
@@ -872,19 +769,21 @@
 int cmyth_file_is_open(cmyth_file_t file)
 {
 	int err, count, ret;
-	long status;
+	uint8_t status;
 	char msg[256];
 
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
 
 	if (!file || !file->file_control) {
-		cmyth_dbg (CMYTH_DBG_ERROR, "%s: no connection\n",
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
 		           __FUNCTION__);
 		return -EINVAL;
 	}
 
+	pthread_mutex_lock (&mutex);
+
 	snprintf (msg, sizeof (msg),
-	    "QUERY_FILETRANSFER %ld[]:[]IS_OPEN",
+	    "QUERY_FILETRANSFER %"PRIu32"[]:[]IS_OPEN",
 	    file->file_id);
 
 	if ( (err = cmyth_send_message (file->file_control, msg) ) < 0) {
@@ -894,14 +793,14 @@
 		ret = err;
 		goto out;
 	}
-	if ((count=cmyth_rcv_length (file->file_control)) < 0) {
+	if ((count = cmyth_rcv_length (file->file_control)) < 0) {
 		cmyth_dbg (CMYTH_DBG_ERROR,
 			    "%s: cmyth_rcv_length() failed (%d)\n",
 			    __FUNCTION__, count);
 		ret = count;
 		goto out;
 	}
-	if ((ret=cmyth_rcv_long (file->file_control, &err, &status, count))< 0) {
+	if ((ret = cmyth_rcv_uint8 (file->file_control, &err, &status, count))< 0) {
 		cmyth_dbg (CMYTH_DBG_ERROR,
 			    "%s: cmyth_rcv_long() failed (%d)\n",
 			    __FUNCTION__, ret);
@@ -909,15 +808,16 @@
 		goto out;
 	}
 
-	ret = (int)status;
-	if (ret==0)
+	ret = status;
+	if (ret == 0)
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: file transfer socket is closed\n", __FUNCTION__);
 out:
+	pthread_mutex_unlock (&mutex);
 	return ret;
 }
 
 /*
- * cmyth_file_set_timeout(cmyth_file_t file, int fast)
+ * cmyth_file_set_timeout()
  *
  * Scope: PUBLIC
  *
@@ -934,7 +834,7 @@
  * Failure: an int containing -errno
  */
 int
-cmyth_file_set_timeout(cmyth_file_t file, int fast)
+cmyth_file_set_timeout(cmyth_file_t file, int32_t fast)
 {
 	int ret;
 	char msg[256];
@@ -945,8 +845,10 @@
 		return -EINVAL;
 	}
 
+	pthread_mutex_lock (&mutex);
+
 	snprintf(msg, sizeof(msg),
-		 "QUERY_FILETRANSFER %ld[]:[]SET_TIMEOUT[]:[]%i",
+		 "QUERY_FILETRANSFER %"PRIu32"[]:[]SET_TIMEOUT[]:[]%"PRId32,
 		 file->file_id, fast);
 	if ((ret = cmyth_send_message(file->file_control, msg)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -964,6 +866,7 @@
 	ret = 0;
 
 out:
+	pthread_mutex_unlock (&mutex);
 	return ret;
 }
 
@@ -1060,9 +963,9 @@
   )
 {
   int i;
-  
+
   _doserrno = oserrno;        /* set _doserrno */
-  
+
   /* check the table for the OS error code */
   for (i = 0; i < ERRTABLESIZE; ++i) {
     if (oserrno == errtable[i].oscode) {
@@ -1070,11 +973,11 @@
       return;
     }
   }
-  
+
   /* The error code wasn't in the table.  We check for a range of */
   /* EACCES errors or exec failure errors (ENOEXEC).  Otherwise   */
   /* EINVAL is returned.                                          */
-  
+
   if (oserrno >= MIN_EACCES_RANGE && oserrno <= MAX_EACCES_RANGE)
     errno = EACCES;
   else if (oserrno >= MIN_EXEC_ERROR && oserrno <= MAX_EXEC_ERROR)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/freespace.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/freespace.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/freespace.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/freespace.c	2013-03-12 10:51:22.000000000 +0000
@@ -24,8 +24,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_freespace_create(void)
- * 
+ * cmyth_freespace_create()
+ *
  * Scope: PUBLIC
  *
  * Description
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/input.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/input.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/input.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/input.c	2013-03-12 10:51:22.000000000 +0000
@@ -100,7 +100,7 @@
 cmyth_inputlist_t
 cmyth_get_free_inputlist(cmyth_recorder_t rec)
 {
-	unsigned int len = CMYTH_LONGLONG_LEN + 36;
+	unsigned int len = CMYTH_INT64_LEN + 36;
 	int err;
 	int count;
 	char *buf;
@@ -113,7 +113,7 @@
 		return inputlist;
 	}
 
-	sprintf(buf,"QUERY_RECORDER %d[]:[]GET_FREE_INPUTS", rec->rec_id);
+	sprintf(buf,"QUERY_RECORDER %"PRIu32"[]:[]GET_FREE_INPUTS", rec->rec_id);
 	pthread_mutex_lock(&mutex);
 	if ((err = cmyth_send_message(rec->rec_conn, buf)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -148,13 +148,8 @@
 	int consumed;
 	int total = 0;
 	char *failed = NULL;
-	cmyth_input_t input;
-	char inputname[100];
-	unsigned long sourceid;
-	unsigned long inputid;
-	unsigned long cardid;
-	unsigned long multiplexid;
-	unsigned long livetvorder;
+	cmyth_input_t input = NULL;
+	char tmp_str[255];
 
 	if (count <= 0) {
 		*err = EINVAL;
@@ -162,65 +157,58 @@
 	}
 
 	while (count) {
-		consumed = cmyth_rcv_string(conn, err, inputname, sizeof(inputname)-1, count);
-		inputname[sizeof(inputname)-1] = 0;
+		input = cmyth_input_create();
+		consumed = cmyth_rcv_string(conn, err, tmp_str, sizeof(tmp_str), count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_string";
+			failed = "cmyth_rcv_string() inputname";
 			goto fail;
 		}
+		input->inputname = ref_strdup(tmp_str);
 
-		consumed = cmyth_rcv_ulong(conn, err, &sourceid, count);
+		consumed = cmyth_rcv_uint32(conn, err, &input->sourceid, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ulong() sourceid";
 			goto fail;
 		}
 
-		consumed = cmyth_rcv_ulong(conn, err, &inputid, count);
+		consumed = cmyth_rcv_uint32(conn, err, &input->inputid, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ulong() inputid";
 			goto fail;
 		}
 
-		consumed = cmyth_rcv_ulong(conn, err, &cardid, count);
+		consumed = cmyth_rcv_uint32(conn, err, &input->cardid, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ulong() cardid";
 			goto fail;
 		}
 
-		consumed = cmyth_rcv_ulong(conn, err, &multiplexid, count);
+		consumed = cmyth_rcv_uint32(conn, err, &input->multiplexid , count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ulong() multiplexid";
 			goto fail;
 		}
 
 		if (conn->conn_version >= 71) {
-			consumed = cmyth_rcv_ulong(conn, err, &livetvorder, count);
+			consumed = cmyth_rcv_uint32(conn, err, &input->livetvorder, count);
 			count -= consumed;
 			total += consumed;
 			if (*err) {
-				failed = "cmyth_rcv_ulong";
+				failed = "cmyth_rcv_ulong() livetvorder";
 				goto fail;
 			}
 		}
 
-		input = cmyth_input_create();
-		input->inputname = ref_strdup(inputname);
-		input->sourceid = sourceid;
-		input->inputid = inputid;
-		input->cardid = cardid;
-		input->multiplexid = multiplexid;
-		input->livetvorder = livetvorder;
-
 		inputlist->input_list = realloc(inputlist->input_list,
 					(++inputlist->input_count) * sizeof(cmyth_input_t));
 		inputlist->input_list[inputlist->input_count - 1] = input;
@@ -229,7 +217,8 @@
 	return total;
 
 	fail:
-	cmyth_dbg(CMYTH_DBG_ERROR, "%s: %s() failed (%d)\n",
+	ref_release(input);
+	cmyth_dbg(CMYTH_DBG_ERROR, "%s: %s failed (%d)\n",
 		__FUNCTION__, failed, *err);
 	return total;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/keyframe.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/keyframe.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/keyframe.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/keyframe.c	2013-03-12 10:51:22.000000000 +0000
@@ -28,8 +28,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_keyframe_create(void)
- * 
+ * cmyth_keyframe_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -59,40 +59,8 @@
 }
 
 /*
- * cmyth_keyframe_fill(cmyth_keyframe_t kf,
- * 	               unsigned long keynum,
- *                     unsigned long long pos)
- * 
- * Scope: PUBLIC
- *
- * Description
- *
- * Fill out the contents of the recorder number structure 'rn' using
- * the values 'keynum' and 'pos'.
+ * cmyth_keyframe_string()
  *
- * Return Value:
- *
- * Success: 0
- *
- * Failure: -(ERRNO)
- */
-cmyth_keyframe_t
-cmyth_keyframe_fill(unsigned long keynum, unsigned long long pos)
-{
-	cmyth_keyframe_t ret = cmyth_keyframe_create();
-
-	if (!ret) {
-		return NULL;
-	}
-
-	ret->keyframe_number = keynum;
-	ret->keyframe_pos = pos;
-	return ret;
-}
-
-/*
- * cmyth_keyframe_string(cmyth_keyframe_t kf)
- * 
  * Scope: PUBLIC
  *
  * Description
@@ -117,9 +85,9 @@
 	if (!kf) {
 		return NULL;
 	}
-	sprintf(pos, "%lld", (long long)kf->keyframe_pos);
+	sprintf(pos, "%"PRId64, kf->keyframe_pos);
 	len += strlen(pos);
-	sprintf(key, "%ld", kf->keyframe_number);
+	sprintf(key, "%"PRIu32, kf->keyframe_number);
 	len += strlen(key);
 	ret = malloc(len * sizeof(char));
 	if (!ret) {
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/livetv.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/livetv.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/livetv.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/livetv.c	2013-03-12 10:51:22.000000000 +0000
@@ -31,8 +31,6 @@
 #include <sys/types.h>
 #include <cmyth_local.h>
 
-#define LAST 0x7FFFFFFF
-
 static int cmyth_livetv_chain_has_url(cmyth_recorder_t rec, char * url);
 static int cmyth_livetv_chain_add_file(cmyth_recorder_t rec,
                                        char * url, cmyth_file_t fp);
@@ -42,8 +40,8 @@
 
 
 /*
- * cmyth_livetv_chain_destroy(cmyth_livetv_chain_t ltc)
- * 
+ * cmyth_livetv_chain_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -91,8 +89,8 @@
 }
 
 /*
- * cmyth_livetv_chain_create(void)
- * 
+ * cmyth_livetv_chain_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -122,7 +120,7 @@
 	ret->chain_urls = NULL;
 	ret->chain_files = NULL;
 	ret->progs = NULL;
-	ret->livetv_watch = 0; /* JLB: Manage program breaks. Set to 1 on chain setup */
+	ret->livetv_watch = 0; /* JLB: Manage program breaks */
 	ret->livetv_tcp_rcvbuf = 0;
 	ret->livetv_block_len = 0;
 	ref_set_destroy(ret, (ref_destroy_t)cmyth_livetv_chain_destroy);
@@ -134,8 +132,8 @@
 	URL isn't there.
 */
 /*
- * cmyth_livetv_chain_has_url(void)
- * 
+ * cmyth_livetv_chain_has_url()
+ *
  * Scope: PRIVATE
  *
  * Description
@@ -155,7 +153,7 @@
 	int found, i;
 	found = 0;
 	if(rec->rec_livetv_chain) {
-		if(rec->rec_livetv_chain->chain_current != -1) {
+		if(rec->rec_livetv_chain->chain_ct > 0) {
 			for(i=0;i<rec->rec_livetv_chain->chain_ct; i++) {
 				if(strcmp(rec->rec_livetv_chain->chain_urls[i],url) == 0) {
 					found = 1;
@@ -184,9 +182,8 @@
 #endif
 
 /*
- * cmyth_livetv_chain_add_file(cmyth_recorder_t rec, char * url,
- *                             cmyth_file_t fp)
- * 
+ * cmyth_livetv_chain_add_file()
+ *
  * Scope: PRIVATE
  *
  * Description
@@ -209,7 +206,7 @@
 	cmyth_file_t tmp;
 
 	if(rec->rec_livetv_chain) {
-		if(rec->rec_livetv_chain->chain_current != -1) {
+		if(rec->rec_livetv_chain->chain_ct > 0) {
 			/* Is this file already in the chain? */
 			if((cur = cmyth_livetv_chain_has_url(rec, url)) != -1) {
 				/* Release the existing handle after holding the new */
@@ -236,9 +233,8 @@
 }
 
 /*
- * cmyth_livetv_chain_add_prog(cmyth_recorder_t rec, char * url,
- *                             cmyth_proginfo_t prog)
- * 
+ * cmyth_livetv_chain_add_prog()
+ *
  * Scope: PRIVATE
  *
  * Description
@@ -262,7 +258,7 @@
 	cmyth_proginfo_t tmp;
 
 	if(rec->rec_livetv_chain) {
-		if(rec->rec_livetv_chain->chain_current != -1) {
+		if(rec->rec_livetv_chain->chain_ct > 0) {
 			/* Is this file already in the chain? */
 			if((cur = cmyth_livetv_chain_has_url(rec, url)) != -1) {
 				/* Release the existing handle after holding the new */
@@ -289,8 +285,8 @@
 }
 
 /*
- * cmyth_livetv_chain_add_url(cmyth_recorder_t rec, char * url)
- * 
+ * cmyth_livetv_chain_add_url()
+ *
  * Scope: PRIVATE
  *
  * Description
@@ -313,9 +309,8 @@
 	int ret = 0;
 
 	if(cmyth_livetv_chain_has_url(rec,url) == -1) {
-		if(rec->rec_livetv_chain->chain_current == -1) {
+		if(rec->rec_livetv_chain->chain_ct == 0) {
 			rec->rec_livetv_chain->chain_ct = 1;
-			rec->rec_livetv_chain->chain_current = 0;
 			/* Nothing in the chain yet, allocate the space */
 			tmp = (char**)ref_alloc(sizeof(char *));
 			fp = (cmyth_file_t *)ref_alloc(sizeof(cmyth_file_t));
@@ -358,8 +353,8 @@
 }
 
 /*
- * cmyth_livetv_chain_add(cmyth_recorder_t rec, char * url, cmyth_file_t ft)
- * 
+ * cmyth_livetv_chain_add()
+ *
  * Scope: PRIVATE
  *
  * Description
@@ -391,8 +386,8 @@
 }
 
 /*
- * cmyth_livetv_chain_update(cmyth_recorder_t rec, char * chainid, int buff)
- * 
+ * cmyth_livetv_chain_update()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -413,45 +408,32 @@
 {
 	int ret;
 	char url[1024];
-	cmyth_proginfo_t loc_prog;
+	cmyth_proginfo_t loc_prog = NULL;
 	cmyth_file_t ft = NULL;
 
 	ret = 0;
 
-  if (!rec) {
+	if (!rec) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: rec is NULL\n", __FUNCTION__);
 		return -1;
 	}
 
-	/* JLB: Manage program break
-	 * Skip chain update, it will doing later
-	 */
 	if (!rec->rec_livetv_chain) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: rec_livetv_chain is NULL\n",
 			  __FUNCTION__, url);
 		return -1;
 	}
-	else {
-		if (rec->rec_livetv_chain->livetv_watch != 1) {
-			cmyth_dbg(CMYTH_DBG_DEBUG,
-				  "%s: the next program is awaited: skip chain update\n",
-				  __FUNCTION__);
-			return 0;
-		}
-	}
-
-	loc_prog = cmyth_recorder_get_cur_proginfo(rec);
-	if (!loc_prog) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: recorder is not recording\n",
-			  __FUNCTION__);
-		return -1;
-	}
-
-	pthread_mutex_lock(&mutex);
 
 	if (strncmp(rec->rec_livetv_chain->chainid, chainid, strlen(chainid)) == 0) {
+		loc_prog = cmyth_recorder_get_cur_proginfo(rec);
+		if (!loc_prog) {
+			cmyth_dbg(CMYTH_DBG_ERROR,
+				  "%s: recorder is not recording\n",
+				  __FUNCTION__);
+			ret = -1;
+			goto out;
+		}
 		sprintf(url, "myth://%s:%d%s", loc_prog->proginfo_hostname, rec->rec_port,
 				loc_prog->proginfo_pathname);
 
@@ -483,10 +465,18 @@
 					ret = -1;
 					goto out;
 				}
-				if (rec->rec_livetv_chain->chain_switch_on_create) {
-					cmyth_livetv_chain_switch(rec, LAST);
+				/*
+				 * New program is inserted. Switch OFF watch signal and
+				 * switch to the new file when required.
+				 */
+				rec->rec_livetv_chain->livetv_watch = 0;
+				if (rec->rec_livetv_chain->chain_switch_on_create
+					&& cmyth_livetv_chain_switch_last(rec) == 1) {
 					rec->rec_livetv_chain->chain_switch_on_create = 0;
 				}
+				cmyth_dbg(CMYTH_DBG_INFO,
+					  "%s: chain count is %d\n",
+					  __FUNCTION__, rec->rec_livetv_chain->chain_ct);
 			}
 			else {
 				ret = -1;
@@ -501,7 +491,6 @@
 	}
 
 out:
-	pthread_mutex_unlock(&mutex);
 	ref_release(ft);
 	ref_release(loc_prog);
 
@@ -509,7 +498,7 @@
 }
 
 /* JLB: Manage program breaks
- * cmyth_livetv_watch(cmyth_recorder_t rec, char * msg)
+ * cmyth_livetv_watch()
  *
  * Scope: PUBLIC
  *
@@ -535,8 +524,8 @@
 int
 cmyth_livetv_watch(cmyth_recorder_t rec, char * msg)
 {
-	int rec_id;
-	int watch;
+	uint32_t rec_id;
+	int flag;
 	int ret;
 
 	ret = 0;
@@ -546,20 +535,18 @@
 		return -1;
 	}
 	/*
-	 * Parse msg. Should be %d %d
+	 * Parse msg. Should be %ld %d
 	 */
-	if (strlen(msg)>=3 && sscanf(msg,"%d %d", &rec_id, &watch) == 2) {
+	if (strlen(msg) >= 3 && sscanf(msg,"%"PRIu32" %d", &rec_id, &flag) == 2) {
 		if (rec_id == rec->rec_id) {
-			pthread_mutex_lock(&mutex);
-			rec->rec_livetv_chain->livetv_watch = watch;
-			pthread_mutex_unlock(&mutex);
+			rec->rec_livetv_chain->livetv_watch = 1;
 			cmyth_dbg(CMYTH_DBG_DEBUG,
-				  "%s: recorder watch: %d\n",
-				  __FUNCTION__, watch);
+				  "%s: wait event for recorder: %"PRIu32"\n",
+				  __FUNCTION__, rec_id);
 		}
 		else {
 			cmyth_dbg(CMYTH_DBG_DEBUG,
-				  "%s: nothing to trigger for recorder: %d",
+				  "%s: nothing to trigger for recorder: %"PRIu32"\n",
 				  __FUNCTION__, rec_id);
 		}
 	}
@@ -574,7 +561,7 @@
 }
 
 /* JLB: Manage program breaks
- * cmyth_livetv_done_recording(cmyth_recorder_t rec, char * msg)
+ * cmyth_livetv_done_recording()
  *
  * Scope: PUBLIC
  *
@@ -582,9 +569,9 @@
  *
  * Indicates that an active recording has completed on the specified
  * recorder. used to manage program breaks while watching live tv.
- * When receive event for recorder, we switch on watch signal and
- * force an update of livetv chain to get current program info.
- * Watch signal is used when down, to mark the break period and
+ * When receive event for recorder, we force an update of livetv chain
+ * to get current program info when chain is not yet updated.
+ * Watch signal is used when up, to mark the break period and
  * queuing the frontend for reading file buffer.
  *
  * Return Value:
@@ -596,7 +583,8 @@
 int
 cmyth_livetv_done_recording(cmyth_recorder_t rec, char * msg)
 {
-	int ret, rec_id;
+	uint32_t rec_id;
+	int ret;
 
 	ret = 0;
 
@@ -605,36 +593,42 @@
 		return -1;
 	}
 	/*
-	 * Parse msg. Should be %d ...
+	 * Parse msg. Should be 'recordid ...'
 	 */
-	if (strlen(msg) >= 1 && sscanf(msg,"%d", &rec_id) == 1) {
+	if (strlen(msg) >= 1 && sscanf(msg,"%"PRIu32, &rec_id) == 1) {
 		if (rec_id == rec->rec_id
-			&& rec->rec_livetv_chain->livetv_watch != 1
-			&& cmyth_recorder_is_recording(rec) == 1)
-		{
+			&& rec->rec_livetv_chain->livetv_watch == 1
+			&& cmyth_recorder_is_recording(rec) == 1) {
 			/*
-			 * Last recording is now completed. Then switch ON watch status
-			 * and force live tv chain update for the new current program.
+			 * Last recording is now completed but watch signal is ON.
+			 * Then force live tv chain update for the new current
+			 * program. We will retry 3 times before returning.
 			 */
-			pthread_mutex_lock(&mutex);
-			rec->rec_livetv_chain->livetv_watch = 1;
-			pthread_mutex_unlock(&mutex);
 			cmyth_dbg(CMYTH_DBG_DEBUG,
 				  "%s: previous recording done. Start chain update\n",
 				  __FUNCTION__);
-			if (rec->rec_livetv_chain->chainid) {
-				cmyth_livetv_chain_update(rec, rec->rec_livetv_chain->chainid);
+			ret = -1;
+			if (rec->rec_livetv_chain->chainid && rec->rec_livetv_chain->chain_ct > 0) {
+				int i;
+				for (i = 0; i < 3; i++) {
+					if (cmyth_livetv_chain_update(rec, rec->rec_livetv_chain->chainid) < 0)
+						break;
+					if (rec->rec_livetv_chain->livetv_watch == 0) {
+						ret = 0;
+						break;
+					}
+					usleep(100000);
+				}
 			}
 			else {
 				cmyth_dbg(CMYTH_DBG_ERROR,
-					  "%s: chainid is null for recorder %d\n",
+					  "%s: chainid is null for recorder %"PRIu32"\n",
 					  __FUNCTION__, rec_id);
-				ret = -1;
 			}
 		}
 		else {
 			cmyth_dbg(CMYTH_DBG_DEBUG,
-				  "%s: nothing to trigger for recorder: %d",
+				  "%s: nothing to trigger for recorder: %"PRIu32"\n",
 				  __FUNCTION__, rec_id);
 		}
 	}
@@ -649,8 +643,8 @@
 }
 
 /*
- * cmyth_livetv_chain_setup(cmyth_recorder_t old_rec)
- * 
+ * cmyth_livetv_chain_setup()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -669,13 +663,12 @@
  *					caller needs to do this on a failure.
  */
 cmyth_recorder_t
-cmyth_livetv_chain_setup(cmyth_recorder_t rec, int tcp_rcvbuf,
+cmyth_livetv_chain_setup(cmyth_recorder_t rec, int32_t tcp_rcvbuf,
 			 void (*prog_update_callback)(cmyth_proginfo_t))
 {
 
 	cmyth_recorder_t new_rec = NULL;
 	char url[1024];
-	cmyth_conn_t control;
 	cmyth_proginfo_t loc_prog;
 	cmyth_file_t ft = NULL;
 
@@ -685,7 +678,6 @@
 		return NULL;
 	}
 
-	control = rec->rec_conn;
 	/* Get the current recording information */
 	loc_prog = cmyth_recorder_get_cur_proginfo(rec);
 
@@ -695,8 +687,6 @@
 		goto out;
 	}
 
-	pthread_mutex_lock(&mutex);
-
 	new_rec = cmyth_recorder_dup(rec);
 	if (new_rec == NULL) {
 		cmyth_dbg(CMYTH_DBG_DEBUG, "%s: cannot create recorder\n",
@@ -714,8 +704,8 @@
 
 	/* JLB: Set tcp receive buffer for the chain files */
 	new_rec->rec_livetv_chain->livetv_tcp_rcvbuf = tcp_rcvbuf;
-	/* JLB: Manage program breaks. Switch ON watch signal */
-	new_rec->rec_livetv_chain->livetv_watch = 1;
+	/* JLB: Manage program breaks. Switch OFF watch signal */
+	new_rec->rec_livetv_chain->livetv_watch = 0;
 
 	new_rec->rec_livetv_chain->prog_update_callback = prog_update_callback;
 
@@ -760,7 +750,6 @@
 	}
 
     out:
-	pthread_mutex_unlock(&mutex);
 	ref_release(ft);
 	ref_release(loc_prog);
 
@@ -768,19 +757,22 @@
 }
 
 /*
- * cmyth_livetv_chain_get_block(cmyth_recorder_t rec, char *buf,
- *															unsigned long len)
+ * cmyth_livetv_chain_get_block()
+ *
  * Scope: PUBLIC
+ *
  * Description
+ *
  * Read incoming file data off the network into a buffer of length len.
  *
  * Return Value:
+ *
  * Sucess: number of bytes read into buf
- * Failure: -1
+ *
+ * Failure: an int containing -errno
  */
-int
-cmyth_livetv_chain_get_block(cmyth_recorder_t rec, char *buf,
-															unsigned long len)
+int32_t
+cmyth_livetv_chain_get_block(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	if (!rec) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
@@ -805,8 +797,8 @@
 
 
 /*
- * cmyth_livetv_chain_switch(cmyth_recorder_t rec, int dir)
- * 
+ * cmyth_livetv_chain_switch()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -825,13 +817,12 @@
 {
 	int ret, i;
 
-	ret = 0;
+	if (dir == 0)
+		return 1;
 
-	if(dir == LAST) {
-		dir = rec->rec_livetv_chain->chain_ct
-				- rec->rec_livetv_chain->chain_current - 1;
-		ret = 1;
-	}
+	pthread_mutex_lock(&mutex);
+
+	ret = 0;
 
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: switch file: current=%d , dir=%d\n",
 		  __FUNCTION__, rec->rec_livetv_chain->chain_current, dir);
@@ -842,25 +833,26 @@
 			  "%s: no more file\n",
 			  __FUNCTION__);
 		/* JLB: Manage program breaks
-		 * If livetv_watch is down then we are waiting next chain update and adding a new file.
+		 * If livetv_watch is ON then we are waiting next chain update and adding a new file.
 		 * Timeout is 2 secondes before release.
 		 */
-		if (rec->rec_livetv_chain->livetv_watch != 1) {
+		if (rec->rec_livetv_chain->livetv_watch != 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
-				  "%s: wait until livetv_watch is up\n",
+				  "%s: wait until livetv_watch is OFF\n",
 				  __FUNCTION__);
 			for (i = 0; i < 4; i++) {
 				pthread_mutex_unlock(&mutex);
 				usleep(500000);
 				pthread_mutex_lock(&mutex);
-				if (rec->rec_livetv_chain->livetv_watch == 1)
+				if (rec->rec_livetv_chain->livetv_watch == 0)
 					break;
 			}
-			if (rec->rec_livetv_chain->livetv_watch != 1) {
+			if (rec->rec_livetv_chain->livetv_watch != 0) {
 				/* The chain is not updated yet
 				 * Return to retry later
 				 */
-				return 0;
+				ret = 0;
+				goto out;
 			}
 		}
 	}
@@ -879,46 +871,30 @@
 		ret = 1;
 	}
 
+	out:
+
+	pthread_mutex_unlock(&mutex);
+
 	return ret;
 }
 
-/* for calls from other modules where the mutex isn't set */
 int
 cmyth_livetv_chain_switch_last(cmyth_recorder_t rec)
 {
 	int dir;
 
-	if (!rec) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: invalid args rec = %p\n",
-			  __FUNCTION__, rec);
-		return 0;
-	}
-
-	if (!rec->rec_conn) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: invalid args rec->rec_conn = %p\n",
-			  __FUNCTION__, rec->rec_conn);
-		return 0;
-	}
-
 	if(rec->rec_conn->conn_version < 26)
 		return 1;
 
-	pthread_mutex_lock(&mutex);
 	dir = rec->rec_livetv_chain->chain_ct
 			- rec->rec_livetv_chain->chain_current - 1;
-	if(dir != 0) {
-		cmyth_livetv_chain_switch(rec, dir);
-	}
-	else {
-		rec->rec_livetv_chain->chain_switch_on_create=1;
-	}
-	pthread_mutex_unlock(&mutex);
-	return 1;
+
+	return cmyth_livetv_chain_switch(rec, dir);
 }
 
 /*
- * cmyth_livetv_chain_request_block(cmyth_recorder_t file, unsigned long len)
- * 
+ * cmyth_livetv_chain_request_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -932,8 +908,8 @@
  *
  * Failure: an int containing -errno
  */
-static int
-cmyth_livetv_chain_request_block(cmyth_recorder_t rec, unsigned long len)
+static int32_t
+cmyth_livetv_chain_request_block(cmyth_recorder_t rec, int32_t len)
 {
 	int ret, retry;
 
@@ -946,8 +922,6 @@
 		return -EINVAL;
 	}
 
-	pthread_mutex_lock(&mutex);
-
 	do {
 		retry = 0;
 		ret = cmyth_file_request_block(rec->rec_livetv_file, len);
@@ -958,18 +932,16 @@
 	}
 	while (retry);
 
-	pthread_mutex_unlock(&mutex);
-
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s [%s:%d]: (trace) }\n",
 				__FUNCTION__, __FILE__, __LINE__);
 
 	return ret;
 }
 
-int cmyth_livetv_chain_read(cmyth_recorder_t rec, char *buf, unsigned long len)
+int32_t cmyth_livetv_chain_read(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	int ret, retry;
-	unsigned long vlen, rlen, nlen;
+	int32_t vlen, rlen, nlen;
 
 	if (rec == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
@@ -998,18 +970,17 @@
 		if (ret < 0) {
 			break;
 		}
-		nlen = (unsigned long)ret;
+		nlen = ret;
 		if (nlen == 0) {
 			/* eof, switch to next file */
-			pthread_mutex_lock(&mutex);
 			retry = cmyth_livetv_chain_switch(rec, 1);
-			pthread_mutex_unlock(&mutex);
-
 			if (retry == 1) {
+				/* Already requested ? seek to 0 */
+				cmyth_file_seek(rec->rec_livetv_file, 0, WHENCE_SET);
 				/* Chain switch done. Retry without limit */
 				vlen = 0;
 			}
-			else if (rec->rec_livetv_chain->livetv_watch == 1) {
+			else if (rec->rec_livetv_chain->livetv_watch == 0) {
 				/*
 				 * Current buffer is empty on the last file.
 				 * We are waiting some time refilling buffer
@@ -1043,7 +1014,7 @@
 }
 
 /*
- * cmyth_livetv_chain_duration(cmyth_recorder_t file)
+ * cmyth_livetv_chain_duration()
  *
  * Scope: PUBLIC
  *
@@ -1058,11 +1029,11 @@
  * Failure: an int containing -errno
  */
 
-long long
+int64_t
 cmyth_livetv_chain_duration(cmyth_recorder_t rec)
 {
   int cur, ct;
-  long long ret=0;
+  int64_t ret=0;
   ct  = rec->rec_livetv_chain->chain_ct;
   for (cur = 0; cur < ct; cur++) {
 			ret += rec->rec_livetv_chain->chain_files[cur]->file_length;
@@ -1071,18 +1042,18 @@
 }
 
 /*
- * cmyth_livetv_chain_seek(cmyth_recorder_t file, long long offset, int whence)
- * 
+ * cmyth_livetv_chain_seek()
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Seek to a new position in the file based on the value of whence:
- *	SEEK_SET
+ *	WHENCE_SET
  *		The offset is set to offset bytes.
- *	SEEK_CUR
+ *	WHENCE_CUR
  *		The offset is set to the current position plus offset bytes.
- *	SEEK_END
+ *	WHENCE_END
  *		The offset is set to the size of the file minus offset bytes.
  *
  * Return Value:
@@ -1091,10 +1062,10 @@
  *
  * Failure: an int containing -errno
  */
-static long long
-cmyth_livetv_chain_seek(cmyth_recorder_t rec, long long offset, int whence)
+static int64_t
+cmyth_livetv_chain_seek(cmyth_recorder_t rec, int64_t offset, int8_t whence)
 {
-	long long ret;
+	int64_t ret;
 	cmyth_file_t fp;
 	int cur, ct;
 
@@ -1105,85 +1076,84 @@
 	cur = -1;
 	ct  = rec->rec_livetv_chain->chain_ct;
 
-	if (whence == SEEK_END) {
-
-		offset -= rec->rec_livetv_file->file_req;
+	if (whence == WHENCE_END) {
+		offset = - rec->rec_livetv_file->file_req - offset;
 		for (cur = rec->rec_livetv_chain->chain_current; cur < ct; cur++) {
 			offset += rec->rec_livetv_chain->chain_files[cur]->file_length;
 		}
 
 		cur = rec->rec_livetv_chain->chain_current;
 		fp  = rec->rec_livetv_chain->chain_files[cur];
-		whence = SEEK_CUR;
+		whence = WHENCE_CUR;
 	}
 
-	if (whence == SEEK_SET) {
-
+	if (whence == WHENCE_SET) {
 		for (cur = 0; cur < ct; cur++) {
     			fp = rec->rec_livetv_chain->chain_files[cur];
-			if (offset < (long long)fp->file_length)
+			if (offset < fp->file_length)
 				break;
 			offset -= fp->file_length;
 		}
 	}
 
-	if (whence == SEEK_CUR) {
+	if (whence == WHENCE_CUR) {
 
-	if (offset == 0) {
-		cur     = rec->rec_livetv_chain->chain_current;
-		offset += rec->rec_livetv_chain->chain_files[cur]->file_req;
-		for (; cur > 0; cur--) {
-			offset += rec->rec_livetv_chain->chain_files[cur-1]->file_length;
+		if (offset == 0) {
+			cur     = rec->rec_livetv_chain->chain_current;
+			offset += rec->rec_livetv_chain->chain_files[cur]->file_req;
+			for (; cur > 0; cur--) {
+				offset += rec->rec_livetv_chain->chain_files[cur-1]->file_length;
+			}
+			return offset;
+		} else {
+			cur = rec->rec_livetv_chain->chain_current;
+			fp  = rec->rec_livetv_chain->chain_files[cur];
 		}
-		return offset;
-	} else {
-		cur = rec->rec_livetv_chain->chain_current;
-		fp  = rec->rec_livetv_chain->chain_files[cur];
-	}
 
-	offset += fp->file_req;
+		offset += fp->file_req;
 
-	while (offset > (long long)fp->file_length) {
-		cur++;
-		offset -= fp->file_length;
-		if(cur == ct)
-			return -1;
-		fp = rec->rec_livetv_chain->chain_files[cur];
-	}
-
-	while (offset < 0) {
-		cur--;
-		if(cur < 0)
-			return -1;
-		fp = rec->rec_livetv_chain->chain_files[cur];
-		offset += fp->file_length;
-	}
+		while (offset > fp->file_length) {
+			cur++;
+			offset -= fp->file_length;
+			if(cur == ct)
+				return -1;
+			fp = rec->rec_livetv_chain->chain_files[cur];
+		}
+
+		while (offset < 0) {
+			cur--;
+			if(cur < 0)
+				return -1;
+			fp = rec->rec_livetv_chain->chain_files[cur];
+			offset += fp->file_length;
+		}
 
-	offset -= fp->file_req;
-  }
+		whence = WHENCE_SET;
+	}
 
 	if (fp && cur >=0)
 	{
-		pthread_mutex_lock(&mutex);
-		
-		ret = cmyth_file_seek_unlocked(fp, offset, whence);
-
-		if (ret >= 0 ) {
+		if ((ret = cmyth_file_seek(fp, offset, whence)) >= 0) {
 			cur -= rec->rec_livetv_chain->chain_current;
-			cmyth_livetv_chain_switch(rec, cur);	
+			if (cmyth_livetv_chain_switch(rec, cur) == 1) {
+				/*
+				 * Return the new position in the chain
+				 */
+				for (cur = 0; cur < rec->rec_livetv_chain->chain_current; cur++) {
+					fp = rec->rec_livetv_chain->chain_files[cur];
+					ret += fp->file_length;
+				}
+				return ret;
+			}
 		}
-		
-		pthread_mutex_unlock(&mutex);
 	}
-	else
-		return -1;
 
-	return ret;
+	return -1;
 }
 
 /*
- * cmyth_livetv_read(cmyth_recorder_t rec, char *buf, unsigned long len)
- * 
+ * cmyth_livetv_read()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -1196,28 +1166,28 @@
  *
  * Failure: an int containing -errno
  */
-int cmyth_livetv_read(cmyth_recorder_t rec, char *buf, unsigned long len)
+int32_t cmyth_livetv_read(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	if(rec->rec_conn->conn_version >= 26)
 		return cmyth_livetv_chain_read(rec, buf, len);
 	else
 		return cmyth_ringbuf_read(rec, buf, len);
-	
+
 }
 
 /*
- * cmyth_livetv_seek(cmyth_recorder_t file, long long offset, int whence)
- * 
+ * cmyth_livetv_seek()
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Seek to a new position in the file based on the value of whence:
- *	SEEK_SET
+ *	WHENCE_SET
  *		The offset is set to offset bytes.
- *	SEEK_CUR
+ *	WHENCE_CUR
  *		The offset is set to the current position plus offset bytes.
- *	SEEK_END
+ *	WHENCE_END
  *		The offset is set to the size of the file minus offset bytes.
  * This function will select the appropriate call based on the protocol.
  *
@@ -1227,10 +1197,10 @@
  *
  * Failure: an int containing -errno
  */
-long long
-cmyth_livetv_seek(cmyth_recorder_t rec, long long offset, int whence)
+int64_t
+cmyth_livetv_seek(cmyth_recorder_t rec, int64_t offset, int8_t whence)
 {
-	long long rtrn;
+	int64_t rtrn;
 
 	if(rec->rec_conn->conn_version >= 26)
 		rtrn = cmyth_livetv_chain_seek(rec, offset, whence);
@@ -1241,8 +1211,8 @@
 }
 
 /*
- * cmyth_livetv_request_block(cmyth_recorder_t file, unsigned long len)
- * 
+ * cmyth_livetv_request_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -1257,15 +1227,15 @@
  *
  * Failure: an int containing -errno
  */
-int
-cmyth_livetv_request_block(cmyth_recorder_t rec, unsigned long size)
+int32_t
+cmyth_livetv_request_block(cmyth_recorder_t rec, int32_t len)
 {
-	unsigned long rtrn;
+	int32_t rtrn;
 
 	if(rec->rec_conn->conn_version >= 26)
-		rtrn = cmyth_livetv_chain_request_block(rec, size);
+		rtrn = cmyth_livetv_chain_request_block(rec, len);
 	else
-		rtrn = cmyth_ringbuf_request_block(rec, size);
+		rtrn = cmyth_ringbuf_request_block(rec, len);
 
 	return rtrn;
 }
@@ -1274,7 +1244,7 @@
 cmyth_livetv_select(cmyth_recorder_t rec, struct timeval *timeout)
 {
 	int rtrn;
-	
+
 	if(rec->rec_conn->conn_version >= 26)
 		rtrn = cmyth_livetv_chain_select(rec, timeout);
 	else
@@ -1284,17 +1254,22 @@
 }
 
 /*
- * cmyth_livetv_get_block(cmyth_recorder_t rec, char *buf, unsigned long len)
+ * cmyth_livetv_get_block()
+ *
  * Scope: PUBLIC
+ *
  * Description
+ *
  * Read incoming file data off the network into a buffer of length len.
  *
  * Return Value:
+ *
  * Sucess: number of bytes read into buf
+ *
  * Failure: -1
  */
-int
-cmyth_livetv_get_block(cmyth_recorder_t rec, char *buf, unsigned long len)
+int32_t
+cmyth_livetv_get_block(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	int rtrn;
 
@@ -1307,9 +1282,9 @@
 }
 
 cmyth_recorder_t
-cmyth_spawn_live_tv(cmyth_recorder_t rec, unsigned buflen, int tcp_rcvbuf,
-										void (*prog_update_callback)(cmyth_proginfo_t),
-										char ** err, char* channame)
+cmyth_spawn_live_tv(cmyth_recorder_t rec, uint32_t buflen, int32_t tcp_rcvbuf,
+	void (*prog_update_callback)(cmyth_proginfo_t),
+	char ** err, char* channame)
 {
 	cmyth_recorder_t rtrn = NULL;
 	int i;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/mysql_query.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/mysql_query.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/mysql_query.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/mysql_query.c	2013-03-12 10:51:22.000000000 +0000
@@ -23,10 +23,9 @@
 #include <stdio.h>
 #include <cmyth_local.h>
 
-#define CMYTH_ULONG_STRLEN ((sizeof(long)*3)+1)
-#define CMYTH_LONG_STRLEN (CMYTH_ULONG_STRLEN+1)
+#define CMYTH_UINT32_STRLEN ((sizeof(uint32_t)*3)+1)
+#define CMYTH_INT32_STRLEN (CMYTH_UINT32_STRLEN+1)
 #define CMYTH_INT64_STRLEN 24
-#define CMYTH_UINT64_STRLEN 24
 
 /**
  * Hold in-progress query
@@ -70,7 +69,7 @@
  * 			parameters, this is NOT copied and must therefore
  * 			remain valid for the life of the query.
  */
-cmyth_mysql_query_t * 
+cmyth_mysql_query_t *
 cmyth_mysql_query_create(cmyth_database_t db, const char * query_string)
 {
     cmyth_mysql_query_t * out;
@@ -113,7 +112,7 @@
 	/* Increase buffer size by len or out->source_len, whichever
 	 * is bigger
 	 */
-	if(query->source_len > len) 
+	if(query->source_len > len)
 	    query->buf_size += query->source_len;
 	else
 	    query->buf_size += len;
@@ -186,18 +185,18 @@
 }
 
 static inline int
-query_buffer_add_long(cmyth_mysql_query_t * query, long param)
+query_buffer_add_int32(cmyth_mysql_query_t * query, int32_t param)
 {
-    char buf[CMYTH_LONG_STRLEN];
-    sprintf(buf,"%ld",param);
+    char buf[CMYTH_INT32_STRLEN];
+    sprintf(buf,"%"PRId32,param);
     return query_buffer_add_str(query,buf);
 }
 
 static inline int
-query_buffer_add_ulong(cmyth_mysql_query_t * query, long param)
+query_buffer_add_uint32(cmyth_mysql_query_t * query, uint32_t param)
 {
-    char buf[CMYTH_ULONG_STRLEN];
-    sprintf(buf,"%lu",param);
+    char buf[CMYTH_UINT32_STRLEN];
+    sprintf(buf,"%"PRIu32,param);
     return query_buffer_add_str(query,buf);
 }
 
@@ -209,42 +208,34 @@
   return query_buffer_add_str(query,buf);
 }
 
-static inline int
-  query_buffer_add_uint64(cmyth_mysql_query_t * query, uint64_t param)
-{
-  char buf[CMYTH_UINT64_STRLEN];
-  sprintf(buf,"%"PRIu64,param);
-  return query_buffer_add_str(query,buf);
-}
-
 /**
- * Add a long integer parameter
+ * Add a int32_t integer parameter
  * \param query the query object
  * \param param the integer to add
  */
 int
-cmyth_mysql_query_param_long(cmyth_mysql_query_t * query,long param)
+cmyth_mysql_query_param_int32(cmyth_mysql_query_t * query, int32_t param)
 {
     int ret;
     ret = query_begin_next_param(query);
     if(ret < 0)
 	return ret;
-    return query_buffer_add_long(query,param);
+    return query_buffer_add_int32(query,param);
 }
 
 /**
- * Add an unsigned long integer parameter
+ * Add an uint32_t integer parameter
  * \param query the query object
  * \param param the integer to add
  */
 int
-cmyth_mysql_query_param_ulong(cmyth_mysql_query_t * query,unsigned long param)
+cmyth_mysql_query_param_uint32(cmyth_mysql_query_t * query, uint32_t param)
 {
     int ret;
     ret = query_begin_next_param(query);
     if(ret < 0)
 	return ret;
-    return query_buffer_add_ulong(query,param);
+    return query_buffer_add_uint32(query,param);
 }
 
 /**
@@ -253,7 +244,7 @@
  * \param param the integer to add
  */
 int
-cmyth_mysql_query_param_int64(cmyth_mysql_query_t * query,int64_t param)
+cmyth_mysql_query_param_int64(cmyth_mysql_query_t * query, int64_t param)
 {
     int ret;
     ret = query_begin_next_param(query);
@@ -263,29 +254,14 @@
 }
 
 /**
- * Add a uint64_t parameter
- * \param query the query object
- * \param param the integer to add
- */
-int
-cmyth_mysql_query_param_uint64(cmyth_mysql_query_t * query,uint64_t param)
-{
-    int ret;
-    ret = query_begin_next_param(query);
-    if(ret < 0)
-	return ret;
-    return query_buffer_add_uint64(query,param);
-}
-
-/**
  * Add an integer parameter
  * \param query the query object
  * \param param the integer to add
  */
 int
-cmyth_mysql_query_param_int(cmyth_mysql_query_t * query,int param)
+cmyth_mysql_query_param_int(cmyth_mysql_query_t * query, int param)
 {
-    return cmyth_mysql_query_param_long(query,(long)param);
+    return cmyth_mysql_query_param_int32(query,(int32_t)param);
 }
 
 /**
@@ -294,9 +270,9 @@
  * \param param the integer to add
  */
 int
-cmyth_mysql_query_param_uint(cmyth_mysql_query_t * query,int param)
+cmyth_mysql_query_param_uint(cmyth_mysql_query_t * query, unsigned int param)
 {
-    return cmyth_mysql_query_param_ulong(query,(unsigned long)param);
+    return cmyth_mysql_query_param_uint32(query,(uint32_t)param);
 }
 
 /**
@@ -318,7 +294,7 @@
         ret = query_buffer_add_str(query, "FROM_UNIXTIME(");
     if(ret < 0)
 	return ret;
-    ret = query_buffer_add_long(query,(long)param);
+    ret = query_buffer_add_int32(query,(int32_t)param);
     if(ret < 0)
 	return ret;
     if (tz_utc == 1)
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/mythtv_mysql.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/mythtv_mysql.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/mythtv_mysql.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/mythtv_mysql.c	2013-03-12 10:51:22.000000000 +0000
@@ -33,28 +33,16 @@
 #include <cmyth_local.h>
 #include <safe_string.h>
 
-#ifdef _MSC_VER
-static void nullprint(a, ...) { return; }
-#define PRINTF nullprint
-#define TRC  nullprint
-#elif 0
-#define PRINTF(x...) PRINTF(x)
-#define TRC(fmt, args...) PRINTF(fmt, ## args)
-#else
-#define PRINTF(x...)
-#define TRC(fmt, args...)
-#endif
-
 void
 cmyth_database_close(cmyth_database_t db)
 {
-    if(db->mysql != NULL)
-    {
+	if (db->mysql != NULL) {
 		mysql_close(db->mysql);
 		db->mysql = NULL;
-		db->db_version = -1;
+		db->db_setup = 0;
+		db->db_version = 0;
 		db->db_tz_utc = 0;
-    }
+	}
 }
 
 static void
@@ -65,7 +53,7 @@
 }
 
 cmyth_database_t
-cmyth_database_init(char *host, char *db_name, char *user, char *pass)
+cmyth_database_init(char *host, char *db_name, char *user, char *pass, unsigned short port)
 {
 	cmyth_database_t rtrn = ref_alloc(sizeof(*rtrn));
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
@@ -73,13 +61,15 @@
 	ref_set_destroy(rtrn, (ref_destroy_t)cmyth_database_destroy);
 
 	if (rtrn != NULL) {
-	    rtrn->db_host = ref_strdup(host);
-	    rtrn->db_user = ref_strdup(user);
-	    rtrn->db_pass = ref_strdup(pass);
-	    rtrn->db_name = ref_strdup(db_name);
-	    rtrn->db_version = -1;
-	    rtrn->db_tz_utc = 0;
-	    rtrn->db_tz_name[0] = '\0';
+		rtrn->db_host = ref_strdup(host);
+		rtrn->db_user = ref_strdup(user);
+		rtrn->db_pass = ref_strdup(pass);
+		rtrn->db_name = ref_strdup(db_name);
+		rtrn->db_port = port;
+		rtrn->db_setup = 0;
+		rtrn->db_version = 0;
+		rtrn->db_tz_utc = 0;
+		rtrn->db_tz_name[0] = '\0';
 	}
 
 	return rtrn;
@@ -90,15 +80,15 @@
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	int dbversion;
+	uint32_t dbversion;
 	const char *query_str = "SELECT data FROM settings WHERE value = 'DBSchemaVer' AND hostname IS NULL LIMIT 1;";
-	cmyth_mysql_query_t * query;
+	cmyth_mysql_query_t *query;
 
-	// Set db version to unknown
+	// db setup done
+	db->db_setup = 1;
 	db->db_version = 0;
 	// Get db version from settings
-
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
 	if (res == NULL) {
@@ -106,86 +96,118 @@
 		return -1;
 	}
 	row = mysql_fetch_row(res);
-	dbversion = safe_atoi(row[0]);
+	dbversion = safe_atol(row[0]);
 	mysql_free_result(res);
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s, database version is: %d", __FUNCTION__, dbversion);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s, database version is: %"PRIu32, __FUNCTION__, dbversion);
 	if (dbversion > 0) {
 		db->db_version = dbversion;
 		if (dbversion >= 1307) {
 			db->db_tz_utc = 1;
-			strcpy(db->db_tz_name,"UTC");
-		}
-		else {
+			strcpy(db->db_tz_name, "UTC");
+		} else {
 			db->db_tz_utc = 0;
-			strcpy(db->db_tz_name,"SYSTEM");
+			strcpy(db->db_tz_name, "SYSTEM");
 		}
+		return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 int
 cmyth_database_set_host(cmyth_database_t db, char *host)
 {
-	PRINTF("** SSDEBUG: setting the db host to %s\n", host);
 	cmyth_database_close(db);
 	ref_release(db->db_host);
 	db->db_host = ref_strdup(host);
-	if(! db->db_host)
-	    return 0;
+	if (!db->db_host)
+		return 0;
 	else
-	    return 1;
+		return 1;
 }
 
 int
 cmyth_database_set_user(cmyth_database_t db, char *user)
 {
-	PRINTF("** SSDEBUG: setting the db user to %s\n", user);
 	cmyth_database_close(db);
 	ref_release(db->db_user);
 	db->db_user = ref_strdup(user);
-	if(! db->db_user)
-	    return 0;
+	if (!db->db_user)
+		return 0;
 	else
-	    return 1;
+		return 1;
 }
 
 int
 cmyth_database_set_pass(cmyth_database_t db, char *pass)
 {
-	PRINTF("** SSDEBUG: setting the db pass to %s\n", pass);
 	cmyth_database_close(db);
 	ref_release(db->db_user);
 	db->db_pass = ref_strdup(pass);
-	if(! db->db_pass)
-	    return 0;
+	if (!db->db_pass)
+		return 0;
 	else
-	    return 1;
+		return 1;
 }
 
 int
 cmyth_database_set_name(cmyth_database_t db, char *name)
 {
-	PRINTF("** SSDEBUG: setting the db name to %s\n", name);
 	cmyth_database_close(db);
 	ref_release(db->db_name);
 	db->db_name = ref_strdup(name);
-	if(! db->db_name)
-	    return 0;
+	if (!db->db_name)
+		return 0;
 	else
-	    return 1;
+		return 1;
+}
+
+int
+cmyth_database_set_port(cmyth_database_t db, uint16_t port)
+{
+	cmyth_database_close(db);
+	db->db_port = port;
+	return 1;
+}
+
+static int
+cmyth_database_check_version(cmyth_database_t db)
+{
+	int err = 0;
+	/*
+	 * Since version 0.26, mythbackend stores in the database an exhaustive list of datetime fields
+	 * using UTC zone, not all. Others fields keep local system time zone. Also the field types don't
+	 * have extension 'with time zone'. To manage this situation we check the DB schema version to
+	 * know if we must manually convert these date, time or datetime fields during exchanges with the
+	 * database (read or store). If true then the attribute db_tz_utc is set to 1 else 0.
+	 * This check is done when the first connection is created and the attribute db_setup is NULL
+	 */
+	if (!db->db_setup && (err = cmyth_database_setup(db)) < 0)
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: database setup failed (%d)\n", __FUNCTION__, err);
+	return err;
 }
 
+uint32_t
+cmyth_database_get_version(cmyth_database_t db)
+{
+	if (cmyth_database_check_version(db) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
+			__FUNCTION__);
+		return 0;
+	}
+
+	return db->db_version;
+}
 
 static int
 cmyth_db_check_connection(cmyth_database_t db)
 {
-	if(db->mysql != NULL) {
+	if (db->mysql != NULL) {
 		/* Fetch the mysql stats (uptime and stuff) to check the connection is
 		 * still good
 		 */
 		if (mysql_stat(db->mysql) == NULL) {
-			fprintf(stderr, "%s: mysql_stat() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_stat() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
 			cmyth_database_close(db);
 			mysql_close(db->mysql);
 			db->mysql = NULL;
@@ -193,13 +215,12 @@
 	}
 	if (db->mysql == NULL) {
 		db->mysql = mysql_init(NULL);
-		if(db->mysql == NULL) {
-			fprintf(stderr,"%s: mysql_init() failed, insufficient memory?\n", __FUNCTION__);
+		if (db->mysql == NULL) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_init() failed, insufficient memory?\n", __FUNCTION__);
 			return -1;
 		}
-		if(NULL == mysql_real_connect(db->mysql,db->db_host,db->db_user,db->db_pass,db->db_name,0,NULL,0))
-		{
-			fprintf(stderr,"%s: mysql_connect() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
+		if (NULL == mysql_real_connect(db->mysql, db->db_host, db->db_user, db->db_pass, db->db_name, db->db_port, NULL, CLIENT_FOUND_ROWS)) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_connect() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
 			cmyth_database_close(db);
 			mysql_close(db->mysql);
 			db->mysql = NULL;
@@ -212,602 +233,379 @@
 MYSQL *
 cmyth_db_get_connection(cmyth_database_t db)
 {
-    int err;
-
-    if(cmyth_db_check_connection(db) != 0)
-    {
-       cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n",
-       					__FUNCTION__);
-       return NULL;
-    }
-
-    /*
-     * mythbackend stores any multi-byte characters using utf8 encoding within latin1 database
-     * columns. The MySQL connection needs to be told to use a utf8 character set when reading the
-     * database columns or any multi-byte characters will be treated as 2 or 3 subsequent latin1
-     * characters with nonsense values.
-     *
-     * http://www.mythtv.org/wiki/Fixing_Corrupt_Database_Encoding#Note_on_MythTV_0.21-fixes_and_below_character_encoding
-     * http://dev.mysql.com/doc/refman/5.0/en/charset-connection.html
-     */
-    if(mysql_query(db->mysql,"SET NAMES utf8;")) {
-      cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
-      return NULL;
-    }
-    /*
-     * Since version 0.26, mythbackend store in the database an exhaustive list of datetime fields
-     * using UTC zone, not all. Others fields keep local system time zone. Also the field types don't
-     * have extension 'with time zone'. To manage this situation we check the DB schema version to
-     * know if we must manually convert these date, time or datetime fields during exchanges with the
-     * database (read or store). If true then the attribute db_tz_utc is set to 1 else 0.
-     * This check is done one time at the first getting connection when the attribute db_version is
-     * not yet known (-1).
-     */
-    if (db->db_version < 0 && (err=cmyth_database_setup(db)) < 0) {
-            cmyth_dbg(CMYTH_DBG_ERROR, "%s: database setup failed (%d)\n",
-                    __FUNCTION__, err);
-            return NULL;
-    }
-    /*
-     * Setting the TIME_ZONE is not really required since all datetime fields don't have extension
-     * 'with time zone'. But we do even.
-     */
-    if(mysql_query(db->mysql,"SET TIME_ZONE='SYSTEM';")) {
-            cmyth_dbg(CMYTH_DBG_ERROR, "%s: SET TIME_ZONE failed: %s\n",
-                    __FUNCTION__, mysql_error(db->mysql));
-            return NULL;
-    }
-
-    return db->mysql;
-}
-
-/*
- * DEPRECATED
- */
-int 
-cmyth_schedule_recording(cmyth_conn_t conn, char * msg)
-{
-	int err=0;
-	int count;
-	char buf[256];
-
-	fprintf (stderr, "In function : %s\n",__FUNCTION__);
-	if (!conn) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
-		return -1;
+	if (cmyth_db_check_connection(db) != 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
+		return NULL;
 	}
 
-	pthread_mutex_lock(&mutex);
+	/*
+	 * mythbackend stores any multi-byte characters using utf8 encoding within latin1 database
+	 * columns. The MySQL connection needs to be told to use a utf8 character set when reading the
+	 * database columns or any multi-byte characters will be treated as 2 or 3 subsequent latin1
+	 * characters with nonsense values.
+	 *
+	 * http://www.mythtv.org/wiki/Fixing_Corrupt_Database_Encoding#Note_on_MythTV_0.21-fixes_and_below_character_encoding
+	 * http://dev.mysql.com/doc/refman/5.0/en/charset-connection.html
+	 */
+	if (mysql_query(db->mysql, "SET NAMES utf8;")) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
+		return NULL;
+	}
 
-	if ((err = cmyth_send_message(conn, msg)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-                        "%s: cmyth_send_message() failed (%d)\n",__FUNCTION__,err);
-		return err;
+	/*
+	 * Setting the TIME_ZONE is not really required since all datetime fields don't have extension
+	 * 'with time zone'. But we do nevertheless.
+	 */
+	if (mysql_query(db->mysql, "SET TIME_ZONE='SYSTEM';")) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: SET TIME_ZONE failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
+		return NULL;
 	}
 
-	count = cmyth_rcv_length(conn);
-	cmyth_rcv_string(conn, &err, buf, sizeof(buf)-1,count);
-	pthread_mutex_unlock(&mutex);
-	return err;
+	return db->mysql;
 }
 
 char *
-cmyth_mysql_escape_chars(cmyth_database_t db, char * string) 
+cmyth_mysql_escape_chars(cmyth_database_t db, char *string)
 {
 	char *N_string;
 	size_t len;
 
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n",
-                           __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return NULL;
+	if (cmyth_db_check_connection(db) != 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
+		return NULL;
 	}
 
 	len = strlen(string);
-	N_string=ref_alloc(len*2+1);
-	mysql_real_escape_string(db->mysql,N_string,string,len); 
+	N_string = ref_alloc(len * 2 + 1);
+	mysql_real_escape_string(db->mysql, N_string, string, len);
 
 	return (N_string);
 }
 
-int 
-cmyth_get_offset_mysql(cmyth_database_t db, int type, char *recordid, int chanid, char *title, char *subtitle, char *description, char *seriesid, char *programid)
-{
-	MYSQL_RES *res=NULL;
-	MYSQL_ROW row;
-	char query[1000];
-	int count;
-
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return -1;
-	}
-	if (type == 1) { // startoffset
-		sprintf (query,"SELECT startoffset FROM record WHERE (recordid='%s' AND chanid=%d AND title='%s' AND subtitle='%s' AND description='%s' AND seriesid='%s' AND programid='%s')",recordid,chanid,title,subtitle,description,seriesid,programid);
-	}
-	else if (type == 0) { //endoffset
-		sprintf (query,"SELECT endoffset FROM record WHERE (recordid='%s' AND chanid=%d AND title='%s' AND subtitle='%s' AND description='%s' AND seriesid='%s' AND programid='%s')",recordid,chanid,title,subtitle,description,seriesid,programid);
-	}
-
-	cmyth_dbg(CMYTH_DBG_ERROR, "%s : query=%s\n",__FUNCTION__, query);
-	
-        if(mysql_query(db->mysql,query)) {
-                 cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
-		return -1;
-        }
-        res = mysql_store_result(db->mysql);
-	if ( (count = (int)mysql_num_rows(res)) >0) {
-		row = mysql_fetch_row(res);
-		fprintf(stderr, "row grabbed done count=%d\n",count);
-        	mysql_free_result(res);
-		return atoi(row[0]);
-	}
-	else {
-        	mysql_free_result(res);
-		return 0;
-	}
-}
-
 int
-cmyth_set_watched_status_mysql(cmyth_database_t db, cmyth_proginfo_t prog, int watchedStat)
+cmyth_mysql_set_watched_status(cmyth_database_t db, cmyth_proginfo_t prog, int watchedStat)
 {
 	MYSQL_RES *res = NULL;
+	MYSQL* sql = cmyth_db_get_connection(db);
 	const char *query_str = "UPDATE recorded SET watched = ? WHERE chanid = ? AND starttime = ?";
-	cmyth_mysql_query_t * query;
+	cmyth_mysql_query_t *query;
 	time_t starttime;
 
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	if (watchedStat > 1) watchedStat = 1;
 	if (watchedStat < 0) watchedStat = 0;
 	starttime = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
 	query = cmyth_mysql_query_create(db, query_str);
 
-	if (cmyth_mysql_query_param_long(query, watchedStat) < 0
-	 || cmyth_mysql_query_param_long(query, prog->proginfo_chanId) < 0
-	 || cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0 ) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_mysql_query_param_int(query, watchedStat) < 0
+			|| cmyth_mysql_query_param_uint32(query, prog->proginfo_chanId) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 	if (cmyth_mysql_query(query) != 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 	mysql_free_result(res);
 	ref_release(query);
-	return (1);
-}
-
-char *
-cmyth_get_recordid_mysql(cmyth_database_t db, int chanid, char *title, char *subtitle, char *description, char *seriesid, char *programid)
-{
-	MYSQL_RES *res=NULL;
-	MYSQL_ROW row;
-	char query[1000];
-	int count;
-
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return NULL;
-	}
-	sprintf (query,"SELECT recordid FROM record WHERE (chanid=%d AND title='%s' AND subtitle='%s' AND description='%s' AND seriesid='%s' AND programid='%s')",chanid,title,subtitle,description,seriesid,programid);
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s : query=%s\n",__FUNCTION__, query);
-	
-        if(mysql_query(db->mysql,query)) {
-                 cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
-		return NULL;
-        }
-        res = mysql_store_result(db->mysql);
-	if ( (count = (int)mysql_num_rows(res)) >0) {
-		row = mysql_fetch_row(res);
-		fprintf(stderr, "row grabbed done count=%d\n",count);
-        	mysql_free_result(res);
-		return row[0];
-	}
-	else {
-        	mysql_free_result(res);
-		return "NULL";
-	}
-}
-
-/*
- * DEPRECATED
- */
-int 
-cmyth_mysql_delete_scheduled_recording(cmyth_database_t db, char * query)
-{
-	int rows=0;
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n",
-                           __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return -1;
-	}
-	cmyth_dbg(CMYTH_DBG_DEBUG, "mysql query :%s\n",query);
-
-        if(mysql_real_query(db->mysql,query,(unsigned int) strlen(query))) {
-                cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-                           __FUNCTION__, mysql_error(db->mysql));
-		return -1;
-	}
-	rows=(int)mysql_affected_rows(db->mysql);
-
-	if (rows <=0) {
-        	cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-                	__FUNCTION__, mysql_error(db->mysql));
-	}
-
-	return rows;
-}
-
-/*
- * DEPRECATED
- */
-int
-cmyth_mysql_insert_into_record(cmyth_database_t db, char * query, char * query1, char * query2, char *title, char * subtitle, char * description, char * callsign)
-{
-	int rows=0;
-	char *N_title;
-	char *N_subtitle;
-	char *N_description;
-	char *N_callsign;
-	char N_query[2570];
-
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n",
-                           __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return -1;
-	}
-
-	N_title = ref_alloc(strlen(title)*2+1);
-	mysql_real_escape_string(db->mysql,N_title,title,strlen(title)); 
-	N_subtitle = ref_alloc(strlen(subtitle)*2+1);
-	mysql_real_escape_string(db->mysql,N_subtitle,subtitle,strlen(subtitle)); 
-	N_description = ref_alloc(strlen(description)*2+1);
-	mysql_real_escape_string(db->mysql,N_description,description,strlen(description)); 
-	N_callsign = ref_alloc(strlen(callsign)*2+1);
-	mysql_real_escape_string(db->mysql,N_callsign,callsign,strlen(callsign)); 
-
-	snprintf(N_query,2500,"%s '%s','%s','%s' %s '%s' %s",query,N_title,N_subtitle,N_description,query1,N_callsign,query2); 
-	ref_release(N_title);
-	ref_release(N_subtitle);
-	ref_release(N_callsign);
-	cmyth_dbg(CMYTH_DBG_DEBUG, "mysql query :%s\n",N_query);
-
-        if(mysql_real_query(db->mysql,N_query,(unsigned int) strlen(N_query))) {
-                cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-                           __FUNCTION__, mysql_error(db->mysql));
-		return -1;
-	}
-	rows=(int)mysql_insert_id(db->mysql);
-
-	if (rows <=0) {
-        	cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-                	__FUNCTION__, mysql_error(db->mysql));
-	}
-
-
-	return rows;
+	return (int)mysql_affected_rows(sql);
 }
 
 int
 cmyth_mysql_get_prev_recorded(cmyth_database_t db, cmyth_program_t **prog)
 {
-	MYSQL_RES *res= NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	int n=0;
-	int rows=0;
+	int n = 0;
+	int rows = 0;
 	const char *query_str = "SELECT oldrecorded.chanid, UNIX_TIMESTAMP(CONVERT_TZ(starttime, ?, 'SYSTEM')), UNIX_TIMESTAMP(CONVERT_TZ(endtime, ?, 'SYSTEM')), title, subtitle, description, category, seriesid, programid, channel.channum, channel.callsign, channel.name, findid, rectype, recstatus, recordid, duplicate FROM oldrecorded LEFT JOIN channel ON oldrecorded.chanid = channel.chanid ORDER BY starttime ASC";
 	cmyth_mysql_query_t *query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	query = cmyth_mysql_query_create(db, query_str);
 
-	if(cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-	 || cmyth_mysql_query_param_str(query, db->db_tz_name) < 0)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		ref_release(prog);
 		return -1;
 	}
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if (res == NULL)
-	{
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		return -1;
 	}
 
-	while((row = mysql_fetch_row(res))) {
-        	if (rows >= n) {
-                	n+=10;
-                       	*prog=realloc(*prog,sizeof(**prog)*(n));
-               	}
-		(*prog)[rows].chanid = safe_atoi(row[0]);
-               	(*prog)[rows].recording=0;
-		(*prog)[rows].starttime=(time_t)safe_atol(row[1]);
-		(*prog)[rows].endtime= (time_t)safe_atol(row[2]);
+	while ((row = mysql_fetch_row(res))) {
+		if (rows >= n) {
+			n += 10;
+			*prog = realloc(*prog, sizeof(**prog) * (n));
+		}
+		(*prog)[rows].chanid = safe_atol(row[0]);
+		(*prog)[rows].starttime = (time_t)safe_atol(row[1]);
+		(*prog)[rows].endtime = (time_t)safe_atol(row[2]);
 		sizeof_strncpy((*prog)[rows].title, row[3]);
 		sizeof_strncpy((*prog)[rows].subtitle, row[4]);
 		sizeof_strncpy((*prog)[rows].description, row[5]);
 		sizeof_strncpy((*prog)[rows].category, row[6]);
 		sizeof_strncpy((*prog)[rows].seriesid, row[7]);
 		sizeof_strncpy((*prog)[rows].programid, row[8]);
-		(*prog)[rows].channum = safe_atoi(row[9]);
+		(*prog)[rows].channum = safe_atol(row[9]);
 		sizeof_strncpy((*prog)[rows].callsign, row[10]);
 		sizeof_strncpy((*prog)[rows].name, row[11]);
-		//sizeof_strncpy((*prog)[rows].rec_status, row[14]);
-		(*prog)[rows].rec_status=safe_atoi(row[14]);
-		//fprintf(stderr, "row=%s   val=%d\n",row[14],(*prog)[rows].rec_status);
-          	rows++;
-        }
-        mysql_free_result(res);
-        cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
+		(*prog)[rows].rec_status = safe_atoi(row[14]);
+		rows++;
+	}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 	return rows;
 }
 
 int
-cmyth_mysql_get_guide(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, time_t endtime) 
+cmyth_mysql_get_guide(cmyth_database_t db, cmyth_program_t **prog, uint32_t chanid, time_t starttime, time_t endtime)
 {
-	MYSQL_RES *res= NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT program.chanid, UNIX_TIMESTAMP(CONVERT_TZ(program.starttime, ?, 'SYSTEM')), UNIX_TIMESTAMP(CONVERT_TZ(program.endtime, ?, 'SYSTEM')), "
-		"program.title, program.description, program.subtitle, program.programid, program.seriesid, program.category, "
-		"channel.channum, channel.callsign, channel.name, channel.sourceid "
-		"FROM program INNER JOIN channel ON program.chanid=channel.chanid "
-		"WHERE channel.visible = 1 AND ((program.endtime > ? AND program.endtime < ?) OR (program.starttime >= ? AND program.starttime <= ?) OR (program.starttime <= ? AND program.endtime >= ?)) "
-		"ORDER BY (channel.channum + 0), program.starttime ASC";
-	int rows=0;
-	int n=0;
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
-
-	if(cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-	    || cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-	    || cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0)
-	{
-	    cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-	    ref_release(query);
-	    return -1;
- 	}
-	res = cmyth_mysql_query_result(query);
-	ref_release(query);
-	if(res == NULL)
-	{
-	    cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-	    return -1;
-	}
+				"program.title, program.description, program.subtitle, program.programid, program.seriesid, program.category, program.category_type, "
+				"channel.channum, channel.callsign, channel.name, channel.sourceid "
+				"FROM program INNER JOIN channel ON program.chanid=channel.chanid "
+				"WHERE channel.chanid = ? AND ((program.endtime > ? AND program.endtime < ?) OR (program.starttime >= ? AND program.starttime <= ?) OR (program.starttime <= ? AND program.endtime >= ?)) "
+				"ORDER BY (channel.channum + 0), program.starttime ASC";
+	int rows = 0;
+	int n = 0;
+	cmyth_mysql_query_t *query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
 
+	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_uint32(query, chanid) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
+	}
 
-	while((row = mysql_fetch_row(res))) {
-        	if (rows >= n) {
-                	n+=10;
-                       	*prog=ref_realloc(*prog,sizeof(**prog)*(n));
-               	}
-		(*prog)[rows].chanid = safe_atoi(row[0]);
-               	(*prog)[rows].recording=0;
-		(*prog)[rows].starttime= (time_t)safe_atol(row[1]);
-		(*prog)[rows].endtime= (time_t)safe_atol(row[2]);
+	while ((row = mysql_fetch_row(res))) {
+		if (rows >= n) {
+			n += 10;
+			*prog = ref_realloc(*prog, sizeof(**prog) * (n));
+		}
+		(*prog)[rows].chanid = safe_atol(row[0]);
+		(*prog)[rows].starttime = (time_t)safe_atol(row[1]);
+		(*prog)[rows].endtime = (time_t)safe_atol(row[2]);
 		sizeof_strncpy((*prog)[rows].title, row[3]);
 		sizeof_strncpy((*prog)[rows].description, row[4]);
 		sizeof_strncpy((*prog)[rows].subtitle, row[5]);
 		sizeof_strncpy((*prog)[rows].programid, row[6]);
 		sizeof_strncpy((*prog)[rows].seriesid, row[7]);
 		sizeof_strncpy((*prog)[rows].category, row[8]);
-		(*prog)[rows].channum = safe_atoi(row[9]);
-		sizeof_strncpy((*prog)[rows].callsign, row[10]);
-		sizeof_strncpy((*prog)[rows].name, row[11]);
-		(*prog)[rows].sourceid = safe_atoi(row[12]);
-		(*prog)[rows].startoffset=0;
-		(*prog)[rows].endoffset=0;
-          	rows++;
-        }
-        mysql_free_result(res);
-        cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
+		sizeof_strncpy((*prog)[rows].category_type, row[9]);
+		(*prog)[rows].channum = safe_atol(row[10]);
+		sizeof_strncpy((*prog)[rows].callsign, row[11]);
+		sizeof_strncpy((*prog)[rows].name, row[12]);
+		(*prog)[rows].sourceid = safe_atol(row[13]);
+		(*prog)[rows].rec_status = 0;
+		rows++;
+	}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 	return rows;
 }
 
-int 
+int
 cmyth_mysql_get_recgroups(cmyth_database_t db, cmyth_recgroups_t **sqlrecgroups)
 {
-	MYSQL_RES *res=NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT DISTINCT recgroup FROM record";
-	int rows=0;
-	int n=0;
+	int rows = 0;
+	int n = 0;
 	cmyth_mysql_query_t *query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	query = cmyth_mysql_query_create(db, query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if (res == NULL)
-	{
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		return -1;
 	}
 
-        while((row = mysql_fetch_row(res))) {
-        	if (rows == n ) {
-                	n++;
-                       	*sqlrecgroups=realloc(*sqlrecgroups,sizeof(**sqlrecgroups)*(n));
-               	}
-		sizeof_strncpy ( (*sqlrecgroups)[rows].recgroups, row[0]);
-		cmyth_dbg(CMYTH_DBG_DEBUG, "(*sqlrecgroups)[%d].recgroups =  %s\n",rows, (*sqlrecgroups)[rows].recgroups);
+	while ((row = mysql_fetch_row(res))) {
+		if (rows == n) {
+			n++;
+			*sqlrecgroups = realloc(*sqlrecgroups, sizeof(**sqlrecgroups) * (n));
+		}
+		sizeof_strncpy((*sqlrecgroups)[rows].recgroups, row[0]);
+		cmyth_dbg(CMYTH_DBG_DEBUG, "(*sqlrecgroups)[%d].recgroups = %s\n", rows, (*sqlrecgroups)[rows].recgroups);
 		rows++;
-        }
-        mysql_free_result(res);
-        cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
+	}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 	return rows;
 }
 
-
 int
-cmyth_mysql_get_prog_finder_char_title(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, char *program_name) 
+cmyth_mysql_get_prog_finder_char_title(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, char *program_name)
 {
-	MYSQL_RES *res=NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	char *N_title;
-	char *esctitle;
 	char *query_str;
-	int rows=0;
+	int rows = 0;
 	int n = 0;
 	cmyth_mysql_query_t *query;
 
-	if (strncmp(program_name, "@", 1) == 0)
-	{
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	if (strncmp(program_name, "@", 1) == 0) {
 		query_str = "SELECT DISTINCT title FROM program WHERE ( title NOT REGEXP '^[A-Z0-9]' AND title NOT REGEXP '^The [A-Z0-9]' AND title NOT REGEXP '^A [A-Z0-9]' AND starttime >= ?) ORDER BY title";
 		query = cmyth_mysql_query_create(db, query_str);
-		if(cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0)
-		{
+		if (cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 			ref_release(query);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		query_str = "SELECT DISTINCT title FROM program where starttime >= ? and title like ? ORDER BY title ASC";
 		query = cmyth_mysql_query_create(db, query_str);
 		N_title = ref_alloc(strlen(program_name) * 2 + 3);
-		sprintf(N_title,"%%%s%%", program_name);
-		esctitle = cmyth_mysql_escape_chars(db, N_title);
-		ref_release(N_title);
-		if(cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		    || cmyth_mysql_query_param_str(query, esctitle) < 0)
-		{
+		sprintf(N_title, "%%%s%%", program_name);
+		if (cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+				|| cmyth_mysql_query_param_str(query, N_title) < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-			ref_release(esctitle);
 			ref_release(query);
+			ref_release(N_title);
 			return -1;
 		}
-		ref_release(esctitle);
+		ref_release(N_title);
 	}
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if (res == NULL)
-	{
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		return -1;
 	}
 
-        while((row = mysql_fetch_row(res))) {
-        	if (rows == n) {
-                	n++;
-                       	*prog=realloc(*prog,sizeof(**prog)*(n));
-               	}
-		sizeof_strncpy ( (*prog)[rows].title, row[0]);
-		cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].title =  %s\n",rows, (*prog)[rows].title);
+	while ((row = mysql_fetch_row(res))) {
+		if (rows == n) {
+			n++;
+			*prog = realloc(*prog, sizeof(**prog) * (n));
+		}
+		sizeof_strncpy((*prog)[rows].title, row[0]);
+		cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].title = %s\n", rows, (*prog)[rows].title);
 		rows++;
-        }
-        mysql_free_result(res);
-        cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
+	}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 	return rows;
 }
 
 int
-cmyth_mysql_get_prog_finder_time(cmyth_database_t db, cmyth_program_t **prog,  time_t starttime, char *program_name) 
+cmyth_mysql_get_prog_finder_time(cmyth_database_t db, cmyth_program_t **prog, time_t starttime, char *program_name)
 {
-	MYSQL_RES *res=NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	char *esctitle;
-	const char *query_str = "SELECT program.chanid, UNIX_TIMESTAMP(CONVERT_TZ(program.starttime,?,'SYSTEM')), UNIX_TIMESTAMP(CONVERT_TZ(program.endtime,?,'SYSTEM')), program.title, program.description, program.subtitle, program.programid, program.seriesid, program.category, channel.channum, channel.callsign, channel.name, channel.sourceid FROM program LEFT JOIN channel on program.chanid=channel.chanid WHERE starttime >= ? and title = ? ORDER BY starttime ASC";
-	int rows=0;
+	const char *query_str = "SELECT program.chanid, UNIX_TIMESTAMP(CONVERT_TZ(program.starttime,?,'SYSTEM')), UNIX_TIMESTAMP(CONVERT_TZ(program.endtime,?,'SYSTEM')), program.title, program.description, program.subtitle, program.programid, program.seriesid, program.category, program.category_type, channel.channum, channel.callsign, channel.name, channel.sourceid FROM program LEFT JOIN channel on program.chanid=channel.chanid WHERE starttime >= ? and title = ? ORDER BY starttime ASC";
+	int rows = 0;
 	int n = 0;
 	cmyth_mysql_query_t *query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	query = cmyth_mysql_query_create(db, query_str);
 
-	esctitle = cmyth_mysql_escape_chars(db, program_name);
-	if(cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-	    || cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-	    || cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-	    || cmyth_mysql_query_param_str(query, esctitle) < 0)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-		ref_release(esctitle);
+	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_str(query, program_name) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 	res = cmyth_mysql_query_result(query);
-	ref_release(esctitle);
-	ref_release(query);
-	if (res == NULL)
-	{
+	ref_release(query);
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		return -1;
 	}
 
-	while((row = mysql_fetch_row(res))) {
-        	if (rows == n) {
-                	n++;
-                       	*prog=realloc(*prog,sizeof(**prog)*(n));
-               	}
-			(*prog)[rows].chanid = atoi(row[0]);
-			(*prog)[rows].recording=0;
-			(*prog)[rows].starttime = atoi(row[1]);
-			(*prog)[rows].endtime = atoi(row[2]);
-			sizeof_strncpy ((*prog)[rows].title, row[3]);
-			sizeof_strncpy ((*prog)[rows].description, row[4]);
-			sizeof_strncpy ((*prog)[rows].subtitle, row[5]);
-			sizeof_strncpy ((*prog)[rows].programid, row[6]);
-			sizeof_strncpy ((*prog)[rows].seriesid, row[7]);
-			sizeof_strncpy ((*prog)[rows].category, row[8]);
-			(*prog)[rows].channum = atoi (row[9]);
-			sizeof_strncpy ((*prog)[rows].callsign,row[10]);
-			sizeof_strncpy ((*prog)[rows].name,row[11]);
-			(*prog)[rows].sourceid = atoi (row[12]);
-			cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].chanid =  %d\n",rows, (*prog)[rows].chanid);
-			cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].title =  %s\n",rows, (*prog)[rows].title);
-			rows++;
-        }
-        mysql_free_result(res);
-        cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
+	while ((row = mysql_fetch_row(res))) {
+		if (rows == n) {
+			n++;
+			*prog = realloc(*prog, sizeof(**prog) * (n));
+		}
+		(*prog)[rows].chanid = atol(row[0]);
+		(*prog)[rows].starttime = atol(row[1]);
+		(*prog)[rows].endtime = atol(row[2]);
+		sizeof_strncpy((*prog)[rows].title, row[3]);
+		sizeof_strncpy((*prog)[rows].description, row[4]);
+		sizeof_strncpy((*prog)[rows].subtitle, row[5]);
+		sizeof_strncpy((*prog)[rows].programid, row[6]);
+		sizeof_strncpy((*prog)[rows].seriesid, row[7]);
+		sizeof_strncpy((*prog)[rows].category, row[8]);
+		sizeof_strncpy((*prog)[rows].category_type, row[9]);
+		(*prog)[rows].channum = atol(row[10]);
+		sizeof_strncpy((*prog)[rows].callsign, row[11]);
+		sizeof_strncpy((*prog)[rows].name, row[12]);
+		(*prog)[rows].sourceid = atol(row[13]);
+		cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].chanid = %ld\n", rows, (*prog)[rows].chanid);
+		cmyth_dbg(CMYTH_DBG_DEBUG, "prog[%d].title = %s\n", rows, (*prog)[rows].title);
+		rows++;
+	}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 	return rows;
 }
 
-int 
-fill_program_recording_status(cmyth_conn_t conn, char * msg)
-{
-	int err=0;
-	fprintf (stderr, "In function : %s\n",__FUNCTION__);
-	if (!conn) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
-		return -1;
-	}
-	if ((err = cmyth_send_message(conn, msg)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-                        "%s: cmyth_send_message() failed (%d)\n",__FUNCTION__,err);
-		return err;
-	}
-	return err;
-}
 int
-cmyth_update_bookmark_setting(cmyth_database_t db, cmyth_proginfo_t prog)
+cmyth_mysql_update_bookmark_setting(cmyth_database_t db, cmyth_proginfo_t prog)
 {
 	MYSQL_RES *res = NULL;
+	MYSQL* sql = cmyth_db_get_connection(db);
 	const char *query_str = "UPDATE recorded SET bookmark = 1 WHERE chanid = ? AND starttime = ?";
 	cmyth_mysql_query_t * query;
 	time_t starttime;
 
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	starttime = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
-	query = cmyth_mysql_query_create(db,query_str);
-	if (cmyth_mysql_query_param_long(query, prog->proginfo_chanId) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0 ) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	query = cmyth_mysql_query_create(db, query_str);
+	if (cmyth_mysql_query_param_uint32(query, prog->proginfo_chanId) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -818,27 +616,31 @@
 		return -1;
 	}
 	mysql_free_result(res);
-	return (1);
+	return (int)mysql_affected_rows(sql);
 }
 
-long long 
-cmyth_get_bookmark_mark(cmyth_database_t db, cmyth_proginfo_t prog, long long bk, int mode)
+int64_t
+cmyth_mysql_get_bookmark_mark(cmyth_database_t db, cmyth_proginfo_t prog, int64_t bk, int mode)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT mark, type FROM recordedseek WHERE chanid = ? AND offset < ? AND (type = 6 or type = 9 ) AND starttime = ? ORDER by MARK DESC LIMIT 0, 1;";
 	int rows = 0;
-	long long mark=0;
+	int64_t mark = 0;
 	int rectype = 0;
 	time_t start_ts_dt;
 	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
 	start_ts_dt = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 
-	if (cmyth_mysql_query_param_long(query, prog->proginfo_chanId) < 0
-		|| cmyth_mysql_query_param_int64(query, (int64_t)bk) < 0
-		|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_mysql_query_param_uint32(query, prog->proginfo_chanId) < 0
+			|| cmyth_mysql_query_param_int64(query, bk) < 0
+			|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -849,7 +651,7 @@
 		return -1;
 	}
 	while ((row = mysql_fetch_row(res))) {
-		mark = safe_atoi(row[0]);
+		mark = safe_atoll(row[0]);
 		rectype = safe_atoi(row[1]);
 		rows++;
 	}
@@ -857,34 +659,35 @@
 
 	if (rectype == 6) {
 		if (mode == 0) {
-			mark=(mark-1)*15;
-		}
-		else if (mode == 1) {
-			mark=(mark-1)*12;
+			mark = (mark - 1) * 15;
+		} else if (mode == 1) {
+			mark = (mark - 1) * 12;
 		}
 	}
 
 	return mark;
 }
 
-int
-cmyth_get_bookmark_offset(cmyth_database_t db, long chanid, long long mark, time_t starttime, int mode)
+int64_t
+cmyth_mysql_get_bookmark_offset(cmyth_database_t db, uint32_t chanid, int64_t mark, time_t starttime, int mode)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	int offset=0;
+	int64_t offset = 0;
 	int rows = 0;
 	int rectype = 0;
-	cmyth_mysql_query_t * query;
-	
 	const char *query_str = "SELECT chanid, UNIX_TIMESTAMP(CONVERT_TZ(starttime,?,'SYSTEM')), mark, offset, type FROM recordedseek WHERE chanid = ? AND mark<= ? AND starttime = ? ORDER BY MARK DESC LIMIT 1;";
+	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-		|| cmyth_mysql_query_param_long(query, chanid) < 0
-		|| cmyth_mysql_query_param_int64(query, (int64_t)mark) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+			|| cmyth_mysql_query_param_uint32(query, chanid) < 0
+			|| cmyth_mysql_query_param_int64(query, mark) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -895,23 +698,22 @@
 		return -1;
 	}
 	while ((row = mysql_fetch_row(res))) {
-		offset = safe_atoi(row[3]);
+		offset = safe_atoll(row[3]);
 		rectype = safe_atoi(row[4]);
 		rows++;
 	}
 	if (rectype != 9) {
 		if (mode == 0) {
-			mark=(mark/15)+1;
-		}
-		else if (mode == 1) {
-			mark=(mark/12)+1;
+			mark = (mark / 15) + 1;
+		} else if (mode == 1) {
+			mark = (mark / 12) + 1;
 		}
 		query = cmyth_mysql_query_create(db, query_str);
 		if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-			|| cmyth_mysql_query_param_long(query, chanid) < 0
-			|| cmyth_mysql_query_param_int64(query, (int64_t)mark) < 0
-			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
-			cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+				|| cmyth_mysql_query_param_uint32(query, chanid) < 0
+				|| cmyth_mysql_query_param_int64(query, mark) < 0
+				|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 			ref_release(query);
 			return -1;
 		}
@@ -922,7 +724,7 @@
 			return -1;
 		}
 		while ((row = mysql_fetch_row(res))) {
-			offset = safe_atoi(row[3]);
+			offset = safe_atoll(row[3]);
 			rows++;
 		}
 	}
@@ -931,76 +733,81 @@
 }
 
 int
-cmyth_mysql_query_commbreak_count(cmyth_database_t db, int chanid, time_t start_ts_dt) {
+cmyth_mysql_query_commbreak_count(cmyth_database_t db, int32_t chanid, time_t start_ts_dt)
+{
 	MYSQL_RES *res = NULL;
 	int count = 0;
-	char * query_str;
-  cmyth_mysql_query_t * query;
-	query_str = "SELECT * FROM recordedmarkup WHERE chanid = ? AND starttime = ? AND TYPE IN ( 4 )";
+	const char * query_str = "SELECT * FROM recordedmarkup WHERE chanid = ? AND starttime = ? AND TYPE IN ( 4 )";
+	cmyth_mysql_query_t * query;
 
-	query = cmyth_mysql_query_create(db,query_str);
-	if (cmyth_mysql_query_param_int(query, chanid) < 0
-		|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
+	if (cmyth_mysql_query_param_int32(query, chanid) < 0
+			|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
 	if (res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
 		return -1;
 	}
 	count = (int)mysql_num_rows(res);
 	mysql_free_result(res);
 	return (count);
-} 
+}
 
 int
-cmyth_mysql_get_commbreak_list(cmyth_database_t db, int chanid, time_t start_ts_dt, cmyth_commbreaklist_t breaklist, int conn_version)
+cmyth_mysql_get_commbreak_list(cmyth_database_t db, uint32_t chanid, time_t start_ts_dt, cmyth_commbreaklist_t breaklist, uint32_t conn_version)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	int resolution = 30;
 	char * query_str;
-  int rows = 0;
+	int rows = 0;
 	int i;
-  cmyth_mysql_query_t * query;
+	cmyth_mysql_query_t * query;
 	cmyth_commbreak_t commbreak = NULL;
-  long long start_previous = 0;
-	long long end_previous = 0;
+	int64_t start_previous = 0;
+	int64_t end_previous = 0;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
 	if (conn_version >= 43) {
-		query_str = "SELECT m.type,m.mark,s.mark,s.offset  FROM recordedmarkup m INNER JOIN recordedseek AS s ON m.chanid = s.chanid AND m.starttime = s.starttime  WHERE m.chanid = ? AND m.starttime = ? AND m.type in (?,?) and FLOOR(m.mark/?)=FLOOR(s.mark/?) ORDER BY `m`.`mark` LIMIT 300 ";
-	}
-	else { 
+		query_str = "SELECT m.type,m.mark,s.mark,s.offset FROM recordedmarkup m INNER JOIN recordedseek AS s ON m.chanid = s.chanid AND m.starttime = s.starttime WHERE m.chanid = ? AND m.starttime = ? AND m.type in (?,?) and FLOOR(m.mark/?)=FLOOR(s.mark/?) ORDER BY `m`.`mark` LIMIT 300 ";
+	} else {
 		query_str = "SELECT m.type AS type, m.mark AS mark, s.offset AS offset FROM recordedmarkup m INNER JOIN recordedseek AS s ON (m.chanid = s.chanid AND m.starttime = s.starttime AND (FLOOR(m.mark / 15) + 1) = s.mark) WHERE m.chanid = ? AND m.starttime = ? AND m.type IN (?, ?) ORDER BY mark;";
 	}
 
-	cmyth_dbg(CMYTH_DBG_DEBUG,"%s, query=%s\n", __FUNCTION__,query_str);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s, query=%s\n", __FUNCTION__, query_str);
 
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 
-	if ((conn_version >= 43) && ( 
-		cmyth_mysql_query_param_int(query, chanid) < 0
-		|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_START) < 0
-		|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_END) < 0
-		|| cmyth_mysql_query_param_int(query, resolution) < 0
-		|| cmyth_mysql_query_param_int(query, resolution) < 0
-		)) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if ((conn_version >= 43) && (
+				cmyth_mysql_query_param_uint32(query, chanid) < 0
+				|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0
+				|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_START) < 0
+				|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_END) < 0
+				|| cmyth_mysql_query_param_int(query, resolution) < 0
+				|| cmyth_mysql_query_param_int(query, resolution) < 0
+			)) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 
 	if ((conn_version < 43) && (
-		cmyth_mysql_query_param_int(query, chanid) < 0
-		|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_START) < 0
-		|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_END) < 0
-		)) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+				cmyth_mysql_query_param_uint32(query, chanid) < 0
+				|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0
+				|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_START) < 0
+				|| cmyth_mysql_query_param_int(query, CMYTH_COMMBREAK_END) < 0
+			)) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -1012,16 +819,14 @@
 	}
 
 	if (conn_version >= 43) {
-		breaklist->commbreak_count = cmyth_mysql_query_commbreak_count(db,chanid,start_ts_dt);
-	}
-	else {
-		breaklist->commbreak_count = (long)mysql_num_rows(res) / 2;
+		breaklist->commbreak_count = cmyth_mysql_query_commbreak_count(db, chanid, start_ts_dt);
+	} else {
+		breaklist->commbreak_count = (int)mysql_num_rows(res) / 2;
 	}
 	breaklist->commbreak_list = malloc(breaklist->commbreak_count * sizeof(cmyth_commbreak_t));
 
 	if (!breaklist->commbreak_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n",
-			__FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n", __FUNCTION__);
 		return -1;
 	}
 	memset(breaklist->commbreak_list, 0, breaklist->commbreak_count * sizeof(cmyth_commbreak_t));
@@ -1035,8 +840,7 @@
 					commbreak->start_mark = safe_atoll(row[1]);
 					commbreak->start_offset = safe_atoll(row[3]);
 					start_previous = commbreak->start_mark;
-				}
-				else if (safe_atoll(row[1]) == safe_atoll(row[2])) { 
+				} else if (safe_atoll(row[1]) == safe_atoll(row[2])) {
 					commbreak = cmyth_commbreak_create();
 					commbreak->start_mark = safe_atoll(row[1]);
 					commbreak->start_offset = safe_atoll(row[3]);
@@ -1048,8 +852,7 @@
 					breaklist->commbreak_list[rows] = commbreak;
 					end_previous = commbreak->end_mark;
 					rows++;
-				}
-				else if (safe_atoll(row[1]) == safe_atoll(row[2])) {
+				} else if (safe_atoll(row[1]) == safe_atoll(row[2])) {
 					commbreak->end_mark = safe_atoll(row[1]);
 					commbreak->end_offset = safe_atoll(row[3]);
 					breaklist->commbreak_list[rows] = commbreak;
@@ -1057,17 +860,15 @@
 						rows++;
 					}
 				}
-			}
-			else {
-				cmyth_dbg(CMYTH_DBG_ERROR, "%s: Unknown COMMBREAK returned\n", 
-					__FUNCTION__);
+			} else {
+				cmyth_dbg(CMYTH_DBG_ERROR, "%s: Unknown COMMBREAK returned\n", __FUNCTION__);
 				return -1;
 			}
 			i++;
 		}
 	}
 
-	// mythtv protolcol version < 43 
+	// mythtv protolcol version < 43
 	else {
 		while ((row = mysql_fetch_row(res))) {
 			if ((i % 2) == 0) {
@@ -1096,299 +897,80 @@
 }
 
 int
-cmyth_tuner_type_check(cmyth_database_t db, cmyth_recorder_t rec, int check_tuner_type) {
-	MYSQL_RES *res=NULL;
+cmyth_mysql_tuner_type_check(cmyth_database_t db, cmyth_recorder_t rec, int check_tuner_type)
+{
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char * query_str = "SELECT cardtype from capturecard WHERE cardid=?";
 	cmyth_mysql_query_t * query;
 
-	if ( check_tuner_type == 0 ) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"MythTV Tuner check not enabled in Mythtv Options\n");
-		return (1);
+	if (check_tuner_type == 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "MythTV Tuner check not enabled in Mythtv Options\n");
+		return 1;
 	}
-	
 
-	query = cmyth_mysql_query_create(db,query_str);
-	if (cmyth_mysql_query_param_uint(query,rec->rec_id) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query failed\n",__FUNCTION__);
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
+	if (cmyth_mysql_query_param_uint32(query, rec->rec_id) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query failed\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
 	res = cmyth_mysql_query_result(query);
 
-	if(res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution\n",__FUNCTION__);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution\n", __FUNCTION__);
 		return -1;
 	}
 	row = mysql_fetch_row(res);
 	ref_release(query);
 	mysql_free_result(res);
-	if (strcmp(row[0],"MPEG") == 0) {
+	if (strcmp(row[0], "MPEG") == 0) {
 		return (1); //return the first available MPEG tuner
-	}
-	else if (strcmp(row[0],"HDHOMERUN") == 0) {
+	} else if (strcmp(row[0], "HDHOMERUN") == 0) {
 		return (1); //return the first available MPEG2TS tuner
-	}
-	else if (strcmp(row[0],"DVB") == 0) {
+	} else if (strcmp(row[0], "DVB") == 0) {
 		return (1); //return the first available DVB tuner
-	}
-	else {
+	} else {
 		return (0);
 	}
 }
 
 int
-cmyth_mythtv_remove_previous_recorded(cmyth_database_t db,char *query)
+cmyth_mysql_testdb_connection(cmyth_database_t db, char **message)
 {
-	MYSQL_RES *res=NULL;
-	char N_query[128];
-	int rows;
-
-	if(cmyth_db_check_connection(db) != 0)
-	{
-               cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n",
-                           __FUNCTION__);
-               fprintf(stderr,"%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-	       return -1;
-	}
-
-	mysql_real_escape_string(db->mysql,N_query,query,strlen(query)); 
-
-        if(mysql_query(db->mysql,query)) {
-                 cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-                           __FUNCTION__, mysql_error(db->mysql));
-		return -1;
-       	}
-	res = mysql_store_result(db->mysql);
-	rows=(int)mysql_insert_id(db->mysql);
-	if (rows <=0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_query() Failed: %s\n", 
-			__FUNCTION__, mysql_error(db->mysql));
-	}
-	mysql_free_result(res);
-
-	return rows;
-}
-
-int
-cmyth_mysql_testdb_connection(cmyth_database_t db,char **message) {
-	char *buf=ref_alloc(sizeof(char)*1001);
+	char *buf = ref_alloc(sizeof(char) * 1001);
 	if (db->mysql != NULL) {
 		if (mysql_stat(db->mysql) == NULL) {
 			cmyth_database_close(db);
 			return -1;
-			}
+		}
 	}
 	if (db->mysql == NULL) {
 		db->mysql = mysql_init(NULL);
-		if(db->mysql == NULL) {
-			fprintf(stderr,"%s: mysql_init() failed, insufficient memory?", __FUNCTION__);
+		if (db->mysql == NULL) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_init() failed, insufficient memory?", __FUNCTION__);
 			snprintf(buf, 1000, "mysql_init() failed, insufficient memory?");
-			*message=buf;
+			*message = buf;
 			return -1;
 		}
-		if (NULL == mysql_real_connect(db->mysql, db->db_host,db->db_user,db->db_pass,db->db_name,0,NULL,0)) {
-			fprintf(stderr,"%s: mysql_connect() failed: %s\n", __FUNCTION__,
-			mysql_error(db->mysql));
-			snprintf(buf, 1000, "%s",mysql_error(db->mysql));
-			fprintf (stderr,"buf = %s\n",buf);
-			*message=buf;
+		if (NULL == mysql_real_connect(db->mysql, db->db_host, db->db_user, db->db_pass, db->db_name, db->db_port, NULL, CLIENT_FOUND_ROWS)) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: mysql_connect() failed: %s\n", __FUNCTION__, mysql_error(db->mysql));
+			snprintf(buf, 1000, "%s", mysql_error(db->mysql));
+			*message = buf;
 			cmyth_database_close(db);
 			return -1;
 		}
 	}
 	snprintf(buf, 1000, "All Test Successful\n");
-	*message=buf;
+	*message = buf;
 	return 1;
 }
 
-static void
-cmyth_chanlist_destroy(cmyth_chanlist_t pl)
-{
-	int i;
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
-	}
-	for (i  = 0; i < pl->chanlist_count; ++i) {
-		if (pl->chanlist_list[i]) {
-			ref_release(pl->chanlist_list[i]);
-		}
-		pl->chanlist_list[i] = NULL;
-	}
-	if (pl->chanlist_list) {
-		free(pl->chanlist_list);
-	}
-}
-
-cmyth_chanlist_t
-cmyth_chanlist_create(void)
-{
-	cmyth_chanlist_t ret;
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	ret = ref_alloc(sizeof(*ret));
-	if (!ret) {
-		return(NULL);
-	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_chanlist_destroy);
-
-	ret->chanlist_list = NULL;
-	ret->chanlist_count = 0;
-	return ret;
-}
-
-cmyth_channel_t
-cmyth_chanlist_get_item(cmyth_chanlist_t pl, int index)
-{
-	if (!pl) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL program list\n",
-			  __FUNCTION__);
-		return NULL;
-	}
-	if (!pl->chanlist_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL list\n",
-			  __FUNCTION__);
-		return NULL;
-	}
-	if ((index < 0) || (index >= pl->chanlist_count)) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: index %d out of range\n",
-			  __FUNCTION__, index);
-		return NULL;
-	}
-	ref_hold(pl->chanlist_list[index]);
-	return pl->chanlist_list[index];
-}
-
-int
-cmyth_chanlist_get_count(cmyth_chanlist_t pl)
-{
-	if (!pl) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL program list\n",
-			  __FUNCTION__);
-		return -EINVAL;
-	}
-	return pl->chanlist_count;
-}
-
-static void
-cmyth_channel_destroy(cmyth_channel_t pl)
-{
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
-	}
-
-	if(pl->name)
-		ref_release(pl->name);
-	if(pl->callsign)
-		ref_release(pl->callsign);
-	if(pl->icon)
-		ref_release(pl->icon);
-}
-
-long
-cmyth_channel_chanid(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return -EINVAL;
-	}
-	return channel->chanid;
-}
-
-long
-cmyth_channel_channum(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return -EINVAL;
-	}
-	return channel->channum;
-}
-
-char *
-cmyth_channel_channumstr(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return NULL;
-	}
-	return channel->chanstr;
-}
-
-char *
-cmyth_channel_name(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return NULL;
-	}
-	return ref_hold(channel->name);
-}
-
-char *
-cmyth_channel_callsign(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return NULL;
-	}
-	return ref_hold(channel->callsign);
-}
-
-
-char *
-cmyth_channel_icon(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return NULL;
-	}
-	return ref_hold(channel->icon);
-}
-
-int
-cmyth_channel_visible(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return -EINVAL;
-	}
-	return channel->visible;
-}
-
 int
-cmyth_channel_sourceid(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return -EINVAL;
-	}
-	return channel->sourceid;
-}
-
-int
-cmyth_channel_multiplex(cmyth_channel_t channel)
-{
-	if (!channel) {
-		return -EINVAL;
-	}
-	return channel->multiplex;
-}
-
-cmyth_channel_t
-cmyth_channel_create(void)
-{
-	cmyth_channel_t ret = ref_alloc(sizeof(*ret));
-  memset(ret, 0, sizeof(*ret));
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_DEBUG, "%s }!\n", __FUNCTION__);
-		return NULL;
-	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_channel_destroy);
-
-	return ret;
-}
-
-
-cmyth_chanlist_t cmyth_mysql_get_chanlist(cmyth_database_t db)
+cmyth_mysql_get_chanlist(cmyth_database_t db, cmyth_chanlist_t *chanlist)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
@@ -1396,152 +978,66 @@
 	int rows = 0;
 	cmyth_mysql_query_t * query;
 	cmyth_channel_t channel;
-	cmyth_chanlist_t chanlist;
-	query = cmyth_mysql_query_create(db,query_str);
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
 	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return NULL;
+		return -1;
 	}
 
-	chanlist = cmyth_chanlist_create();
+	*chanlist = cmyth_chanlist_create();
 
-	chanlist->chanlist_count = (int)mysql_num_rows(res);
-	chanlist->chanlist_list = malloc(chanlist->chanlist_count * sizeof(cmyth_chanlist_t));
-	if (!chanlist->chanlist_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n",
-			__FUNCTION__);
-                ref_release(chanlist);
-		return NULL;
+	(*chanlist)->chanlist_count = (int)mysql_num_rows(res);
+	(*chanlist)->chanlist_list = malloc((*chanlist)->chanlist_count * sizeof(cmyth_chanlist_t));
+	if (!(*chanlist)->chanlist_list) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n", __FUNCTION__);
+		ref_release(*chanlist);
+		return -1;
 	}
-	memset(chanlist->chanlist_list, 0, chanlist->chanlist_count * sizeof(cmyth_chanlist_t));
+	memset((*chanlist)->chanlist_list, 0, (*chanlist)->chanlist_count * sizeof(cmyth_chanlist_t));
 
 	while ((row = mysql_fetch_row(res))) {
 		channel = cmyth_channel_create();
 		channel->chanid = safe_atol(row[0]);
-		channel->channum = safe_atoi(row[1]);
-		strncpy(channel->chanstr, row[1], 10);
+		channel->channum = safe_atol(row[1]);
+		channel->chanstr = ref_strdup(row[1]);
 		channel->name = ref_strdup(row[2]);
 		channel->icon = ref_strdup(row[3]);
 		channel->visible = safe_atoi(row[4]);
-		channel->sourceid = safe_atoi(row[5]);
-		channel->multiplex = safe_atoi(row[6]);
+		channel->sourceid = safe_atol(row[5]);
+		channel->multiplex = safe_atol(row[6]);
 		channel->callsign = ref_strdup(row[7]);
-		chanlist->chanlist_list[rows] = channel;
+		(*chanlist)->chanlist_list[rows] = channel;
 		rows++;
 	}
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-	return chanlist;
-}
-
-
-int cmyth_livetv_keep_recording(cmyth_recorder_t rec, cmyth_database_t db, int keep)
-{
-	cmyth_proginfo_t prog;
-	int autoexpire;
-	const char* recgroup;
-	cmyth_mysql_query_t * query;
-	time_t timestamp;
-
-	if(cmyth_db_check_connection(db) != 0)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
-		return -1;
-	}
-
-	prog = cmyth_recorder_get_cur_proginfo(rec);
-	if(!prog) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_recorder_get_cur_proginfo failed\n", __FUNCTION__);
-		return -1;
-	}
-
-	if(keep) {
-		char* str;
-		str = cmyth_conn_get_setting(rec->rec_conn, prog->proginfo_hostname, "AutoExpireDefault");
-		if(!str) {
-			cmyth_dbg(CMYTH_DBG_ERROR, "%s: failed to get AutoExpireDefault\n", __FUNCTION__);
-			ref_release(prog);
-			return -1;
-		}
-		autoexpire = atol(str);
-		recgroup = "Default";
-		ref_release(str);
-	} else {
-		autoexpire = 10000;
-		recgroup = "LiveTV";
-	}
-
-
-	timestamp = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
-
-	query = cmyth_mysql_query_create(db,"UPDATE recorded SET autoexpire = ?, recgroup = ? WHERE chanid = ? AND starttime = ?");
-
-	if(cmyth_mysql_query_param_long(query,autoexpire) < 0
-	 || cmyth_mysql_query_param_str(query,recgroup) < 0
-	 || cmyth_mysql_query_param_long(query,prog->proginfo_chanId) < 0
-	 || cmyth_mysql_query_param_unixtime(query, timestamp, db->db_tz_utc) < 0)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-		ref_release(query);
-		ref_release(prog);
-		return -1;
-	}
-
-	if(cmyth_mysql_query(query) < 0)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		ref_release(query);
-		ref_release(prog);
-		return -1;
-	}
-	ref_release(query);
-	ref_release(prog);
-
-	if(rec->rec_conn->conn_version >= 26)
-	{
-		char msg[256];
-		int err;
-		snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]SET_LIVE_RECORDING[]:[]%d",
-		 	rec->rec_id, keep);
-
-		if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
-			cmyth_dbg(CMYTH_DBG_ERROR,
-			    "%s: cmyth_send_message() failed (%d)\n",
-			    __FUNCTION__, err);
-			return -1;
-		}
-
-		if ((err=cmyth_rcv_okay(rec->rec_conn)) < 0) {
-			cmyth_dbg(CMYTH_DBG_ERROR,
-			    "%s: cmyth_rcv_okay() failed (%d)\n",
-			    __FUNCTION__, err);
-			return -1;
-		}
-	}
-	return 1;
+	return rows;
 }
 
-
-int cmyth_mysql_is_radio(cmyth_database_t db,  int chanid)
+int
+cmyth_mysql_is_radio(cmyth_database_t db, uint32_t chanid)
 {
-	cmyth_mysql_query_t * query;
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	int retval=-1;
+	int retval = 0;
+	const char *query_str = "SELECT is_audio_service FROM channelscan_channel INNER JOIN channel ON channelscan_channel.service_id=channel.serviceid WHERE channel.chanid = ? ORDER BY channelscan_channel.scanid DESC;";
+	cmyth_mysql_query_t * query;
 
-	if(cmyth_db_check_connection(db) != 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_db_check_connection failed\n", __FUNCTION__);
+	if (cmyth_database_check_version(db) < 0)
 		return -1;
-	}
 
-	query = cmyth_mysql_query_create(db,"SELECT is_audio_service FROM channelscan_channel INNER JOIN channel ON channelscan_channel.service_id=channel.serviceid WHERE channel.chanid = ? ORDER BY channelscan_channel.scanid DESC;");
+	query = cmyth_mysql_query_create(db, query_str);
 
-	if(cmyth_mysql_query_param_long(query,chanid) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_mysql_query_param_uint32(query, chanid) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -1557,281 +1053,232 @@
 	if ((row = mysql_fetch_row(res))) {
 		retval = safe_atoi(row[0]);
 	} else {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s, Channum %i not found\n", __FUNCTION__,chanid);
-		return -1;
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s, Channum %ld not found\n", __FUNCTION__, chanid);
+		retval = 0;
 	}
 	mysql_free_result(res);
 	return retval;
 }
 
-
-static void
-cmyth_timer_destroy(cmyth_timer_t pl)
-{
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
-	}
-
-	if(pl->title)
-		ref_release(pl->title);
-	if(pl->description)
-		ref_release(pl->description);
-	if(pl->category)
-		ref_release(pl->category);
-  if(pl->rec_group)
-    ref_release(pl->rec_group);
-  if(pl->store_group)
-    ref_release(pl->store_group);
-  if(pl->play_group)
-    ref_release(pl->play_group);
-}
-
-
-cmyth_timer_t
-cmyth_timer_create(void)
+int
+cmyth_mysql_get_recordingrules(cmyth_database_t db, cmyth_recordingrulelist_t *rrl)
 {
-	cmyth_timer_t ret = ref_alloc(sizeof(*ret));
-	memset(ret, 0, sizeof(*ret));
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_DEBUG, "%s }!\n", __FUNCTION__);
-		return NULL;
-	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_timer_destroy);
-
-	return ret;
-}
-
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	char *query_str;
+	int rows = 0;
+	cmyth_recordingrule_t rr;
+	cmyth_mysql_query_t * query;
 
-static void
-cmyth_timerlist_destroy(cmyth_timerlist_t pl)
-{
-	int i;
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
+	if (db->db_version >= 1278) {
+		query_str = "SELECT recordid, chanid, UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(startdate,starttime),?,'SYSTEM')), "
+			"UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(enddate,endtime),?,'SYSTEM')),title,description, type, category, "
+			"subtitle, recpriority, startoffset, endoffset, search, inactive, station, dupmethod, dupin, recgroup, "
+			"storagegroup, playgroup, autotranscode, (autouserjob1 | (autouserjob2 << 1) | (autouserjob3 << 2) | "
+			"(autouserjob4 << 3)), autocommflag, autoexpire, maxepisodes, maxnewest, transcoder, profile, prefinput, "
+			"autometadata, inetref, season, episode , filter "
+			"FROM record ORDER BY recordid";
 	}
-	for (i  = 0; i < pl->timerlist_count; ++i) {
-		if (pl->timerlist_list[i]) {
-			ref_release(pl->timerlist_list[i]);
-		}
-		pl->timerlist_list[i] = NULL;
-	}
-	if (pl->timerlist_list) {
-		free(pl->timerlist_list);
-	}
-}
-
-cmyth_timerlist_t
-cmyth_timerlist_create(void)
-{
-	cmyth_timerlist_t ret;
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	ret = ref_alloc(sizeof(*ret));
-	if (!ret) {
-		return(NULL);
+	else {
+		query_str = "SELECT recordid, chanid, UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(startdate,starttime),?,'SYSTEM')), "
+			"UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(enddate,endtime),?,'SYSTEM')),title,description, type, category, "
+			"subtitle, recpriority, startoffset, endoffset, search, inactive, station, dupmethod, dupin, recgroup, "
+			"storagegroup, playgroup, autotranscode, (autouserjob1 | (autouserjob2 << 1) | (autouserjob3 << 2) | "
+			"(autouserjob4 << 3)), autocommflag, autoexpire, maxepisodes, maxnewest, transcoder, profile, prefinput "
+			"FROM record ORDER BY recordid";
 	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_timerlist_destroy);
-
-	ret->timerlist_list = NULL;
-	ret->timerlist_count = 0;
-	return ret;
-}
-
 
-cmyth_timerlist_t
-cmyth_mysql_get_timers(cmyth_database_t db)
-{
-	MYSQL_RES *res= NULL;
-	MYSQL_ROW row;
-	const char *query_str = "SELECT recordid, chanid, UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(startdate,starttime),?,'SYSTEM')), UNIX_TIMESTAMP(CONVERT_TZ(ADDTIME(enddate,endtime),?,'SYSTEM')),title,description, type, category, subtitle, recpriority, startoffset, endoffset, search, inactive, station, dupmethod, dupin, recgroup, storagegroup, playgroup, autotranscode, (autouserjob1 | (autouserjob2 << 1) | (autouserjob3 << 2) | (autouserjob4 << 3)), autocommflag, autoexpire, maxepisodes, maxnewest, transcoder FROM record ORDER BY recordid";
-	int rows=0;
-  cmyth_timer_t timer;
-	cmyth_timerlist_t timerlist;
-
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-		|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0)
-	{
+			|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
-		return NULL;
+		return -1;
 	}
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if(res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return NULL;
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
-	timerlist = cmyth_timerlist_create();
+	*rrl = cmyth_recordingrulelist_create();
 
-	timerlist->timerlist_count = (int)mysql_num_rows(res);
-	timerlist->timerlist_list = malloc(timerlist->timerlist_count * sizeof(cmyth_timerlist_t));
-	if (!timerlist->timerlist_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n",
-			  __FUNCTION__);
-		ref_release(timerlist);
-		return NULL;
+	(*rrl)->recordingrulelist_count = (int)mysql_num_rows(res);
+	(*rrl)->recordingrulelist_list = malloc((*rrl)->recordingrulelist_count * sizeof(cmyth_recordingrulelist_t));
+	if (!(*rrl)->recordingrulelist_list) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for recschedule list\n", __FUNCTION__);
+		ref_release(*rrl);
+		return -1;
 	}
-	memset(timerlist->timerlist_list, 0, timerlist->timerlist_count * sizeof(cmyth_timerlist_t));
+	memset((*rrl)->recordingrulelist_list, 0, (*rrl)->recordingrulelist_count * sizeof(cmyth_recordingrulelist_t));
 
 	while ((row = mysql_fetch_row(res))) {
-		timer = cmyth_timer_create();
-		timer->recordid = safe_atol(row[0]);
-		timer->chanid = safe_atoi(row[1]);
-		timer->starttime = (time_t)safe_atol(row[2]);
-		timer->endtime = (time_t)safe_atol(row[3]);
-		timer->title = ref_strdup(row[4]);
-		timer->description = ref_strdup(row[5]);
-		timer->type = safe_atoi(row[6]);
-		timer->category = ref_strdup(row[7]);
-		timer->subtitle = ref_strdup(row[8]);
-		timer->priority = safe_atoi(row[9]);
-		timer->startoffset = safe_atoi(row[10]);
-		timer->endoffset = safe_atoi(row[11]);
-		timer->searchtype = safe_atoi(row[12]);
-		timer->inactive = safe_atoi(row[13]);
-		timer->callsign = ref_strdup(row[14]);
-		timer->dup_method = safe_atoi(row[15]);
-		timer->dup_in = safe_atoi(row[16]);
-		timer->rec_group = ref_strdup(row[17]);
-		timer->store_group = ref_strdup(row[18]);
-		timer->play_group = ref_strdup(row[19]);
-		timer->autotranscode = safe_atoi(row[20]);
-		timer->userjobs = safe_atoi(row[21]);
-		timer->autocommflag = safe_atoi(row[22]);
-		timer->autoexpire = safe_atoi(row[23]);
-		timer->maxepisodes = safe_atoi(row[24]);
-		timer->maxnewest = safe_atoi(row[25]);
-		timer->transcoder = safe_atoi(row[26]);
-		timerlist->timerlist_list[rows] = timer;
+		rr = cmyth_recordingrule_create();
+		rr->recordid = safe_atol(row[0]);
+		rr->chanid = safe_atol(row[1]);
+		rr->starttime = cmyth_timestamp_from_unixtime((time_t)safe_atol(row[2]));
+		rr->endtime = cmyth_timestamp_from_unixtime((time_t)safe_atol(row[3]));
+		rr->title = ref_strdup(row[4]);
+		rr->description = ref_strdup(row[5]);
+		rr->type = safe_atoi(row[6]);
+		rr->category = ref_strdup(row[7]);
+		rr->subtitle = ref_strdup(row[8]);
+		rr->recpriority = safe_atoi(row[9]);
+		rr->startoffset = safe_atoi(row[10]);
+		rr->endoffset = safe_atoi(row[11]);
+		rr->searchtype = safe_atoi(row[12]);
+		rr->inactive = safe_atoi(row[13]);
+		rr->callsign = ref_strdup(row[14]);
+		rr->dupmethod = safe_atoi(row[15]);
+		rr->dupin = safe_atoi(row[16]);
+		rr->recgroup = ref_strdup(row[17]);
+		rr->storagegroup = ref_strdup(row[18]);
+		rr->playgroup = ref_strdup(row[19]);
+		rr->autotranscode = safe_atoi(row[20]);
+		rr->userjobs = safe_atoi(row[21]);
+		rr->autocommflag = safe_atoi(row[22]);
+		rr->autoexpire = safe_atoi(row[23]);
+		rr->maxepisodes = safe_atol(row[24]);
+		rr->maxnewest = safe_atoi(row[25]);
+		rr->transcoder = safe_atol(row[26]);
+		rr->profile = ref_strdup(row[27]);
+		rr->prefinput = safe_atol(row[28]);
+		if (db->db_version >= 1278) {
+			rr->autometadata = safe_atoi(row[29]);
+			rr->inetref = ref_strdup(row[30]);
+			rr->season = safe_atoi(row[31]);
+			rr->episode = safe_atoi(row[32]);
+			rr->filter = safe_atol(row[33]);
+		}
+		else {
+			rr->autometadata = 0;
+			rr->inetref = ref_strdup("");
+			rr->season = 0;
+			rr->episode = 0;
+			rr->filter = 0;
+		}
+		(*rrl)->recordingrulelist_list[rows] = rr;
 		rows++;
 	}
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-	return timerlist;
+	return rows;
 }
 
-
 int
-cmyth_mysql_add_timer(cmyth_database_t db, int chanid,char* callsign, char* description, time_t starttime, time_t endtime,char* title,char* category,int type,char* subtitle, int priority, int startoffset, int endoffset, int searchtype, int inactive,
-  int dup_method,
-  int dup_in,
-  char* rec_group,
-  char* store_group,
-  char* play_group,
-  int autotranscode,
-  int userjobs,
-  int autocommflag,
-  int autoexpire,
-  int maxepisodes,
-  int maxnewest,
-  int transcoder)
-{
-	int ret = -1;
-	int id=0;
-	MYSQL* sql=cmyth_db_get_connection(db);
-	const char *query_str = "INSERT INTO record (record.type, chanid, starttime, startdate, endtime, enddate, title, description, category, findid, findtime, station, subtitle, recpriority, startoffset, endoffset, search, inactive, dupmethod, dupin, recgroup, storagegroup, playgroup, autotranscode, autouserjob1, autouserjob2, autouserjob3, autouserjob4, autocommflag, autoexpire, maxepisodes, maxnewest, transcoder) VALUES (?, ?, TIME(?), DATE(?), TIME(?), DATE(?), ?, ?, ?, TO_DAYS(DATE(?)), TIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,?, ?, ?, ?);";
-
-	char* esctitle = cmyth_mysql_escape_chars(db,title);
-	char* escdescription = cmyth_mysql_escape_chars(db,description);
-	char* esccategory = cmyth_mysql_escape_chars(db,category);
-	char* esccallsign=cmyth_mysql_escape_chars(db,callsign);
-	char* escsubtitle = cmyth_mysql_escape_chars(db,subtitle);
-
-	char* escrec_group = cmyth_mysql_escape_chars(db,rec_group);
-	char* escstore_group = cmyth_mysql_escape_chars(db,store_group);
-	char* escplay_group = cmyth_mysql_escape_chars(db,play_group);
-
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
-	if ( cmyth_mysql_query_param_long(query, type) < 0
-		|| cmyth_mysql_query_param_long(query, chanid) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_str(query, title ) < 0
-		|| cmyth_mysql_query_param_str(query, description ) < 0
-		|| cmyth_mysql_query_param_str(query, category ) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, 0) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, 0) < 0
-		|| cmyth_mysql_query_param_str(query, callsign ) < 0
-		|| cmyth_mysql_query_param_str(query, subtitle ) < 0
-		|| cmyth_mysql_query_param_long(query, priority ) < 0
-		|| cmyth_mysql_query_param_long(query, startoffset ) < 0
-		|| cmyth_mysql_query_param_long(query, endoffset ) < 0
-		|| cmyth_mysql_query_param_long(query, searchtype ) < 0
-		|| cmyth_mysql_query_param_long(query, inactive ) < 0
-
-		|| cmyth_mysql_query_param_long(query, dup_method ) < 0
-		|| cmyth_mysql_query_param_long(query, dup_in ) < 0
-		|| cmyth_mysql_query_param_str(query, rec_group ) < 0
-		|| cmyth_mysql_query_param_str(query, store_group ) < 0
-		|| cmyth_mysql_query_param_str(query, play_group ) < 0
-		|| cmyth_mysql_query_param_long(query, autotranscode ) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 1) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 2) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 4) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 8) < 0
-		|| cmyth_mysql_query_param_long(query, autocommflag ) < 0
-		|| cmyth_mysql_query_param_long(query, autoexpire ) < 0
-		|| cmyth_mysql_query_param_long(query, maxepisodes ) < 0
-		|| cmyth_mysql_query_param_long(query, maxnewest ) < 0
-		|| cmyth_mysql_query_param_long(query, transcoder ) < 0
-		) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-		ref_release(query);
-		ref_release(esctitle);
-		ref_release(escdescription);
-		ref_release(esccategory);
-		ref_release(esccallsign);
-		ref_release(escsubtitle);
-		ref_release(escrec_group);
-		ref_release(escstore_group);
-		ref_release(escplay_group);
+cmyth_mysql_add_recordingrule(cmyth_database_t db, cmyth_recordingrule_t rr)
+{
+	int ret;
+	MYSQL* sql = cmyth_db_get_connection(db);
+	char *query_str;
+	cmyth_mysql_query_t * query;
+	time_t starttime;
+	time_t endtime;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	if (db->db_version >= 1278) {
+		query_str = "INSERT INTO record (record.type, chanid, starttime, startdate, endtime, enddate, title, "
+			"description, category, findid, findtime, station, subtitle, recpriority, startoffset, endoffset, "
+			"search, inactive, dupmethod, dupin, recgroup, storagegroup, playgroup, autotranscode, autouserjob1, "
+			"autouserjob2, autouserjob3, autouserjob4, autocommflag, autoexpire, maxepisodes, maxnewest, transcoder, "
+			"profile, prefinput, autometadata, inetref, season, episode, filter) "
+			"VALUES (?, ?, TIME(?), DATE(?), TIME(?), DATE(?), ?, ?, ?, TO_DAYS(DATE(?)), TIME(?), "
+			"?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
+	}
+	else {
+		query_str = "INSERT INTO record (record.type, chanid, starttime, startdate, endtime, enddate, title, "
+			"description, category, findid, findtime, station, subtitle, recpriority, startoffset, endoffset, "
+			"search, inactive, dupmethod, dupin, recgroup, storagegroup, playgroup, autotranscode, autouserjob1, "
+			"autouserjob2, autouserjob3, autouserjob4, autocommflag, autoexpire, maxepisodes, maxnewest, transcoder, "
+			"profile, prefinput) "
+			"VALUES (?, ?, TIME(?), DATE(?), TIME(?), DATE(?), ?, ?, ?, TO_DAYS(DATE(?)), TIME(?), "
+			"?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?, ?, ?, ?, ?);";
+	}
+
+	starttime = cmyth_timestamp_to_unixtime(rr->starttime);
+	endtime = cmyth_timestamp_to_unixtime(rr->endtime);
+
+	query = cmyth_mysql_query_create(db, query_str);
+	if ((cmyth_mysql_query_param_uint(query, rr->type) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->chanid) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_str(query, rr->title) < 0
+			|| cmyth_mysql_query_param_str(query, rr->description) < 0
+			|| cmyth_mysql_query_param_str(query, rr->category) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, 0) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, 0) < 0
+			|| cmyth_mysql_query_param_str(query, rr->callsign) < 0
+			|| cmyth_mysql_query_param_str(query, rr->subtitle) < 0
+			|| cmyth_mysql_query_param_int(query, rr->recpriority) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->startoffset) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->endoffset) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->searchtype) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->inactive) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->dupmethod) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->dupin) < 0
+			|| cmyth_mysql_query_param_str(query, rr->recgroup) < 0
+			|| cmyth_mysql_query_param_str(query, rr->storagegroup) < 0
+			|| cmyth_mysql_query_param_str(query, rr->playgroup) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autotranscode) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 1) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 2) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 4) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 8) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autocommflag) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autoexpire) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->maxepisodes) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->maxnewest) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->transcoder) < 0
+			|| cmyth_mysql_query_param_str(query, rr->profile) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->prefinput) < 0)
+			|| (db->db_version >= 1278
+				&& (cmyth_mysql_query_param_uint(query, rr->autometadata) < 0
+				|| cmyth_mysql_query_param_str(query, rr->inetref) < 0
+				|| cmyth_mysql_query_param_uint(query, rr->season) < 0
+				|| cmyth_mysql_query_param_uint(query, rr->episode) < 0
+				|| cmyth_mysql_query_param_uint32(query, rr->filter) < 0))) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
 		return -1;
 	}
 
 	ret = cmyth_mysql_query(query);
 
 	ref_release(query);
-	ref_release(esctitle);
-	ref_release(escdescription);
-	ref_release(esccategory);
-	ref_release(esccallsign);
-	ref_release(escsubtitle);
-
-	ref_release(escrec_group);
-	ref_release(escstore_group);
-	ref_release(escplay_group);
 
-	if (ret!=0)
+	if (ret != 0)
 		return -1;
 
-	id = (int)mysql_insert_id(sql);
+	rr->recordid = (uint32_t)mysql_insert_id(sql);
 
-	return id;
+	return (int)mysql_affected_rows(sql);
 }
 
 int
-cmyth_mysql_delete_timer(cmyth_database_t db, int recordid)
+cmyth_mysql_delete_recordingrule(cmyth_database_t db, uint32_t recordid)
 {
-	int ret = -1;
+	int ret;
+	MYSQL* sql = cmyth_db_get_connection(db);
 	const char *query_str = "DELETE FROM record WHERE recordid = ?;";
-
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
-	if (cmyth_mysql_query_param_long(query, recordid) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
+	if (cmyth_mysql_query_param_uint32(query, recordid) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
 		return -1;
 	}
@@ -1843,539 +1290,466 @@
 		return -1;
 	}
 
-	return 0;
+	return (int)mysql_affected_rows(sql);
 }
 
 int
-cmyth_mysql_update_timer(cmyth_database_t db, int recordid, int chanid, char* callsign, char* description, time_t starttime, time_t endtime, char* title, char* category, int type, char* subtitle, int priority, int startoffset, int endoffset, int searchtype, int inactive,
-  int dup_method,
-  int dup_in,
-  char* rec_group,
-  char* store_group,
-  char* play_group,
-  int autotranscode,
-  int userjobs,
-  int autocommflag,
-  int autoexpire,
-  int maxepisodes,
-  int maxnewest,
-  int transcoder)
-{
-	int ret = -1;
-
-	const char *query_str = "UPDATE record SET record.type = ?, chanid = ?, starttime = TIME(?), startdate = DATE(?), endtime = TIME(?), enddate = DATE(?) ,title = ?, description = ?, category = ?, subtitle = ?, recpriority = ?, startoffset = ?, endoffset = ?, search = ?, inactive = ?, station = ?, dupmethod = ?, dupin = ?, recgroup = ?, storagegroup = ?, playgroup = ?, autotranscode = ?, autouserjob1 = ?, autouserjob2 = ?, autouserjob3 = ?, autouserjob4 = ?, autocommflag = ?, autoexpire = ?, maxepisodes = ?, maxnewest = ?, transcoder = ? WHERE recordid = ? ;";
-
-	char* esctitle=cmyth_mysql_escape_chars(db,title);
-	char* escdescription=cmyth_mysql_escape_chars(db,description);
-	char* esccategory=cmyth_mysql_escape_chars(db,category);
-	char* esccallsign=cmyth_mysql_escape_chars(db,callsign);
-	char* escsubtitle=cmyth_mysql_escape_chars(db,subtitle);
-
-	char* escrec_group = cmyth_mysql_escape_chars(db,rec_group);
-	char* escstore_group = cmyth_mysql_escape_chars(db,store_group);
-	char* escplay_group = cmyth_mysql_escape_chars(db,play_group);
-
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
-	if ( cmyth_mysql_query_param_long(query, type) < 0
-		|| cmyth_mysql_query_param_long(query, chanid) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
-		|| cmyth_mysql_query_param_str(query, title ) < 0
-		|| cmyth_mysql_query_param_str(query, description ) < 0
-		|| cmyth_mysql_query_param_str(query, category ) < 0
-		|| cmyth_mysql_query_param_str(query, subtitle ) < 0
-		|| cmyth_mysql_query_param_long(query, priority ) < 0
-		|| cmyth_mysql_query_param_long(query, startoffset ) < 0
-		|| cmyth_mysql_query_param_long(query, endoffset ) < 0
-		|| cmyth_mysql_query_param_long(query, searchtype ) < 0
-		|| cmyth_mysql_query_param_long(query, inactive ) < 0
-		|| cmyth_mysql_query_param_str(query, callsign ) < 0
-
-		|| cmyth_mysql_query_param_long(query, dup_method ) < 0
-		|| cmyth_mysql_query_param_long(query, dup_in ) < 0
-		|| cmyth_mysql_query_param_str(query, rec_group ) < 0
-		|| cmyth_mysql_query_param_str(query, store_group ) < 0
-		|| cmyth_mysql_query_param_str(query, play_group ) < 0
-		|| cmyth_mysql_query_param_long(query, autotranscode ) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 1) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 2) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 4) < 0
-		|| cmyth_mysql_query_param_long(query, userjobs & 8) < 0
-		|| cmyth_mysql_query_param_long(query, autocommflag ) < 0
-		|| cmyth_mysql_query_param_long(query, autoexpire ) < 0
-		|| cmyth_mysql_query_param_long(query, maxepisodes ) < 0
-		|| cmyth_mysql_query_param_long(query, maxnewest ) < 0
-		|| cmyth_mysql_query_param_long(query, transcoder ) < 0
-
-		|| cmyth_mysql_query_param_long(query, recordid) < 0
-		) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-		ref_release(query);
-		ref_release(esctitle);
-		ref_release(escdescription);
-		ref_release(esccategory);
-		ref_release(esccallsign);
-		ref_release(escsubtitle);
-		ref_release(escrec_group);
-		ref_release(escstore_group);
-		ref_release(escplay_group);
-		return -1;
-	}
-
-	ret = cmyth_mysql_query(query);
-
-	ref_release(query);
-	ref_release(esctitle);
-	ref_release(escdescription);
-	ref_release(esccategory);
-	ref_release(esccallsign);
-	ref_release(escsubtitle);
-
-	ref_release(escrec_group);
-	ref_release(escstore_group);
-	ref_release(escplay_group);
+cmyth_mysql_update_recordingrule(cmyth_database_t db, cmyth_recordingrule_t rr)
+{
+	int ret;
+	MYSQL* sql = cmyth_db_get_connection(db);
+	char *query_str;
+	cmyth_mysql_query_t * query;
+	time_t starttime;
+	time_t endtime;
 
-	if (ret == -1) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+	if (cmyth_database_check_version(db) < 0)
 		return -1;
-	}
 
-	return 0;
-}
-
-
-int cmyth_timer_recordid(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+	if (db->db_version >= 1278) {
+		query_str = "UPDATE record SET record.type = ?, chanid = ?, starttime = TIME(?), startdate = DATE(?), "
+			"endtime = TIME(?), enddate = DATE(?) ,title = ?, description = ?, category = ?, subtitle = ?, "
+			"recpriority = ?, startoffset = ?, endoffset = ?, search = ?, inactive = ?, station = ?, "
+			"dupmethod = ?, dupin = ?, recgroup = ?, storagegroup = ?, playgroup = ?, autotranscode = ?, "
+			"autouserjob1 = ?, autouserjob2 = ?, autouserjob3 = ?, autouserjob4 = ?, autocommflag = ?, "
+			"autoexpire = ?, maxepisodes = ?, maxnewest = ?, transcoder = ?, profile = ?, prefinput = ?, "
+			"autometadata = ?, inetref = ?, season = ?, episode = ?, filter = ? "
+			"WHERE recordid = ? ;";
 	}
-	return timer->recordid;
-}
-
-
-int cmyth_timer_chanid(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+	else {
+		query_str = "UPDATE record SET record.type = ?, chanid = ?, starttime = TIME(?), startdate = DATE(?), "
+			"endtime = TIME(?), enddate = DATE(?) ,title = ?, description = ?, category = ?, subtitle = ?, "
+			"recpriority = ?, startoffset = ?, endoffset = ?, search = ?, inactive = ?, station = ?, "
+			"dupmethod = ?, dupin = ?, recgroup = ?, storagegroup = ?, playgroup = ?, autotranscode = ?, "
+			"autouserjob1 = ?, autouserjob2 = ?, autouserjob3 = ?, autouserjob4 = ?, autocommflag = ?, "
+			"autoexpire = ?, maxepisodes = ?, maxnewest = ?, transcoder = ?, profile = ?, prefinput = ? "
+			"WHERE recordid = ? ;";
 	}
-	return timer->chanid;
-}
+	starttime = cmyth_timestamp_to_unixtime(rr->starttime);
+	endtime = cmyth_timestamp_to_unixtime(rr->endtime);
 
-char* cmyth_timer_callsign(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
+	query = cmyth_mysql_query_create(db, query_str);
+	if ((cmyth_mysql_query_param_uint(query, rr->type) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->chanid) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_unixtime(query, endtime, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_str(query, rr->title) < 0
+			|| cmyth_mysql_query_param_str(query, rr->description) < 0
+			|| cmyth_mysql_query_param_str(query, rr->category) < 0
+			|| cmyth_mysql_query_param_str(query, rr->subtitle) < 0
+			|| cmyth_mysql_query_param_int(query, rr->recpriority) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->startoffset) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->endoffset) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->searchtype) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->inactive) < 0
+			|| cmyth_mysql_query_param_str(query, rr->callsign) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->dupmethod) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->dupin) < 0
+			|| cmyth_mysql_query_param_str(query, rr->recgroup) < 0
+			|| cmyth_mysql_query_param_str(query, rr->storagegroup) < 0
+			|| cmyth_mysql_query_param_str(query, rr->playgroup) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autotranscode) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 1) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 2) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 4) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->userjobs & 8) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autocommflag) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->autoexpire) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->maxepisodes) < 0
+			|| cmyth_mysql_query_param_uint(query, rr->maxnewest) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->transcoder) < 0
+			|| cmyth_mysql_query_param_str(query, rr->playgroup) < 0
+			|| cmyth_mysql_query_param_uint32(query, rr->prefinput) < 0)
+			|| (db->db_version >= 1278
+				&& ( cmyth_mysql_query_param_uint(query, rr->autometadata) < 0
+				|| cmyth_mysql_query_param_str(query, rr->inetref) < 0
+				|| cmyth_mysql_query_param_uint(query, rr->season) < 0
+				|| cmyth_mysql_query_param_uint(query, rr->episode) < 0
+				|| cmyth_mysql_query_param_uint32(query, rr->filter) < 0))
+			|| cmyth_mysql_query_param_uint32(query, rr->recordid) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
 	}
-	return ref_hold(timer->callsign);
-}
 
-time_t cmyth_timer_starttime(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->starttime;
-}
+	ret = cmyth_mysql_query(query);
 
-time_t cmyth_timer_endtime(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->endtime;
-}
+	ref_release(query);
 
-char* cmyth_timer_title(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
+	if (ret == -1) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
-	return ref_hold(timer->title);
-}
 
-char* cmyth_timer_description(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
-	}
-	return ref_hold(timer->description);
+	return (int)mysql_affected_rows(sql);
 }
 
-int cmyth_timer_type(cmyth_timer_t timer)
+/*
+ * cmyth_mysql_recordingrule_from_template()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Returns a recording rule initialized from template.
+ *
+ * Success: returns 0 for template unavailable else 1
+ *
+ * Failure: -1
+ */
+int
+cmyth_mysql_recordingrule_from_template(cmyth_database_t db, const char *category, const char *category_type, cmyth_recordingrule_t *rr)
 {
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->type;
-}
-
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	char *query_str;
+	int ret = 0;
+	cmyth_mysql_query_t * query;
+	char *buf;
+	uint32_t recordid;
 
-char* cmyth_timer_category(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
-	}
-	return ref_hold(timer->category);
-}
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-char* cmyth_timer_subtitle(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
-	}
-	return ref_hold(timer->subtitle);
-}
+	*rr = cmyth_recordingrule_init();
+	if (!*rr)
+		return -1;
 
-int cmyth_timer_priority(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->priority;
-}
+	if (db->db_version >= 1302) {
+		query_str = "SELECT recordid, recpriority, startoffset, endoffset, search, dupmethod, dupin, recgroup, storagegroup, "
+			"playgroup, autotranscode, (autouserjob1 | (autouserjob2 << 1) | (autouserjob3 << 2) | (autouserjob4 << 3)), "
+			"autocommflag, autoexpire, profile, prefinput, autometadata, maxepisodes, maxnewest, filter, "
+			"(category = ?) AS catmatch, (category = ?) AS typematch "
+			"FROM record WHERE type = ? AND (category = ? OR category = ? OR category = 'Default') "
+			"ORDER BY catmatch DESC, typematch DESC";
 
-int cmyth_timer_startoffset(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->startoffset;
-}
+		query = cmyth_mysql_query_create(db, query_str);
+		if (cmyth_mysql_query_param_str(query, category) < 0
+			|| cmyth_mysql_query_param_str(query, category_type) < 0
+			|| cmyth_mysql_query_param_uint(query, RRULE_TEMPLATE_RECORD) < 0
+			|| cmyth_mysql_query_param_str(query, category) < 0
+			|| cmyth_mysql_query_param_str(query, category_type) < 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+			ref_release(query);
+			return -1;
+		}
 
-int cmyth_timer_endoffset(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->endoffset;
-}
+		res = cmyth_mysql_query_result(query);
+		ref_release(query);
 
-int cmyth_timer_searchtype(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->searchtype;
-}
+		if (res == NULL) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+			return -1;
+		}
 
-int cmyth_timer_inactive(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+		if ((row = mysql_fetch_row(res))) {
+			recordid = safe_atol(row[0]);
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use record template id: %"PRIu32"\n", __FUNCTION__, recordid);
+			(*rr)->type = RRULE_TEMPLATE_RECORD;
+			(*rr)->recpriority = safe_atoi(row[1]);
+			(*rr)->startoffset = safe_atoi(row[2]);
+			(*rr)->endoffset = safe_atoi(row[3]);
+			(*rr)->searchtype = safe_atoi(row[4]);
+			(*rr)->dupmethod = safe_atoi(row[5]);
+			(*rr)->dupin = safe_atoi(row[6]);
+			(*rr)->recgroup = ref_strdup(row[7]);
+			(*rr)->storagegroup = ref_strdup(row[8]);
+			(*rr)->playgroup = ref_strdup(row[9]);
+			(*rr)->autotranscode = safe_atoi(row[10]);
+			(*rr)->userjobs = safe_atoi(row[11]);
+			(*rr)->autocommflag = safe_atoi(row[12]);
+			(*rr)->autoexpire = safe_atoi(row[13]);
+			(*rr)->profile = ref_strdup(row[14]);
+			(*rr)->prefinput = safe_atol(row[15]);
+			(*rr)->autometadata = safe_atoi(row[16]);
+			(*rr)->maxepisodes = safe_atol(row[17]);
+			(*rr)->maxnewest = safe_atoi(row[18]);
+			(*rr)->filter = safe_atol(row[19]);
+			ret = 1;
+		}
+		mysql_free_result(res);
 	}
-	return timer->inactive;
-}
-
-int cmyth_timer_dup_method(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+	else {
+		if (cmyth_mysql_get_setting(db, "AutoRunUserJob1", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoRunUserJob1: %s\n", __FUNCTION__, buf);
+			(*rr)->userjobs |= (atoi(buf) == 1 ? 1 : 0 );
+		}
+		if (cmyth_mysql_get_setting(db, "AutoRunUserJob2", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoRunUserJob2: %s\n", __FUNCTION__, buf);
+			(*rr)->userjobs |= (atoi(buf) == 1 ? 1 : 0 ) << 1;
+		}
+		if (cmyth_mysql_get_setting(db, "AutoRunUserJob3", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoRunUserJob3: %s\n", __FUNCTION__, buf);
+			(*rr)->userjobs |= (atoi(buf) == 1 ? 1 : 0 ) << 2;
+		}
+		if (cmyth_mysql_get_setting(db, "AutoRunUserJob4", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoRunUserJob4: %s\n", __FUNCTION__, buf);
+			(*rr)->userjobs |= (atoi(buf) == 1 ? 1 : 0 ) << 3;
+		}
+		if (cmyth_mysql_get_setting(db, "AutoTranscode", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoTranscode: %s\n", __FUNCTION__, buf);
+			(*rr)->autotranscode = atoi(buf);
+		}
+		if (cmyth_mysql_get_setting(db, "DefaultTranscoder", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting DefaultTranscoder: %s\n", __FUNCTION__, buf);
+			(*rr)->transcoder = atol(buf);
+		}
+		if (cmyth_mysql_get_setting(db, "AutoCommercialFlag", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoCommercialFlag: %s\n", __FUNCTION__, buf);
+			(*rr)->autocommflag = atoi(buf);
+		}
+		if (cmyth_mysql_get_setting(db, "AutoExpireDefault", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoExpireDefault: %s\n", __FUNCTION__, buf);
+			(*rr)->autoexpire = atoi(buf);
+		}
+		if (db->db_version >= 1278 && cmyth_mysql_get_setting(db, "AutoMetadataLookup", &buf) > 0) {
+			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: use setting AutoMetadataLookup: %s\n", __FUNCTION__, buf);
+			(*rr)->autometadata = atoi(buf);
+		}
+		ret = 1;
 	}
-	return timer->dup_method;
+	return ret;
 }
 
-int cmyth_timer_dup_in(cmyth_timer_t timer)
+int
+cmyth_mysql_get_channelgroups(cmyth_database_t db, cmyth_channelgroup_t **changroups)
 {
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->dup_in;
-}
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	const char *query_str = "SELECT grpid, name FROM channelgroupnames";
+	int rows = 0;
+	cmyth_channelgroup_t *ret;
+	cmyth_mysql_query_t * query;
 
-char* cmyth_timer_rec_group(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
-	}
-	return ref_hold(timer->rec_group);
-}
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-char* cmyth_timer_store_group(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
-	}
-	return ref_hold(timer->store_group);
-}
+	query = cmyth_mysql_query_create(db, query_str);
 
-char* cmyth_timer_play_group(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return NULL;
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
-	return ref_hold(timer->play_group);
-}
 
-int cmyth_timer_autotranscode(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->autotranscode;
-}
+	ret = ref_alloc(sizeof(cmyth_channelgroup_t) * (int)mysql_num_rows(res));
 
-int cmyth_timer_userjobs(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
+		mysql_free_result(res);
+		return -1;
 	}
-	return timer->userjobs;
-}
 
-int cmyth_timer_autocommflag(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
+	while ((row = mysql_fetch_row(res))) {
+		ret[rows].grpid = safe_atol(row[0]);
+		safe_strncpy(ret[rows].name, row[1], 65);
+		rows++;
 	}
-	return timer->autocommflag;
-}
 
-int cmyth_timer_autoexpire(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->autoexpire;
-}
+	mysql_free_result(res);
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 
-int cmyth_timer_maxepisodes(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->maxepisodes;
+	*changroups = ret;
+	return rows;
 }
 
-int cmyth_timer_maxnewest(cmyth_timer_t timer)
+int
+cmyth_mysql_get_channelids_in_group(cmyth_database_t db, uint32_t grpid, uint32_t **chanids)
 {
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->maxnewest;
-}
 
-int cmyth_timer_transcoder(cmyth_timer_t timer)
-{
-	if (!timer) {
-		return -EINVAL;
-	}
-	return timer->transcoder;
-}
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	const char *query_str = "SELECT chanid FROM channelgroup WHERE grpid = ?";
+	int rows = 0;
+	uint32_t *ret;
+	cmyth_mysql_query_t * query;
 
-cmyth_timer_t cmyth_timerlist_get_item(cmyth_timerlist_t pl, int index)
-{
-	if (!pl) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL timer list\n",
-			  __FUNCTION__);
-		return NULL;
-	}
-	if (!pl->timerlist_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL list\n",
-			  __FUNCTION__);
-		return NULL;
-	}
-	if ((index < 0) || (index >= pl->timerlist_count)) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: index %d out of range\n",
-			  __FUNCTION__, index);
-		return NULL;
-	}
-	ref_hold(pl->timerlist_list[index]);
-	return pl->timerlist_list[index];
-}
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-extern int cmyth_timerlist_get_count(cmyth_timerlist_t pl)
-{
-	if (!pl) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL timer list\n",
-			  __FUNCTION__);
-		return -EINVAL;
+	query = cmyth_mysql_query_create(db, query_str);
+	if (cmyth_mysql_query_param_uint32(query, grpid) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
 	}
-	return pl->timerlist_count;
-}
-
-extern int cmyth_mysql_get_channelgroups(cmyth_database_t db, cmyth_channelgroups_t** changroups)
-{
-	MYSQL_RES *res= NULL;
-	MYSQL_ROW row;
-	const char *query_str = "SELECT grpid, name FROM channelgroupnames";
-	int rows=0;
-	cmyth_channelgroups_t* ret;
-
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if(res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
-	ret = ref_alloc( sizeof( cmyth_channelgroups_t ) * (int)mysql_num_rows(res));
+	ret = ref_alloc(sizeof(uint32_t) * (int)mysql_num_rows(res));
 
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
 	while ((row = mysql_fetch_row(res))) {
-		ret[rows].ID=safe_atoi(row[0]);
-		safe_strncpy(ret[rows].channelgroup, row[1], 65);
+		ret[rows] = safe_atol(row[0]);
 		rows++;
 	}
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-
-	*changroups = ret;
+	*chanids = ret;
 	return rows;
 }
 
-extern int cmyth_mysql_get_channelids_in_group(cmyth_database_t db, unsigned int groupid, int** chanids)
+int
+cmyth_mysql_get_recorder_source_list(cmyth_database_t db, cmyth_recorder_source_t **rsrc)
 {
-
-	MYSQL_RES *res= NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	const char *query_str = "SELECT chanid FROM channelgroup WHERE grpid = ?";
-	int rows=0;
-	int* ret;
-
+	const char *query_str = "SELECT cardid, sourceid FROM cardinput";
+	int rows = 0;
+	cmyth_recorder_source_t *ret;
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
-	if (cmyth_mysql_query_param_long(query, groupid) < 0
-		) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
-		ref_release(query);
+
+	if (cmyth_database_check_version(db) < 0)
 		return -1;
-	}
+
+	query = cmyth_mysql_query_create(db, query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if(res == NULL)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
-	ret = ref_alloc(sizeof(int)* (int)mysql_num_rows(res));
+	ret = ref_alloc(sizeof(cmyth_recorder_source_t) * (int)mysql_num_rows(res));
 
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
 	while ((row = mysql_fetch_row(res))) {
-		ret[rows]=safe_atoi(row[0]);
+		ret[rows].recid = safe_atol(row[0]);
+		ret[rows].sourceid = safe_atol(row[1]);
 		rows++;
 	}
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-	*chanids = ret;
+
+	*rsrc = ret;
 	return rows;
 }
 
-
-int cmyth_mysql_get_recorder_list(cmyth_database_t db, cmyth_rec_t** reclist)
+int
+cmyth_mysql_get_recorder_source_channum(cmyth_database_t db, char *channum, cmyth_recorder_source_t **rsrc)
 {
-	MYSQL_RES *res= NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	const char *query_str = "SELECT cardid, sourceid FROM cardinput";
-	int rows=0;
-	cmyth_rec_t* ret;
-
+	const char *query_str1 = "SELECT cardinput.cardid, cardinput.sourceid FROM channel INNER JOIN cardinput ON channel.sourceid = cardinput.sourceid WHERE channel.channum = ? ORDER BY cardinput.cardinputid";
+	const char *query_str2 = "SELECT cardinput.cardid, cardinput.sourceid FROM channel INNER JOIN cardinput ON channel.sourceid = cardinput.sourceid WHERE channel.channum = ? AND cardinput.livetvorder > 0 ORDER BY cardinput.livetvorder, cardinput.cardinputid";
+	int rows = 0;
+	cmyth_recorder_source_t *ret;
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+
+	//DB version change at mythtv/libs/libmythtv/dbcheck.cpp:1789
+	if (db->db_version < 1293)
+		query = cmyth_mysql_query_create(db, query_str1);
+	else
+		query = cmyth_mysql_query_create(db, query_str2);
+
+	if (cmyth_mysql_query_param_str(query, channum) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if(res == NULL)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
-	ret = ref_alloc( sizeof( cmyth_rec_t ) * (int)mysql_num_rows(res));
+	ret = ref_alloc(sizeof(cmyth_recorder_source_t) * (int)mysql_num_rows(res));
 
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
 	while ((row = mysql_fetch_row(res))) {
-		ret[rows].recid=safe_atoi(row[0]);
-		ret[rows].sourceid=safe_atoi(row[1]);
+		ret[rows].recid = safe_atol(row[0]);
+		ret[rows].sourceid = safe_atol(row[1]);
 		rows++;
 	}
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
 
-	*reclist = ret;
+	*rsrc = ret;
 	return rows;
 }
 
-int cmyth_mysql_get_prog_finder_time_title_chan(cmyth_database_t db, cmyth_program_t *prog, char* title, time_t starttime, int chanid)
+int
+cmyth_mysql_get_prog_finder_time_title_chan(cmyth_database_t db, cmyth_program_t *prog, time_t starttime, char *program_name, uint32_t chanid)
 {
-	MYSQL_RES *res= NULL;
+	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	const char *query_str = "SELECT program.chanid,UNIX_TIMESTAMP(CONVERT_TZ(program.starttime,?,'SYSTEM')),UNIX_TIMESTAMP(CONVERT_TZ(program.endtime,?,'SYSTEM')),program.title,program.description,program.subtitle,program.programid,program.seriesid,program.category,channel.channum,channel.callsign,channel.name,channel.sourceid FROM program INNER JOIN channel ON program.chanid=channel.chanid WHERE program.chanid = ? AND program.title LIKE ? AND program.starttime = ? AND program.manualid = 0 ORDER BY (channel.channum + 0), program.starttime ASC ";
-	int rows=0;
+	const char *query_str = "SELECT program.chanid,UNIX_TIMESTAMP(CONVERT_TZ(program.starttime,?,'SYSTEM')),UNIX_TIMESTAMP(CONVERT_TZ(program.endtime,?,'SYSTEM')),program.title,program.description,program.subtitle,program.programid,program.seriesid,program.category,program.category_type,channel.channum,channel.callsign,channel.name,channel.sourceid FROM program INNER JOIN channel ON program.chanid=channel.chanid WHERE program.chanid = ? AND program.title LIKE ? AND program.starttime = ? AND program.manualid = 0 ORDER BY (channel.channum + 0), program.starttime ASC";
+	int rows = 0;
+	cmyth_mysql_query_t * query;
 
-	char* esctitle=cmyth_mysql_escape_chars(db,title);
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 
 	if (cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-		|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
-		|| cmyth_mysql_query_param_long(query, chanid) < 0
-		|| cmyth_mysql_query_param_str(query, esctitle ) < 0
-		|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0
-		) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+			|| cmyth_mysql_query_param_str(query, db->db_tz_name) < 0
+			|| cmyth_mysql_query_param_uint32(query, chanid) < 0
+			|| cmyth_mysql_query_param_str(query, program_name) < 0
+			|| cmyth_mysql_query_param_unixtime(query, starttime, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
-		ref_release(esctitle);
 		return -1;
 	}
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	ref_release(esctitle);
 
-	if(res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
 	if ((row = mysql_fetch_row(res))) {
 		rows++;
-		if(prog) {
-			prog->chanid = safe_atoi(row[0]);
-			prog->recording=0;
-			prog->starttime= (time_t)safe_atol(row[1]);
-			prog->endtime= (time_t)safe_atol(row[2]);
+		if (prog) {
+			prog->chanid = safe_atol(row[0]);
+			prog->starttime = (time_t)safe_atol(row[1]);
+			prog->endtime = (time_t)safe_atol(row[2]);
 			sizeof_strncpy(prog->title, row[3]);
 			sizeof_strncpy(prog->description, row[4]);
 			sizeof_strncpy(prog->subtitle, row[5]);
 			sizeof_strncpy(prog->programid, row[6]);
 			sizeof_strncpy(prog->seriesid, row[7]);
 			sizeof_strncpy(prog->category, row[8]);
-			prog->channum = safe_atoi(row[9]);
-			sizeof_strncpy(prog->callsign, row[10]);
-			sizeof_strncpy(prog->name, row[11]);
-			prog->sourceid = safe_atoi(row[12]);
-			prog->startoffset = 0;
-			prog->endoffset = 0;
+			sizeof_strncpy(prog->category_type, row[9]);
+			prog->channum = safe_atol(row[10]);
+			sizeof_strncpy(prog->callsign, row[11]);
+			sizeof_strncpy(prog->name, row[12]);
+			prog->sourceid = safe_atol(row[13]);
 		}
 	}
 
@@ -2384,10 +1758,11 @@
 	return rows;
 }
 
-void destroy_char_array(void* p)
+static void
+destroy_char_array(void *p)
 {
-	char** ptr = (char**)p;
-	if(!ptr)
+	char **ptr = (char**)p;
+	if (!ptr)
 		return;
 	while (*ptr) {
 		ref_release(*ptr);
@@ -2395,30 +1770,32 @@
 	}
 }
 
-int cmyth_mysql_get_storagegroups(cmyth_database_t db, char** *profiles)
+int
+cmyth_mysql_get_storagegroups(cmyth_database_t db, char** *sg)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT groupname FROM storagegroup";
 	int rows = 0;
-	char **ret; /* = profiles;*/
-
+	char **ret;
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if (res == NULL)
-	{
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+		return -1;
 	}
 
-	ret = ref_alloc(sizeof( char*) * ((int) mysql_num_rows(res) +1 ));
+	ret = ref_alloc(sizeof(char*) * ((int) mysql_num_rows(res) + 1));
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
 	ref_set_destroy(ret, destroy_char_array);
@@ -2431,38 +1808,41 @@
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-	*profiles = ret;
+	*sg = ret;
 
 	return rows;
 }
 
-int cmyth_mysql_get_playgroups(cmyth_database_t db, char** *profiles)
+int
+cmyth_mysql_get_playgroups(cmyth_database_t db, char** *pg)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT name FROM playgroup";
 	int rows = 0;
-	char **ret; /* = profiles;*/
-
+	char **ret;
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
 	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+		return -1;
 	}
 
-	ret = ref_alloc( sizeof( char*) * ((int) mysql_num_rows(res) +1 ) );
+	ret = ref_alloc(sizeof(char*) * ((int) mysql_num_rows(res) + 1));
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
-	ref_set_destroy(ret,destroy_char_array);
+	ref_set_destroy(ret, destroy_char_array);
 
 	while ((row = mysql_fetch_row(res))) {
 		ret[rows] = ref_strdup(row[0]);
@@ -2472,39 +1852,42 @@
 
 	mysql_free_result(res);
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: rows= %d\n", __FUNCTION__, rows);
-	*profiles = ret;
+	*pg = ret;
 
 	return rows;
 }
 
-int cmyth_mysql_get_recprofiles(cmyth_database_t db, cmyth_recprofile_t **profiles)
+int
+cmyth_mysql_get_recprofiles(cmyth_database_t db, cmyth_recprofile_t **profiles)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
 	const char *query_str = "SELECT recordingprofiles.id, recordingprofiles.name, profilegroups.cardtype FROM recordingprofiles INNER JOIN profilegroups ON recordingprofiles.profilegroup = profilegroups.id";
-	int rows=0;
+	int rows = 0;
 	cmyth_recprofile_t *ret = NULL;
+	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
 
-	cmyth_mysql_query_t* query;
-	query = cmyth_mysql_query_create(db,query_str);
+	query = cmyth_mysql_query_create(db, query_str);
 
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
-	if(res == NULL) {
+	if (res == NULL) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return 0;
+		return -1;
 	}
 
-	ret = ref_alloc(sizeof( cmyth_recprofile_t ) * (int)mysql_num_rows(res));
+	ret = ref_alloc(sizeof(cmyth_recprofile_t) * (int)mysql_num_rows(res));
 	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n",
-			  __FUNCTION__);
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
 		mysql_free_result(res);
-		return 0;
+		return -1;
 	}
 
 	while ((row = mysql_fetch_row(res))) {
-		ret[rows].id=safe_atoi(row[0]);
+		ret[rows].id = safe_atol(row[0]);
 		safe_strncpy(ret[rows].name, row[1], 128);
 		safe_strncpy(ret[rows].cardtype, row[2], 32);
 		rows++;
@@ -2517,34 +1900,301 @@
 	return rows;
 }
 
-char* cmyth_mysql_get_cardtype(cmyth_database_t db, int chanid)
+int
+cmyth_mysql_get_cardtype(cmyth_database_t db, uint32_t chanid, char* *cardtype)
+{
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	const char *query_str = "SELECT cardtype FROM channel LEFT JOIN cardinput ON channel.sourceid=cardinput.sourceid LEFT JOIN capturecard ON cardinput.cardid=capturecard.cardid WHERE channel.chanid = ?";
+	int rows = 0;
+	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
+
+	if (cmyth_mysql_query_param_uint32(query, chanid) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
+
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
+	}
+
+	if ((row = mysql_fetch_row(res))) {
+		*cardtype = ref_strdup(row[0]);
+		rows++;
+	}
+
+	mysql_free_result(res);
+	return rows;
+}
+
+/*
+ * cmyth_mysql_get_recording_markup()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Get recordings markup data. Type specifies the markup type to query, such as
+ * framerate, keyframe, scene change, a flagged commercial ...
+ *
+ * Success: returns markup data (bigint >= 0)
+ *
+ * Failure: -(errno)
+ */
+int64_t
+cmyth_mysql_get_recording_markup(cmyth_database_t db, cmyth_proginfo_t prog, cmyth_recording_markup_t type)
 {
 	MYSQL_RES *res = NULL;
 	MYSQL_ROW row;
-	const char *query_str = "SELECT cardtype FROM channel LEFT JOIN cardinput ON channel.sourceid=cardinput.sourceid LEFT JOIN capturecard ON cardinput.cardid=capturecard.cardid WHERE		channel.chanid = ?";
-	char* retval = "";
+	const char *query_str = "SELECT data FROM recordedmarkup WHERE chanid = ? AND starttime = ? AND type = ? LIMIT 0, 1;";
+	int rows = 0;
+	int64_t data = 0;
+	time_t start_ts_dt;
+	cmyth_mysql_query_t *query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	start_ts_dt = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
+	query = cmyth_mysql_query_create(db, query_str);
+
+	if (cmyth_mysql_query_param_uint32(query, prog->proginfo_chanId) < 0
+			|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0
+			|| cmyth_mysql_query_param_int(query, type) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
+	}
+	while ((row = mysql_fetch_row(res))) {
+		data = safe_atoll(row[0]);
+		rows++;
+	}
+	mysql_free_result(res);
 
+	return data;
+}
+
+/*
+ * cmyth_mysql_estimate_rec_framerate()
+ *
+ * Scope: PRIVATE
+ *
+ * Description
+ *
+ * Estimate framerate using seek mark for MPEG recordings.
+ *
+ * Success: returns 0 for invalid value else framerate (fps x 1000)
+ *
+ * Failure: -1
+ */
+int64_t
+cmyth_mysql_estimate_rec_framerate(cmyth_database_t db, cmyth_proginfo_t prog)
+{
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	/*
+	 * Force usage of primary key index to retrieve last mark value:
+	 * const DESC, const DESC, const DESC
+	 */
+	const char *query_str = "SELECT mark FROM recordedseek WHERE chanid = ? AND starttime = ? AND type = 9 ORDER BY chanid DESC, starttime DESC, type DESC, mark DESC LIMIT 1;";
+	int rows = 0;
+	int64_t mark = 0;
+	int64_t dsecs = 0;
+	int64_t fpms;
+	time_t start_ts_dt;
+	time_t end_ts_dt;
 	cmyth_mysql_query_t * query;
-	query = cmyth_mysql_query_create(db,query_str);
 
-	if ( cmyth_mysql_query_param_long(query, chanid) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	start_ts_dt = cmyth_timestamp_to_unixtime(prog->proginfo_rec_start_ts);
+	end_ts_dt = cmyth_timestamp_to_unixtime(prog->proginfo_rec_end_ts);
+	dsecs = (int64_t)(end_ts_dt - start_ts_dt);
+	if (dsecs <= 0) {
+		return 0;
+	}
+
+	query = cmyth_mysql_query_create(db, query_str);
+
+	if (cmyth_mysql_query_param_uint32(query, prog->proginfo_chanId) < 0
+			|| cmyth_mysql_query_param_unixtime(query, start_ts_dt, db->db_tz_utc) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
 		ref_release(query);
-		return NULL;
+		return -1;
+	}
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
+	}
+	while ((row = mysql_fetch_row(res))) {
+		mark = safe_atoll(row[0]);
+		rows++;
+	}
+	mysql_free_result(res);
+
+	if (mark > 0) {
+		fpms = (mark * 1000) / dsecs;
+	} else {
+		return 0;
+	}
+	return fpms;
+}
+
+/*
+ * cmyth_mysql_get_recording_framerate()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Returns framerate for a recording.
+ *
+ * Success: returns 0 for invalid value else framerate (fps x 1000)
+ */
+int64_t
+cmyth_mysql_get_recording_framerate(cmyth_database_t db, cmyth_proginfo_t prog)
+{
+	int64_t ret;
+	ret = cmyth_mysql_get_recording_markup(db, prog, MARK_VIDEO_RATE);
+	if (ret > 10000 && ret < 80000) {
+		return ret;
+	} else {
+		cmyth_dbg(CMYTH_DBG_WARN, "%s, implausible frame rate: %"PRId64"\n", __FUNCTION__, ret);
+	}
+
+	ret = cmyth_mysql_estimate_rec_framerate(db, prog);
+	if (ret > 10000 && ret < 80000) {
+		return ret;
+	} else {
+		cmyth_dbg(CMYTH_DBG_WARN, "%s, failed to estimate frame rate: %"PRId64"\n", __FUNCTION__, ret);
 	}
 
+	return 0;
+}
+
+/*
+ * cmyth_mysql_get_recording_artwork()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Returns artworks for a recording.
+ *
+ * Success: returns 0 for unavailable else 1
+ *
+ * Failure: -1
+ */
+int
+cmyth_mysql_get_recording_artwork(cmyth_database_t db, cmyth_proginfo_t prog, char **coverart, char **fanart, char **banner)
+{
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	const char *query_str = "SELECT coverart, fanart, banner FROM recordedartwork WHERE inetref = ? AND host = ? AND season = ? "
+				"UNION ALL "
+				"SELECT coverart, fanart, banner FROM recordedartwork WHERE inetref = ? AND host = ?";
+	int rows = 0;
+	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	/* DB version change at mythtv/libs/libmythtv/dbcheck.cpp:1473 */
+	if (db->db_version < 1279)
+		return 0;
+
+	query = cmyth_mysql_query_create(db, query_str);
+
+	if (cmyth_mysql_query_param_str(query, prog->proginfo_inetref) < 0
+			|| cmyth_mysql_query_param_str(query, prog->proginfo_hostname) < 0
+			|| cmyth_mysql_query_param_uint(query, prog->proginfo_season) < 0
+			|| cmyth_mysql_query_param_str(query, prog->proginfo_inetref) < 0
+			|| cmyth_mysql_query_param_str(query, prog->proginfo_hostname) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
 	res = cmyth_mysql_query_result(query);
 	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
+	}
 
-	if(res == NULL) {
-		cmyth_dbg(CMYTH_DBG_ERROR,"%s, finalisation/execution of query failed!\n", __FUNCTION__);
-		return NULL;
+	if ((row = mysql_fetch_row(res))) {
+		*coverart = ref_strdup(row[0]);
+		*fanart = ref_strdup(row[1]);
+		*banner = ref_strdup(row[2]);
+		rows++;
+	}
+
+	mysql_free_result(res);
+	return rows;
+}
+
+/*
+ * cmyth_mysql_get_setting()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Returns data for global (non host specific) setting.
+ *
+ * Success: returns 0 for unavailable else 1
+ *
+ * Failure: -1
+ */
+int
+cmyth_mysql_get_setting(cmyth_database_t db, char *setting, char **data)
+{
+	MYSQL_RES *res = NULL;
+	MYSQL_ROW row;
+	const char *query_str = "SELECT data FROM settings WHERE value = ? AND hostname IS NULL;";
+	int rows = 0;
+	cmyth_mysql_query_t * query;
+
+	if (cmyth_database_check_version(db) < 0)
+		return -1;
+
+	query = cmyth_mysql_query_create(db, query_str);
+
+	if (cmyth_mysql_query_param_str(query, setting) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, binding of query parameters failed! Maybe we're out of memory?\n", __FUNCTION__);
+		ref_release(query);
+		return -1;
+	}
+	res = cmyth_mysql_query_result(query);
+	ref_release(query);
+	if (res == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s, finalisation/execution of query failed!\n", __FUNCTION__);
+		return -1;
 	}
 
 	if ((row = mysql_fetch_row(res))) {
-		retval = ref_strdup(row[0]);
+		*data = ref_strdup(row[0]);
+		rows++;
 	}
 
 	mysql_free_result(res);
-	return retval;
+	return rows;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/posmap.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/posmap.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/posmap.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/posmap.c	2013-03-12 10:51:22.000000000 +0000
@@ -30,8 +30,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_posmap_destroy(cmyth_posmap_t pm)
- * 
+ * cmyth_posmap_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -48,7 +48,7 @@
 static void
 cmyth_posmap_destroy(cmyth_posmap_t pm)
 {
-	unsigned int i;
+	int i;
 
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
 	if (!pm) {
@@ -63,8 +63,8 @@
 }
 
 /*
- * cmyth_posmap_create(void)
- * 
+ * cmyth_posmap_create()
+ *
  * Scope: PUBLIC
  *
  * Description
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/proginfo.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/proginfo.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/proginfo.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/proginfo.c	2013-03-12 10:51:22.000000000 +0000
@@ -34,8 +34,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_proginfo_destroy(cmyth_proginfo_t p)
- * 
+ * cmyth_proginfo_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -91,9 +91,6 @@
 	if (p->proginfo_hostname) {
 		ref_release(p->proginfo_hostname);
 	}
-	if (p->proginfo_rec_priority) {
-		ref_release(p->proginfo_rec_priority);
-	}
 	if (p->proginfo_rec_profile) {
 		ref_release(p->proginfo_rec_profile);
 	}
@@ -148,15 +145,12 @@
 	if (p->proginfo_storagegroup) {
 		ref_release(p->proginfo_storagegroup);
 	}
-	if (p->proginfo_recpriority_2) {
-		ref_release(p->proginfo_recpriority_2);
-	}
 	cmyth_dbg(CMYTH_DBG_DEBUG, "%s }\n", __FUNCTION__);
 }
 
 /*
- * cmyth_proginfo_create(void)
- * 
+ * cmyth_proginfo_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -227,7 +221,7 @@
 	ret->proginfo_url = NULL;
 	ret->proginfo_pathname = NULL;
 	ret->proginfo_host = NULL;
-	ret->proginfo_port = -1;
+	ret->proginfo_port = 0;
 	ret->proginfo_Length = 0;
 	ret->proginfo_conflicting = 0;
 	ret->proginfo_unknown_0 = NULL;
@@ -241,8 +235,8 @@
 	ret->proginfo_rec_status = 0;
 	ret->proginfo_record_id = 0;
 	ret->proginfo_rec_type = 0;
-	ret->proginfo_rec_dups = 0;
-	ret->proginfo_unknown_1 = 0;
+	ret->proginfo_rec_dupin = 0;
+	ret->proginfo_rec_dupmethod = 0;
 	ret->proginfo_repeat = 0;
 	ret->proginfo_program_flags = 0;
 	ret->proginfo_rec_profile = NULL;
@@ -257,7 +251,7 @@
 	ret->proginfo_hasairdate = 0;
 	ret->proginfo_playgroup = NULL;
 	ret->proginfo_storagegroup = NULL;
-	ret->proginfo_recpriority_2 = NULL;
+	ret->proginfo_recpriority_2 = 0;
 	ret->proginfo_parentid = 0;
 	ret->proginfo_audioproperties = 0;
 	ret->proginfo_videoproperties = 0;
@@ -273,8 +267,8 @@
 }
 
 /*
- * cmyth_proginfo_create(void)
- * 
+ * cmyth_proginfo_create()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -330,12 +324,12 @@
 	ret->proginfo_source_id = p->proginfo_source_id;
 	ret->proginfo_card_id = p->proginfo_card_id;
 	ret->proginfo_input_id = p->proginfo_input_id;
-	ret->proginfo_rec_priority = ref_hold(p->proginfo_rec_priority);
+	ret->proginfo_rec_priority = p->proginfo_rec_priority;
 	ret->proginfo_rec_status = p->proginfo_rec_status;
 	ret->proginfo_record_id = p->proginfo_record_id;
 	ret->proginfo_rec_type = p->proginfo_rec_type;
-	ret->proginfo_rec_dups = p->proginfo_rec_dups;
-	ret->proginfo_unknown_1 = p->proginfo_unknown_1;
+	ret->proginfo_rec_dupin = p->proginfo_rec_dupin;
+	ret->proginfo_rec_dupmethod = p->proginfo_rec_dupmethod;
 	ret->proginfo_repeat = p->proginfo_repeat;
 	ret->proginfo_program_flags = p->proginfo_program_flags;
 	ret->proginfo_rec_profile = ref_hold(p->proginfo_rec_profile);
@@ -350,7 +344,7 @@
 	ret->proginfo_hasairdate = p->proginfo_hasairdate;
 	ret->proginfo_playgroup = ref_hold(p->proginfo_playgroup);
 	ret->proginfo_storagegroup = ref_hold(p->proginfo_storagegroup);
-	ret->proginfo_recpriority_2 = ref_hold(p->proginfo_recpriority_2);
+	ret->proginfo_recpriority_2 = p->proginfo_recpriority_2;
 	ret->proginfo_parentid = p->proginfo_parentid;
 	ret->proginfo_audioproperties = p->proginfo_audioproperties;
 	ret->proginfo_videoproperties = p->proginfo_videoproperties;
@@ -360,53 +354,24 @@
 	return ret;
 }
 
-/*
- * cmyth_proginfo_check_recording(cmyth_conn_t control,
- *                                cmyth_proginfo_t prog)
- * 
- * Scope: PUBLIC
- *
- * Description
- *
- * Make a request on the control connection 'control' to check the
- * existence of the program 'prog' on the MythTV back end.
- *
- * Return Value:
- *
- * Success: 1 - if the recording exists, 0 - if it does not
- *
- * Failure: -(ERRNO)
- */
-int
-cmyth_proginfo_check_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
-{
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	return -ENOSYS;
-}
-
-static int
-delete_command(cmyth_conn_t control, cmyth_proginfo_t prog, char *cmd)
+char *
+cmyth_proginfo_string(cmyth_conn_t control, cmyth_proginfo_t prog)
 {
-	long c = 0;
 	char *buf;
-	unsigned int len = ((2 * CMYTH_LONGLONG_LEN) + 
+	unsigned int len = ((2 * CMYTH_INT64_LEN) +
 			    (6 * CMYTH_TIMESTAMP_LEN) +
-			    (16 * CMYTH_LONG_LEN));
+			    (16 * CMYTH_INT32_LEN));
 	char start_ts[CMYTH_TIMESTAMP_LEN + 1];
 	char end_ts[CMYTH_TIMESTAMP_LEN + 1];
 	char rec_start_ts[CMYTH_TIMESTAMP_LEN + 1];
 	char rec_end_ts[CMYTH_TIMESTAMP_LEN + 1];
 	char originalairdate[CMYTH_TIMESTAMP_LEN + 1];
 	char lastmodified[CMYTH_TIMESTAMP_LEN + 1];
-	int err = 0;
-	int count = 0;
-	long r = 0;
-	int ret = 0;
 
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no program info\n",
 			  __FUNCTION__);
-		return -EINVAL;
+		return NULL;
 	}
 #define S(a) ((a) == NULL ? "" : (a))
 
@@ -423,59 +388,46 @@
 	len += strlen(S(prog->proginfo_seriesid));
 	len += strlen(S(prog->proginfo_programid));
 	len += strlen(S(prog->proginfo_inetref));
-	len += strlen(S(prog->proginfo_recpriority_2));
 	len += strlen(S(prog->proginfo_storagegroup));
 
-	buf = alloca(len + 1+2048);
+	buf = malloc(len + 1 + 2048);
 	if (!buf) {
-		return -ENOMEM;
+		return NULL;
 	}
+	*buf = '\0';
 
 	if(control->conn_version < 14)
 	{
-	    cmyth_timestamp_to_string(start_ts, prog->proginfo_start_ts);
-	    cmyth_timestamp_to_string(end_ts, prog->proginfo_end_ts);
-	    cmyth_timestamp_to_string(rec_start_ts,
-	    			      prog->proginfo_rec_start_ts);
-	    cmyth_timestamp_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
-	    cmyth_timestamp_to_string(originalairdate,
-				      prog->proginfo_originalairdate);
-	    cmyth_timestamp_to_string(lastmodified,
-				      prog->proginfo_lastmodified);
+		cmyth_timestamp_to_string(start_ts, prog->proginfo_start_ts);
+		cmyth_timestamp_to_string(end_ts, prog->proginfo_end_ts);
+		cmyth_timestamp_to_string(rec_start_ts, prog->proginfo_rec_start_ts);
+		cmyth_timestamp_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
+		cmyth_timestamp_to_string(originalairdate, prog->proginfo_originalairdate);
+		cmyth_timestamp_to_string(lastmodified, prog->proginfo_lastmodified);
 	}
 	else
 	{
-	    cmyth_datetime_to_string(start_ts, prog->proginfo_start_ts);
-	    cmyth_datetime_to_string(end_ts, prog->proginfo_end_ts);
-	    cmyth_datetime_to_string(rec_start_ts, prog->proginfo_rec_start_ts);
-	    cmyth_datetime_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
-	    cmyth_datetime_to_string(originalairdate,
-				     prog->proginfo_originalairdate);
-	    cmyth_datetime_to_string(lastmodified, prog->proginfo_lastmodified);
+		cmyth_datetime_to_string(start_ts, prog->proginfo_start_ts);
+		cmyth_datetime_to_string(end_ts, prog->proginfo_end_ts);
+		cmyth_datetime_to_string(rec_start_ts, prog->proginfo_rec_start_ts);
+		cmyth_datetime_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
+		cmyth_datetime_to_string(originalairdate, prog->proginfo_originalairdate);
+		cmyth_datetime_to_string(lastmodified, prog->proginfo_lastmodified);
 	}
 
 	if(control->conn_version > 32) {
-	    cmyth_timestamp_to_isostring(originalairdate,
-				 prog->proginfo_originalairdate);
+		cmyth_timestamp_to_isostring(originalairdate, prog->proginfo_originalairdate);
 	}
 
-	if(control->conn_version < 12)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: delete not supported with protocol ver %d\n",
-			  __FUNCTION__, control->conn_version);
-		return -EINVAL;
-	}
-	sprintf(buf, "%s 0[]:[]", cmd);
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_title));
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_subtitle));
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_description));
 	if (control->conn_version >= 67) {
-		sprintf(buf + strlen(buf), "%u[]:[]", prog->proginfo_season);
-		sprintf(buf + strlen(buf), "%u[]:[]", prog->proginfo_episode);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_season);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_episode);
 	}
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_category));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_chanId);
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_chanId);
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chanstr));
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chansign));
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_channame));
@@ -483,8 +435,8 @@
 	if (control->conn_version >= 57) {
 		sprintf(buf + strlen(buf), "%"PRId64"[]:[]", prog->proginfo_Length);
 	} else {
-		sprintf(buf + strlen(buf), "%d[]:[]", (int32_t)(prog->proginfo_Length >> 32));
-		sprintf(buf + strlen(buf), "%d[]:[]", (int32_t)(prog->proginfo_Length & 0xffffffff));
+		sprintf(buf + strlen(buf), "%"PRId32"[]:[]", (int32_t)(prog->proginfo_Length >> 32));
+		sprintf(buf + strlen(buf), "%"PRId32"[]:[]", (int32_t)(prog->proginfo_Length & 0xffffffff));
 	}
 	sprintf(buf + strlen(buf), "%s[]:[]",  start_ts);
 	sprintf(buf + strlen(buf), "%s[]:[]",  end_ts);
@@ -494,21 +446,21 @@
 	}
 	sprintf(buf + strlen(buf), "%ld[]:[]", 0L); // "findid"
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_hostname));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_source_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_card_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_input_id);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_rec_priority));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_status);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_record_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_type);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_dups);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_unknown_1); // "dupmethod"
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_source_id);
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_card_id);
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_input_id);
+	sprintf(buf + strlen(buf), "%"PRId8"[]:[]", prog->proginfo_rec_priority);
+	sprintf(buf + strlen(buf), "%"PRId8"[]:[]", prog->proginfo_rec_status);
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_record_id);
+	sprintf(buf + strlen(buf), "%"PRIu8"[]:[]", prog->proginfo_rec_type);
+	sprintf(buf + strlen(buf), "%"PRIu8"[]:[]", prog->proginfo_rec_dupin);
+	sprintf(buf + strlen(buf), "%"PRIu8"[]:[]", prog->proginfo_rec_dupmethod);
 	sprintf(buf + strlen(buf), "%s[]:[]",  rec_start_ts);
 	sprintf(buf + strlen(buf), "%s[]:[]",  rec_end_ts);
 	if (control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_repeat);
+		sprintf(buf + strlen(buf), "%"PRIu8"[]:[]", prog->proginfo_repeat);
 	}
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_program_flags);
+	sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_program_flags);
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_recgroup));
 	if (control->conn_version < 57) {
 		sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chancommfree));
@@ -523,30 +475,112 @@
 	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_stars));
 	sprintf(buf + strlen(buf), "%s[]:[]",  originalairdate);
 	if (control->conn_version >= 15 && control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_hasairdate);
+		sprintf(buf + strlen(buf), "%"PRIu8"[]:[]", prog->proginfo_hasairdate);
 	}
 	if (control->conn_version >= 18) {
 		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_playgroup));
 	}
 	if (control->conn_version >= 25) {
-		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_recpriority_2));
+		sprintf(buf + strlen(buf), "%"PRId8"[]:[]", prog->proginfo_recpriority_2);
 	}
 	if (control->conn_version >= 31) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_parentid);
+		sprintf(buf + strlen(buf), "%"PRIu32"[]:[]", prog->proginfo_parentid);
 	}
 	if (control->conn_version >= 32) {
 		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_storagegroup));
 	}
 	if (control->conn_version >= 35) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_audioproperties);
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_videoproperties);
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_subtitletype);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_audioproperties);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_videoproperties);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_subtitletype);
 	}
 	if (control->conn_version >= 43) {
-		sprintf(buf + strlen(buf), "%d[]:[]", prog->proginfo_year);
+		sprintf(buf + strlen(buf), "%"PRIu16"[]:[]", prog->proginfo_year);
 	}
 #undef S
 
+	return buf;
+}
+
+/*
+ * cmyth_proginfo_check_recording()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Make a request on the control connection 'control' to check the
+ * existence of the program 'prog' on the MythTV back end.
+ *
+ * Return Value:
+ *
+ * Success: 1 - if the recording exists, 0 - if it does not
+ *
+ * Failure: -(ERRNO)
+ */
+int
+cmyth_proginfo_check_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
+{
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	return -ENOSYS;
+}
+
+/*
+ * cmyth_proginfo_delete_recording()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Make a request on the control connection 'control' to delete the
+ * program 'prog' from the MythTV back end.
+ *
+ * Return Value:
+ *
+ * Success: 0
+ *
+ * Failure: -(ERRNO)
+ */
+int
+cmyth_proginfo_delete_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
+{
+	int32_t c = 0;
+	int err = 0;
+	int count = 0;
+	int r = 0;
+	int ret = 0;
+	char *buf;
+	char *proginfo;
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+	if (control->conn_version < 12)
+	{
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: delete not supported with protocol ver %d\n",
+			  __FUNCTION__, control->conn_version);
+		return -EINVAL;
+	}
+
+	proginfo = cmyth_proginfo_string(control, prog);
+	if (proginfo == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: program_info failed.\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+
+	buf = malloc(strlen(proginfo) + 23 + 1);
+	if (!buf) {
+		free(proginfo);
+		return -ENOMEM;
+	}
+	sprintf(buf, "DELETE_RECORDING 0[]:[]%s", proginfo);
+	free(proginfo);
+
 	pthread_mutex_lock(&mutex);
 
 	if ((err = cmyth_send_message(control, buf)) < 0) {
@@ -558,7 +592,7 @@
 	}
 
 	count = cmyth_rcv_length(control);
-	if ((r=cmyth_rcv_long(control, &err, &c, count)) < 0) {
+	if ((r = cmyth_rcv_int32(control, &err, &c, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_length() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -566,40 +600,16 @@
 		goto out;
 	}
 
-    out:
+	out:
 	pthread_mutex_unlock(&mutex);
+	free(buf);
 
 	return ret;
 }
 
-
 /*
- * cmyth_proginfo_delete_recording(cmyth_conn_t control,
- *                                 cmyth_proginfo_t prog)
- * 
- * Scope: PUBLIC
+ * cmyth_proginfo_forget_recording()
  *
- * Description
- *
- * Make a request on the control connection 'control' to delete the
- * program 'prog' from the MythTV back end.
- *
- * Return Value:
- *
- * Success: 0
- *
- * Failure: -(ERRNO)
- */
-int
-cmyth_proginfo_delete_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
-{
-	return delete_command(control, prog, "DELETE_RECORDING");
-}
-
-/*
- * cmyth_proginfo_forget_recording(cmyth_conn_t control,
- *                                 cmyth_proginfo_t prog)
- * 
  * Scope: PUBLIC
  *
  * Description
@@ -616,13 +626,72 @@
 int
 cmyth_proginfo_forget_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
 {
-	return delete_command(control, prog, "FORGET_RECORDING");
+	int32_t c = 0;
+	int err = 0;
+	int count = 0;
+	int r = 0;
+	int ret = 0;
+	char *buf;
+	char *proginfo;
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+	if (control->conn_version < 12)
+	{
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: forget not supported with protocol ver %d\n",
+			  __FUNCTION__, control->conn_version);
+		return -EINVAL;
+	}
+
+	proginfo = cmyth_proginfo_string(control, prog);
+	if (proginfo == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: program_info failed.\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+
+	buf = malloc(strlen(proginfo) + 23 + 1);
+	if (!buf) {
+		free(proginfo);
+		return -ENOMEM;
+	}
+	sprintf(buf, "FORGET_RECORDING 0[]:[]%s", proginfo);
+	free(proginfo);
+
+	pthread_mutex_lock(&mutex);
+
+	if ((err = cmyth_send_message(control, buf)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: cmyth_send_message() failed (%d)\n",
+			  __FUNCTION__, err);
+		ret = err;
+		goto out;
+	}
+
+	count = cmyth_rcv_length(control);
+	if ((r = cmyth_rcv_int32(control, &err, &c, count)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: cmyth_rcv_length() failed (%d)\n",
+			  __FUNCTION__, r);
+		ret = err;
+		goto out;
+	}
+
+	out:
+	pthread_mutex_unlock(&mutex);
+	free(buf);
+
+	return ret;
 }
 
 /*
- * cmyth_proginfo_stop_recording(cmyth_conn_t control,
- *                               cmyth_proginfo_t prog)
- * 
+ * cmyth_proginfo_stop_recording()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -639,14 +708,72 @@
 int
 cmyth_proginfo_stop_recording(cmyth_conn_t control, cmyth_proginfo_t prog)
 {
-	return delete_command(control, prog, "STOP_RECORDING");
+	int32_t c = 0;
+	int err = 0;
+	int count = 0;
+	int r = 0;
+	int ret = 0;
+	char *buf;
+	char *proginfo;
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+	if (control->conn_version < 12)
+	{
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: stop not supported with protocol ver %d\n",
+			  __FUNCTION__, control->conn_version);
+		return -EINVAL;
+	}
+
+	proginfo = cmyth_proginfo_string(control, prog);
+	if (proginfo == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: program_info failed.\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+
+	buf = malloc(strlen(proginfo) + 21 + 1);
+	if (!buf) {
+		free(proginfo);
+		return -ENOMEM;
+	}
+	sprintf(buf, "STOP_RECORDING 0[]:[]%s", proginfo);
+	free(proginfo);
+
+	pthread_mutex_lock(&mutex);
+
+	if ((err = cmyth_send_message(control, buf)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: cmyth_send_message() failed (%d)\n",
+			  __FUNCTION__, err);
+		ret = err;
+		goto out;
+	}
+
+	count = cmyth_rcv_length(control);
+	if ((r = cmyth_rcv_int32(control, &err, &c, count)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: cmyth_rcv_length() failed (%d)\n",
+			  __FUNCTION__, r);
+		ret = err;
+		goto out;
+	}
+
+	out:
+	pthread_mutex_unlock(&mutex);
+	free(buf);
+
+	return ret;
 }
 
 /*
- * cmyth_proginfo_get_recorder_num(cmyth_conn_t control,
- *                                 cmyth_rec_num_t rnum,
- *                                 cmyth_proginfo_t prog)
- * 
+ * cmyth_proginfo_get_recorder_num()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -670,8 +797,8 @@
 }
 
 /*
- * cmyth_proginfo_chan_id(cmyth_proginfo_t prog)
- * 
+ * cmyth_proginfo_chan_id()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -683,19 +810,19 @@
  * Success: A positive integer channel identifier (these are formed from
  *          the recorder number and the channel number).
  *
- * Failure: -(ERRNO)
+ * Failure: 0
  */
-long
+uint32_t
 cmyth_proginfo_chan_id(cmyth_proginfo_t prog)
 {
 	if (!prog) {
-		return -EINVAL;
+		return 0;
 	}
 	return prog->proginfo_chanId;
 }
 
 /*
- * cmyth_proginfo_title(cmyth_proginfo_t prog)
+ * cmyth_proginfo_title()
  *
  *
  * Scope: PUBLIC
@@ -726,7 +853,7 @@
 }
 
 /*
- * cmyth_proginfo_subtitle(cmyth_proginfo_t prog)
+ * cmyth_proginfo_subtitle()
  *
  *
  * Scope: PUBLIC
@@ -757,7 +884,7 @@
 }
 
 /*
- * cmyth_proginfo_description(cmyth_proginfo_t prog)
+ * cmyth_proginfo_description()
  *
  *
  * Scope: PUBLIC
@@ -787,7 +914,7 @@
 	return ref_hold(prog->proginfo_description);
 }
 
-unsigned short
+uint16_t
 cmyth_proginfo_season(cmyth_proginfo_t prog)
 {
 	if (!prog) {
@@ -796,7 +923,7 @@
 	return prog->proginfo_season;
 }
 
-unsigned short
+uint16_t
 cmyth_proginfo_episode(cmyth_proginfo_t prog)
 {
 	if (!prog) {
@@ -806,7 +933,7 @@
 }
 
 /*
- * cmyth_proginfo_category(cmyth_proginfo_t prog)
+ * cmyth_proginfo_category()
  *
  *
  * Scope: PUBLIC
@@ -903,7 +1030,7 @@
 }
 
 /*
- * cmyth_proginfo_chanstr(cmyth_proginfo_t prog)
+ * cmyth_proginfo_chanstr()
  *
  *
  * Scope: PUBLIC
@@ -934,7 +1061,7 @@
 }
 
 /*
- * cmyth_proginfo_chansign(cmyth_proginfo_t prog)
+ * cmyth_proginfo_chansign()
  *
  *
  * Scope: PUBLIC
@@ -966,7 +1093,7 @@
 }
 
 /*
- * cmyth_proginfo_channame(cmyth_proginfo_t prog)
+ * cmyth_proginfo_channame()
  *
  *
  * Scope: PUBLIC
@@ -998,7 +1125,7 @@
 }
 
 /*
- * cmyth_proginfo_channame(cmyth_proginfo_t prog)
+ * cmyth_proginfo_channame()
  *
  *
  * Scope: PUBLIC
@@ -1028,7 +1155,7 @@
 }
 
 /*
- * cmyth_proginfo_length(cmyth_proginfo_t prog)
+ * cmyth_proginfo_length()
  *
  *
  * Scope: PUBLIC
@@ -1042,19 +1169,19 @@
  *
  * Success: long long file length
  *
- * Failure: NULL
+ * Failure: 0
  */
-long long
+int64_t
 cmyth_proginfo_length(cmyth_proginfo_t prog)
 {
 	if (!prog) {
-		return -1;
+		return 0;
 	}
 	return prog->proginfo_Length;
 }
 
 /*
- * cmyth_proginfo_length_sec(cmyth_proginfo_t prog)
+ * cmyth_proginfo_length_sec()
  *
  *
  * Scope: PUBLIC
@@ -1067,24 +1194,26 @@
  *
  * Success: int file length
  *
- * Failure: NULL
+ * Failure: 0
  */
-int
+uint32_t
 cmyth_proginfo_length_sec(cmyth_proginfo_t prog)
 {
 	int seconds;
 
 	if (!prog) {
-		return -1;
+		return 0;
 	}
 
 	seconds = cmyth_timestamp_diff(prog->proginfo_start_ts,
 				       prog->proginfo_end_ts);
-
-	return seconds;
+	if (seconds < 0) {
+		return 0;
+	}
+	return (uint32_t)seconds;
 }
 /*
- * cmyth_proginfo_start(cmyth_proginfo_t prog)
+ * cmyth_proginfo_start()
  *
  *
  * Scope: PUBLIC
@@ -1114,7 +1243,7 @@
 
 
 /*
- * cmyth_proginfo_rec_end(cmyth_proginfo_t prog)
+ * cmyth_proginfo_rec_end()
  *
  *
  * Scope: PUBLIC
@@ -1143,7 +1272,7 @@
 }
 
 /*
- * cmyth_proginfo_rec_start(cmyth_proginfo_t prog)
+ * cmyth_proginfo_rec_start()
  *
  *
  * Scope: PUBLIC
@@ -1173,7 +1302,7 @@
 
 
 /*
- * cmyth_proginfo_rec_end(cmyth_proginfo_t prog)
+ * cmyth_proginfo_rec_end()
  *
  *
  * Scope: PUBLIC
@@ -1202,7 +1331,7 @@
 }
 
 /*
- * cmyth_proginfo_rec_status(cmyth_proginfo_t prog)
+ * cmyth_proginfo_rec_status()
  *
  * Scope: PUBLIC
  *
@@ -1230,7 +1359,7 @@
  *
  * Return Value:
  *
- * Success: A recording status 
+ * Success: A recording status
  *
  * Failure: 0 (an invalid status)
  */
@@ -1244,7 +1373,7 @@
 }
 
 /*
- * cmyth_proginfo_flags(cmyth_proginfo_t prog)
+ * cmyth_proginfo_flags()
  *
  * Scope: PUBLIC
  *
@@ -1256,19 +1385,19 @@
  *
  * Success: The program flag mask.
  *
- * Failure: 0 (an invalid status)
+ * Failure: 0 (NULL mask)
  */
-unsigned long
+uint32_t
 cmyth_proginfo_flags(cmyth_proginfo_t prog)
 {
-  if (!prog) {
-    return 0;
-  }
-  return prog->proginfo_program_flags;
+	if (!prog) {
+		return 0;
+	}
+	return prog->proginfo_program_flags;
 }
 
 /*
- * cmyth_proginfo_year(cmyth_proginfo_t prog)
+ * cmyth_proginfo_year()
  *
  *
  * Scope: PUBLIC
@@ -1284,7 +1413,7 @@
  *
  * Failure: 0
  */
-unsigned short
+uint16_t
 cmyth_proginfo_year(cmyth_proginfo_t prog)
 {
 	if (!prog) {
@@ -1293,181 +1422,8 @@
 	return prog->proginfo_year;
 }
 
-static int
-fill_command(cmyth_conn_t control, cmyth_proginfo_t prog, char *cmd)
-{
-	char *buf;
-	unsigned int len = ((2 * CMYTH_LONGLONG_LEN) + 
-			    (6 * CMYTH_TIMESTAMP_LEN) +
-			    (16 * CMYTH_LONG_LEN));
-	char start_ts[CMYTH_TIMESTAMP_LEN + 1];
-	char end_ts[CMYTH_TIMESTAMP_LEN + 1];
-	char rec_start_ts[CMYTH_TIMESTAMP_LEN + 1];
-	char rec_end_ts[CMYTH_TIMESTAMP_LEN + 1];
-	char originalairdate[CMYTH_TIMESTAMP_LEN + 1];
-	char lastmodified[CMYTH_TIMESTAMP_LEN + 1];
-	int err = 0;
-	int ret = 0;
-	char *host = "libcmyth";
-
-	if (!prog) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no program info\n",
-			  __FUNCTION__);
-		return -EINVAL;
-	}
-#define S(a) ((a) == NULL ? "" : (a))
-
-	len += strlen(S(prog->proginfo_title));
-	len += strlen(S(prog->proginfo_subtitle));
-	len += strlen(S(prog->proginfo_description));
-	len += strlen(S(prog->proginfo_category));
-	len += strlen(S(prog->proginfo_chanstr));
-	len += strlen(S(prog->proginfo_chansign));
-	len += strlen(S(prog->proginfo_channame));
-	len += strlen(S(prog->proginfo_url));
-	len += strlen(S(prog->proginfo_hostname));
-	len += strlen(S(prog->proginfo_playgroup));
-	len += strlen(S(prog->proginfo_seriesid));
-	len += strlen(S(prog->proginfo_programid));
-	len += strlen(S(prog->proginfo_inetref));
-	len += strlen(S(prog->proginfo_recpriority_2));
-	len += strlen(S(prog->proginfo_storagegroup));
-
-	buf = alloca(len + 1+2048);
-	if (!buf) {
-		return -ENOMEM;
-	}
-
-	if(control->conn_version < 14)
-	{
-	    cmyth_timestamp_to_string(start_ts, prog->proginfo_start_ts);
-	    cmyth_timestamp_to_string(end_ts, prog->proginfo_end_ts);
-	    cmyth_timestamp_to_string(rec_start_ts,
-	    				prog->proginfo_rec_start_ts);
-	    cmyth_timestamp_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
-	    cmyth_timestamp_to_string(originalairdate,
-				  prog->proginfo_originalairdate);
-	    cmyth_timestamp_to_string(lastmodified,
-	    				prog->proginfo_lastmodified);
-	}
-	else
-	{
-	    cmyth_datetime_to_string(start_ts, prog->proginfo_start_ts);
-	    cmyth_datetime_to_string(end_ts, prog->proginfo_end_ts);
-	    cmyth_datetime_to_string(rec_start_ts, prog->proginfo_rec_start_ts);
-	    cmyth_datetime_to_string(rec_end_ts, prog->proginfo_rec_end_ts);
-	    cmyth_datetime_to_string(originalairdate,
-				     prog->proginfo_originalairdate);
-	    cmyth_datetime_to_string(lastmodified, prog->proginfo_lastmodified);
-	}
-
-	if(control->conn_version > 32) {
-	    cmyth_timestamp_to_isostring(originalairdate,
-	                         prog->proginfo_originalairdate);
-        }				 
-
-	if (control->conn_version < 12)
-	{
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: fill not supported with protocol ver %d\n",
-			  __FUNCTION__, control->conn_version);
-		return -EINVAL;
-	}
-	sprintf(buf, "%s %s[]:[]0[]:[]", cmd, host);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_title));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_subtitle));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_description));
-	if (control->conn_version >= 67) {
-		sprintf(buf + strlen(buf), "%u[]:[]", prog->proginfo_season);
-		sprintf(buf + strlen(buf), "%u[]:[]", prog->proginfo_episode);
-	}
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_category));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_chanId);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chanstr));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chansign));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_channame));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_url));
-	if (control->conn_version >= 57) {
-		sprintf(buf + strlen(buf), "%"PRId64"[]:[]", prog->proginfo_Length);
-	} else {
-		sprintf(buf + strlen(buf), "%d[]:[]", (int32_t)(prog->proginfo_Length >> 32));
-		sprintf(buf + strlen(buf), "%d[]:[]", (int32_t)(prog->proginfo_Length & 0xffffffff));
-	}
-	sprintf(buf + strlen(buf), "%s[]:[]",  start_ts);
-	sprintf(buf + strlen(buf), "%s[]:[]",  end_ts);
-	if (control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_unknown_0)); // "duplicate"
-		sprintf(buf + strlen(buf), "%ld[]:[]", 0L); // "shareable"
-	}
-	sprintf(buf + strlen(buf), "%ld[]:[]", 0L); // "findid"
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_hostname));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_source_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_card_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_input_id);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_rec_priority));
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_status);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_record_id);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_type);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_rec_dups);
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_unknown_1); // "dupmethod"
-	sprintf(buf + strlen(buf), "%s[]:[]",  rec_start_ts);
-	sprintf(buf + strlen(buf), "%s[]:[]",  rec_end_ts);
-	if (control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_repeat);
-	}
-	sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_program_flags);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_recgroup));
-	if (control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chancommfree));
-	}
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_chan_output_filters));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_seriesid));
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_programid));
-	if (control->conn_version >= 67) {
-		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_inetref));
-	}
-	sprintf(buf + strlen(buf), "%s[]:[]",  lastmodified);
-	sprintf(buf + strlen(buf), "%s[]:[]",  S(prog->proginfo_stars));
-	sprintf(buf + strlen(buf), "%s[]:[]",  originalairdate);
-	if (control->conn_version >= 15 && control->conn_version < 57) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_hasairdate);
-	}
-	if (control->conn_version >= 18) {
-		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_playgroup));
-	}
-	if (control->conn_version >= 25) {
-		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_recpriority_2));
-	}
-	if (control->conn_version >= 31) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_parentid);
-	}
-	if (control->conn_version >= 32) {
-		sprintf(buf + strlen(buf), "%s[]:[]", S(prog->proginfo_storagegroup));
-	}
-	if (control->conn_version >= 35) {
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_audioproperties);
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_videoproperties);
-		sprintf(buf + strlen(buf), "%ld[]:[]", prog->proginfo_subtitletype);
-	}
-	if (control->conn_version >= 43) {
-		sprintf(buf + strlen(buf), "%d[]:[]", prog->proginfo_year);
-	}
-#undef S
-
-	if ((err = cmyth_send_message(control, buf)) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_send_message() failed (%d)\n",
-			  __FUNCTION__, err);
-		ret = err;
-		goto out;
-	}
-
-    out:
-	return ret;
-}
-
 /*
- * cmyth_proginfo_fill(cmyth_conn_t control, cmyth_proginfo_t prog)
+ * cmyth_proginfo_fill()
  *
  * Scope: PRIVATE (static)
  *
@@ -1488,9 +1444,11 @@
 cmyth_proginfo_fill(cmyth_conn_t control, cmyth_proginfo_t prog)
 {
 	int err = 0;
-	int count;
-	int ret;
-	long long length = 0;
+	int count = 0;
+	int ret = 0;
+	char *buf;
+	char *proginfo;
+	int64_t length = 0;
 
 	if (!control) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
@@ -1503,11 +1461,33 @@
 		return -EINVAL;
 	}
 
+	proginfo = cmyth_proginfo_string(control, prog);
+	if (proginfo == NULL) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: program_info failed.\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+
+	buf = malloc(strlen(proginfo) + 34 + 1);
+	if (!buf) {
+		free(proginfo);
+		return -ENOMEM;
+	}
+	sprintf(buf, "FILL_PROGRAM_INFO cmyth[]:[]0[]:[]%s", proginfo);
+	free(proginfo);
+
 	pthread_mutex_lock(&mutex);
 
 	length = prog->proginfo_Length;
-	if ((ret=fill_command(control, prog, "FILL_PROGRAM_INFO") != 0))
+
+	if ((err = cmyth_send_message(control, buf)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR,
+			  "%s: cmyth_send_message() failed (%d)\n",
+			  __FUNCTION__, err);
+		ret = err;
 		goto out;
+	}
 
 	count = cmyth_rcv_length(control);
 	if (count < 0) {
@@ -1537,16 +1517,15 @@
 		prog->proginfo_Length = length;
 	}
 
-	ret = 0;
-
-    out:
+	out:
 	pthread_mutex_unlock(&mutex);
+	free(buf);
 
 	return ret;
 }
 
 /*
- * cmyth_proginfo_get_detail(cmyth_conn_t control, cmyth_proginfo_t prog)
+ * cmyth_proginfo_get_detail()
  *
  * Scope: PUBLIC
  *
@@ -1590,7 +1569,7 @@
 }
 
 /*
- * cmyth_proginfo_compare(cmyth_proginfo_t a, cmyth_proginfo_t b)
+ * cmyth_proginfo_compare()
  *
  * Scope: PUBLIC
  *
@@ -1644,7 +1623,7 @@
 }
 
 /*
- * cmyth_proginfo_host(cmyth_proginfo_t prog)
+ * cmyth_proginfo_host()
  *
  * Scope: PUBLIC
  *
@@ -1670,52 +1649,52 @@
 	return ref_hold(prog->proginfo_host);
 }
 
-int
+uint16_t
 cmyth_proginfo_port(cmyth_proginfo_t prog)
 {
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: no program info\n", __FUNCTION__);
-		return -1;
+		return 0;
 	}
 
 	return prog->proginfo_port;
 }
 
-long
+uint32_t
 cmyth_proginfo_card_id(cmyth_proginfo_t prog)
 {
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: no program info\n", __FUNCTION__);
-		return -1;
+		return 0;
 	}
 
 	return prog->proginfo_card_id;
 }
 
-unsigned long
+uint32_t
 cmyth_proginfo_recordid(cmyth_proginfo_t prog)
 {
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: no program info\n", __FUNCTION__);
-		return -1;
+		return 0;
 	}
 
 	return prog->proginfo_record_id;
 }
 
-long
+int8_t
 cmyth_proginfo_priority(cmyth_proginfo_t prog)
 {
 	if (!prog) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: no program info\n", __FUNCTION__);
-		return -1;
+		return 0;
 	}
 
-	return atoi(prog->proginfo_rec_priority);
+	return prog->proginfo_rec_priority;
 }
 
 char *
@@ -1740,7 +1719,7 @@
 	return ref_hold(prog->proginfo_chanicon);
 }
 
-int 
+int
 cmyth_get_delete_list(cmyth_conn_t conn, char * msg, cmyth_proglist_t prog)
 {
         int err=0;
@@ -1830,7 +1809,7 @@
 
 		pthread_mutex_unlock(&mutex);
 		return prog;
-out:
+		out:
 		pthread_mutex_unlock(&mutex);
 		if(prog)
 			ref_release(prog);
@@ -1865,3 +1844,116 @@
 	}
 
 }
+
+cmyth_proginfo_t
+cmyth_proginfo_get_from_timeslot(cmyth_conn_t control, uint32_t chanid, time_t recstartts)
+{
+	int err = 0;
+	int count, i;
+	char msg[4096];
+	cmyth_proginfo_t prog = NULL;
+	cmyth_proglist_t list = NULL;
+	cmyth_timestamp_t ts;
+	char time[15];
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+
+	ts = cmyth_timestamp_from_unixtime(recstartts);
+	if (!ts) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: timestamp NULL\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+
+	sprintf(time,
+		"%4.4ld%2.2ld%2.2ld%2.2ld%2.2ld%2.2ld",
+		ts->timestamp_year,
+		ts->timestamp_month,
+		ts->timestamp_day,
+		ts->timestamp_hour,
+		ts->timestamp_minute,
+		ts->timestamp_second);
+
+	if(control->conn_version >= 32) {
+		pthread_mutex_lock(&mutex);
+
+		snprintf(msg, sizeof(msg), "QUERY_RECORDING TIMESLOT %"PRIu32" %s",
+			chanid, time);
+
+		if ((err=cmyth_send_message(control, msg)) < 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR,
+				  "%s: cmyth_send_message() failed (%d)\n",
+				  __FUNCTION__, err);
+			goto out;
+		}
+
+		count = cmyth_rcv_length(control);
+		if (count < 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR,
+				  "%s: cmyth_rcv_length() failed (%d)\n",
+				  __FUNCTION__, count);
+			goto out;
+		}
+
+		i = cmyth_rcv_string(control, &err, msg, sizeof(msg), count);
+		if (err) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed\n",
+				  __FUNCTION__);
+			goto out;
+		}
+		count -= i;
+
+		if (strcmp(msg, "OK") != 0) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: didn't recieve OK as response\n",
+				  __FUNCTION__);
+			goto out;
+		}
+
+		prog = cmyth_proginfo_create();
+		if (cmyth_rcv_proginfo(control, &err, prog, count) != count) {
+			cmyth_dbg(CMYTH_DBG_ERROR,
+				  "%s: cmyth_rcv_proginfo() < count\n", __FUNCTION__);
+			goto out;
+		}
+
+		pthread_mutex_unlock(&mutex);
+		return prog;
+		out:
+		pthread_mutex_unlock(&mutex);
+		if(prog)
+			ref_release(prog);
+		return NULL;
+
+	} else {
+
+		list = cmyth_proglist_get_all_recorded(control);
+		if (!list) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: no program list\n",
+				  __FUNCTION__);
+		}
+
+		count = cmyth_proglist_get_count(list);
+		for (i = 0;i < count; i++) {
+			prog = cmyth_proglist_get_item(list, i);
+			if (!prog) {
+				cmyth_dbg(CMYTH_DBG_DEBUG, "%s: no program info\n",
+					  __FUNCTION__);
+				continue;
+			}
+			if (cmyth_timestamp_compare(prog->proginfo_rec_start_ts, ts) != 0 ||
+					prog->proginfo_chanId != chanid) {
+				ref_release(prog);
+				prog = NULL;
+				continue;
+			}
+			break;
+		}
+		ref_release(list);
+		return prog;
+	}
+
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/proglist.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/proglist.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/proglist.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/proglist.c	2013-03-12 10:51:22.000000000 +0000
@@ -29,350 +29,9 @@
 #include <string.h>
 #include <cmyth_local.h>
 
-extern void destroy_char_array2(void* p)
-{
-	char** ptr = (char**)p;
-	if (!ptr)
-		return;
-	while (*ptr) {
-		ref_release(*ptr);
-		ptr++;
-	}
-}
-
-int cmyth_storagegroup_filelist(cmyth_conn_t control, char** *sgFilelist, char* sg2List, char*  host)
-{
-	char msg[256];
-	int res = 0;
-	int count;
-	int err = 0;
-	int i = 0;
-	char **ret;
-	int consumed; /* = profiles;*/
-	char tmp_str[32768];
-
-	if (!control) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
-		return 0;
-	}
-
-	pthread_mutex_lock(&mutex);
-
-	snprintf(msg, sizeof(msg), "QUERY_SG_GETFILELIST[]:[]%s[]:[]%s[]:[][]:[]1", host, sg2List);
-
-	err = cmyth_send_message(control, msg);
-	if (err < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
-		res = 0;
-		goto out;
-	}
-
-	count = cmyth_rcv_length(control);
-	if (count < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
-		res = 0;
-		goto out;
-	}
-
-	ret = (char**)ref_alloc(sizeof( char*) * (count + 1)); /* count + 1 ? */
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
-		res = 0;
-		goto out;
-	}
-	ref_set_destroy((void*)ret,destroy_char_array2);
-
-	while (i < count) {
-		consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
-		count -= consumed;
-		if (err) {
-			cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
-			res = 0;
-			goto out;
-		}
-		ret[res] = ref_strdup(tmp_str);
-		res++;
-	}
-
-	ret[res] = NULL;
-
-	cmyth_dbg(CMYTH_DBG_ERROR, "%s: results= %d\n", __FUNCTION__, res);
-	*sgFilelist=ret;
-
-	out:
-	pthread_mutex_unlock(&mutex);
-	return res;
-}
-
-static void
-cmyth_storagegroup_file_destroy(cmyth_storagegroup_file_t pl)
-{
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
-	}
-	if(pl->filename)
-		ref_release(pl->filename);
-	if(pl->storagegroup)
-		ref_release(pl->storagegroup);
-	if(pl->hostname)
-		ref_release(pl->hostname);
-}
-
-cmyth_storagegroup_file_t
-cmyth_storagegroup_file_create(void)
-{
-	cmyth_storagegroup_file_t ret = ref_alloc(sizeof(*ret));
-	memset(ret, 0, sizeof(*ret));
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_DEBUG, "%s }!\n", __FUNCTION__);
-		return NULL;
-	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_storagegroup_file_destroy);
-
-	return ret;
-}
-
-static void
-cmyth_storagegroup_filelist_destroy(cmyth_storagegroup_filelist_t pl)
-{
-	int i;
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	if (!pl) {
-		return;
-	}
-	for (i = 0; i < pl->storagegroup_filelist_count; ++i) {
-		if (pl->storagegroup_filelist_list[i]) {
-			ref_release(pl->storagegroup_filelist_list[i]);
-		}
-		pl->storagegroup_filelist_list[i] = NULL;
-	}
-	if (pl->storagegroup_filelist_list) {
-		free(pl->storagegroup_filelist_list);
-	}
-}
-
-cmyth_storagegroup_filelist_t
-cmyth_storagegroup_filelist_create(void)
-{
-	cmyth_storagegroup_filelist_t ret;
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
-	ret = ref_alloc(sizeof(*ret));
-	if (!ret) {
-		return(NULL);
-	}
-	ref_set_destroy(ret, (ref_destroy_t)cmyth_storagegroup_filelist_destroy);
-
-	ret->storagegroup_filelist_list = NULL;
-	ret->storagegroup_filelist_count = 0;
-	return ret;
-}
-
-int
-cmyth_storagegroup_update_fileinfo(cmyth_conn_t control, cmyth_storagegroup_file_t file)
-{
-	char msg[256];
-	int count;
-	int err = 0;
-	int consumed; /* = profiles;*/
-	char tmp_str[32768];
-
-	if (!control) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
-		return -1;
-	}
-
-	if (!file) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no file specified\n", __FUNCTION__);
-		return -1;
-	}
-
-	snprintf(msg, sizeof(msg), "QUERY_SG_FILEQUERY[]:[]%s[]:[]%s[]:[]%s",file->hostname , file->storagegroup, file->filename);
-
-	err = cmyth_send_message(control, msg);
-	if (err < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
-		return -1;
-	}
-
-	count = cmyth_rcv_length(control);
-	if (count < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
-		return -1;
-	}
-
-	consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
-	count -= consumed;
-
-	if (err) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
-		return -1;
-	} else if (count == 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: QUERY_SG_FILEQUERY failed(%s)\n", __FUNCTION__, tmp_str);
-		return -1;
-	}
-
-	consumed = cmyth_rcv_ulong(control, &err, &(file->modified), count);
-	count -= consumed;
-	if (err) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_ulong() failed (%d)\n", __FUNCTION__, count);
-		return -1;
-	}
-
-	consumed = cmyth_rcv_ulong(control, &err, &(file->size), count);
-	count -= consumed;
-	if (err) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_ulong_long() failed (%d)\n", __FUNCTION__, count);
-		return -1;
-	}
-
-	return 0;
-}
-
-cmyth_storagegroup_filelist_t
-cmyth_storagegroup_get_filelist(cmyth_conn_t control,char* storagegroup, char* hostname)
-{
-	char msg[256];
-	int res = 0;
-	int count = 0;
-	int err = 0;
-	int i = 0;
-	int listsize = 10;
-	cmyth_storagegroup_filelist_t ret = 0;
-	cmyth_storagegroup_file_t file = 0;
-	int consumed = 0; /* = profiles; */
-	char tmp_str[32768];
-
-	if (!control) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
-		return 0;
-	}
-
-	pthread_mutex_lock(&mutex);
-
-	snprintf(msg, sizeof(msg), "QUERY_SG_GETFILELIST[]:[]%s[]:[]%s[]:[][]:[]1", hostname, storagegroup);
-
-	err = cmyth_send_message(control, msg);
-	if (err < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
-		goto out;
-	}
-
-	count = cmyth_rcv_length(control);
-	if (count < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
-		goto out;
-	}
-
-	ret = cmyth_storagegroup_filelist_create();
-
-	if (!ret) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
-		ref_release(ret);
-		ret = 0;
-		goto out;
-	}
-
-	ret->storagegroup_filelist_count = 0;
-	ret->storagegroup_filelist_list = malloc(listsize * sizeof(cmyth_storagegroup_file_t));
-	if (!ret->storagegroup_filelist_list) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for filelist list\n", __FUNCTION__);
-		ref_release(ret);
-		ret = 0;
-		goto out;
-	}
-	while (count) {
-		consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
-		count -= consumed;
-		if (err) {
-			cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
-			ref_release(ret);
-			ret = 0;
-			goto out;
-		}
-		if (res>listsize-1)
-		{
-			listsize += 10;
-			ret->storagegroup_filelist_list = realloc(ret->storagegroup_filelist_list,listsize * sizeof(cmyth_storagegroup_file_t));
-			if (!ret->storagegroup_filelist_list) {
-				cmyth_dbg(CMYTH_DBG_ERROR, "%s: realloc() failed for filelist list\n", __FUNCTION__);
-				ref_release(ret);
-				ret = 0;
-				goto out;
-			}
-		}
-		file = cmyth_storagegroup_file_create();
-		file->filename = ref_strdup(tmp_str);
-		file->storagegroup = ref_strdup(storagegroup);
-		file->hostname = ref_strdup(hostname);
-		file->size = 0;
-		file->modified = 0;
-		ret->storagegroup_filelist_list[res] = file;
-		res++;
-	}
-	ret->storagegroup_filelist_count=res;
-
-	for(i = 0;i< ret->storagegroup_filelist_count;i++) {
-		cmyth_storagegroup_update_fileinfo(control,ret->storagegroup_filelist_list[i]);
-	}
-
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: results= %d\n", __FUNCTION__, res);
-
-    out:
-	pthread_mutex_unlock(&mutex);
-	return ret;
-}
-
-int cmyth_storagegroup_filelist_count(cmyth_storagegroup_filelist_t fl)
-{
-	if (!fl) {
-		return -EINVAL;
-	}
-	return fl->storagegroup_filelist_count;
-}
-
-cmyth_storagegroup_file_t cmyth_storagegroup_filelist_get_item(cmyth_storagegroup_filelist_t fl, int index)
-{
-	if (!fl||index>=fl->storagegroup_filelist_count) {
-		return NULL;
-	}
-	ref_hold(fl->storagegroup_filelist_list[index]);
-	return fl->storagegroup_filelist_list[index];;
- }
-
-char* cmyth_storagegroup_file_get_filename(cmyth_storagegroup_file_t file)
-{
-	if (!file) {
-		return NULL;
-	}
-	return ref_hold(file->filename);
-}
-
-unsigned long cmyth_storagegroup_file_get_lastmodified(cmyth_storagegroup_file_t file)
-{
-	if (!file) {
-		return 0;
-	}
-	return file->modified;
-}
-
-unsigned long long cmyth_storagegroup_file_get_size(cmyth_storagegroup_file_t file)
-{
-	if (!file) {
-		return 0;
-	}
-	return file->size;
-}
-
-
 /*
- * cmyth_proglist_destroy(void)
- * 
+ * cmyth_proglist_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -406,8 +65,8 @@
 }
 
 /*
- * cmyth_proglist_create(void)
- * 
+ * cmyth_proglist_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -438,7 +97,7 @@
 }
 
 /*
- * cmyth_proglist_get_item(cmyth_proglist_t pl, int index)
+ * cmyth_proglist_get_item()
  *
  * Scope: PUBLIC
  *
@@ -517,7 +176,7 @@
 }
 
 /*
- * cmyth_proglist_get_count(cmyth_proglist_t pl)
+ * cmyth_proglist_get_count()
  *
  * Scope: PUBLIC
  *
@@ -544,10 +203,8 @@
 }
 
 /*
- * cmyth_proglist_get_list(cmyth_conn_t conn,
- *                         cmyth_proglist_t proglist,
- *                         char *msg, char *func)
- * 
+ * cmyth_proglist_get_list()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -598,9 +255,9 @@
 		goto out;
 	}
 	if (strcmp(msg, "QUERY_GETALLPENDING") == 0) {
-		long c;
+		int32_t c;
 		int r;
-		if ((r=cmyth_rcv_long(conn, &err, &c, count)) < 0) {
+		if ((r = cmyth_rcv_int32(conn, &err, &c, count)) < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
 				  "%s: cmyth_rcv_length() failed (%d)\n",
 				  __FUNCTION__, r);
@@ -631,9 +288,8 @@
 }
 
 /*
- * cmyth_proglist_get_all_recorded(cmyth_conn_t control,
- *                                 cmyth_proglist_t *proglist)
- * 
+ * cmyth_proglist_get_all_recorded()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -681,9 +337,8 @@
 }
 
 /*
- * cmyth_proglist_get_all_pending(cmyth_conn_t control,
- *                                cmyth_proglist_t *proglist)
- * 
+ * cmyth_proglist_get_all_pending()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -724,9 +379,8 @@
 }
 
 /*
- * cmyth_proglist_get_all_scheduled(cmyth_conn_t control,
- *                                  cmyth_proglist_t *proglist)
- * 
+ * cmyth_proglist_get_all_scheduled()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -767,9 +421,8 @@
 }
 
 /*
- * cmyth_proglist_get_conflicting(cmyth_conn_t control,
- *                                cmyth_proglist_t *proglist)
- * 
+ * cmyth_proglist_get_conflicting()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -810,7 +463,7 @@
 }
 
 /*
- * sort_timestamp(const void *a, const void *b)
+ * sort_timestamp()
  *
  * Scope: PRIVATE
  *
@@ -818,7 +471,7 @@
  *
  * Return an integer value to specify the relative position of the timestamp
  * This is a helper function for the sort function called by qsort.  It will
- * sort any of the timetstamps for the qsort functions 
+ * sort any of the timetstamps for the qsort functions
  *
  * Return Value:
  *
@@ -846,7 +499,7 @@
 				return 1;
 			else if (X->timestamp_day < Y->timestamp_day)
 				return -1;
-			else /* X->timestamp_day == Y->timestamp_day */ 
+			else /* X->timestamp_day == Y->timestamp_day */
 			{
 				if (X->timestamp_hour > Y->timestamp_hour)
 					return 1;
@@ -874,17 +527,17 @@
 }
 
 /*
- * recorded_compare(const void *a, const void *b)
+ * recorded_compare()
  *
  * Scope: PRIVATE
  *
  * Description
  *
  * Return an integer value to a qsort function to specify the relative
- * position of the recorded date 
+ * position of the recorded date
  *
  * Return Value:
- * 
+ *
  * Same Day: 0
  * Date a > b: 1
  * Date a < b: -1
@@ -902,7 +555,7 @@
 }
 
 /*
- * airdate_compare(const void *a, const void *b)
+ * airdate_compare()
  *
  * Scope: PRIVATE
  *
@@ -912,7 +565,7 @@
  * position of the original airdate
  *
  * Return Value:
- * 
+ *
  * Same Day: 0
  * Date a > b: 1
  * Date a < b: -1
@@ -930,21 +583,21 @@
 }
 
 /*
- * cmyth_proglist_sort(cmyth_proglist_t pl, int count, int sort)
+ * cmyth_proglist_sort()
  *
  * Scope: PUBLIC
  *
  * Description
  *
- * Sort the epispde list by mythtv_sort setting. Check to ensure that the 
+ * Sort the epispde list by mythtv_sort setting. Check to ensure that the
  * program list is not null and pass the proglist_list to the qsort function
  *
  * Return Value:
- * 
+ *
  * Success = 0
  * Failure = -1
- */ 
-int 
+ */
+int
 cmyth_proglist_sort(cmyth_proglist_t pl, int count, cmyth_proglist_sort_t sort)
 {
         if (!pl) {
@@ -968,7 +621,7 @@
 		case MYTHTV_SORT_ORIGINAL_AIRDATE: /*Default Date Recorded */
 			qsort((cmyth_proginfo_t)pl->proglist_list, count, sizeof(pl->proglist_list) , airdate_compare);
 			break;
-		default: 
+		default:
 			printf("Unsupported MythTV sort type\n");
 	}
 
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/rec_num.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/rec_num.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/rec_num.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/rec_num.c	2013-03-12 10:51:22.000000000 +0000
@@ -27,8 +27,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_rec_num_destroy(cmyth_rec_num_t rn)
- * 
+ * cmyth_rec_num_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -55,8 +55,8 @@
 }
 
 /*
- * cmyth_rec_num_create(void)
- * 
+ * cmyth_rec_num_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -87,8 +87,8 @@
 }
 
 /*
- * cmyth_rec_num_hold(cmyth_rec_num_t p)
- * 
+ * cmyth_rec_num_hold()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -117,8 +117,8 @@
 }
 
 /*
- * cmyth_rec_num_release(cmyth_rec_num_t p)
- * 
+ * cmyth_rec_num_release()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -142,10 +142,8 @@
 }
 
 /*
- * cmyth_rec_num_get(char *host,
- *                    unsigned short port,
- *                    unsigned id)
- * 
+ * cmyth_rec_num_get()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -159,10 +157,10 @@
  *
  * Failure: NULL
  */
-cmyth_rec_num_t 
+cmyth_rec_num_t
 cmyth_rec_num_get(char *host,
-		   unsigned short port,
-		   unsigned id)
+		   uint16_t port,
+		   int32_t id)
 {
 	cmyth_rec_num_t ret;
 
@@ -180,8 +178,8 @@
 }
 
 /*
- * cmyth_rec_num_string(cmyth_rec_num_t rn)
- * 
+ * cmyth_rec_num_string()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -209,9 +207,9 @@
 	if (!rn->recnum_host) {
 		return NULL;
 	}
-	sprintf(id, "%d", rn->recnum_id);
+	sprintf(id, "%"PRId32, rn->recnum_id);
 	len += strlen(id);
-	sprintf(port, "%d", rn->recnum_port);
+	sprintf(port, "%"PRIu16, rn->recnum_port);
 	len += strlen(port);
 	len += strlen(rn->recnum_host);
 	ret = malloc((len + 1) * sizeof(char));
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/recorder.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/recorder.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/recorder.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/recorder.c	2013-03-12 10:51:22.000000000 +0000
@@ -34,8 +34,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_recorder_destroy(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -76,8 +76,8 @@
 }
 
 /*
- * cmyth_recorder_create(void)
- * 
+ * cmyth_recorder_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -114,8 +114,8 @@
 }
 
 /*
- * cmyth_recorder_dup(cmyth_recorder_t old)
- * 
+ * cmyth_recorder_dup()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -150,8 +150,8 @@
 }
 
 /*
- * cmyth_recorder_is_recording(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_is_recording()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -170,7 +170,8 @@
 {
 	int err, count;
 	int r;
-	long c, ret;
+	uint8_t c;
+	int ret;
 	char msg[256];
 
 	if (!rec) {
@@ -181,7 +182,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	snprintf(msg, sizeof(msg), "QUERY_RECORDER %u[]:[]IS_RECORDING",
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]IS_RECORDING",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -193,7 +194,7 @@
 	}
 
 	count = cmyth_rcv_length(rec->rec_conn);
-	if ((r=cmyth_rcv_long(rec->rec_conn, &err, &c, count)) < 0) {
+	if ((r = cmyth_rcv_uint8(rec->rec_conn, &err, &c, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_length() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -210,10 +211,8 @@
 }
 
 /*
- * cmyth_recorder_get_framerate(
- *                              cmyth_recorder_t rec,
- *                              double *rate)
- * 
+ * cmyth_recorder_get_framerate()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -245,7 +244,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	snprintf(msg, sizeof(msg), "QUERY_RECORDER %u[]:[]GET_FRAMERATE",
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]GET_FRAMERATE",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -276,9 +275,8 @@
 }
 
 /*
- * cmyth_recorder_get_frames_written(cmyth_recorder_t rec,
- *                                   double *rate)
- * 
+ * cmyth_recorder_get_frames_written()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -291,15 +289,15 @@
  *
  * Failure: long long -(ERRNO)
  */
-long long
+int64_t
 cmyth_recorder_get_frames_written(cmyth_recorder_t rec)
 {
-	return (long long) -ENOSYS;
+	return (int64_t) -ENOSYS;
 }
 
 /*
- * cmyth_recorder_get_free_space(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_get_free_space()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -313,15 +311,15 @@
  *
  * Failure: long long -(ERRNO)
  */
-long long
+int64_t
 cmyth_recorder_get_free_space(cmyth_recorder_t rec)
 {
-	return (long long) -ENOSYS;
+	return (int64_t) -ENOSYS;
 }
 
 /*
- * cmyth_recorder_get_key_frame(cmyth_recorder_t rec, long keynum)
- * 
+ * cmyth_recorder_get_key_frame()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -335,18 +333,15 @@
  *
  * Failure: long long -(ERRNO)
  */
-long long
-cmyth_recorder_get_keyframe_pos(cmyth_recorder_t rec, unsigned long keynum)
+int64_t
+cmyth_recorder_get_keyframe_pos(cmyth_recorder_t rec, uint32_t keynum)
 {
-	return (long long)-ENOSYS;
+	return (int64_t)-ENOSYS;
 }
 
 /*
- * cmyth_recorder_get_position_map(cmyth_recorder_t rec,
- *                                 cmyth_posmap_t map,
- *                                 long start,
- *                                 long end)
- * 
+ * cmyth_recorder_get_position_map()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -363,15 +358,15 @@
  */
 cmyth_posmap_t
 cmyth_recorder_get_position_map(cmyth_recorder_t rec,
-				unsigned long start,
-				unsigned long end)
+				uint32_t start,
+				uint32_t end)
 {
 	return NULL;
 }
 
 /*
- * cmyth_recorder_get_recording(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_get_recording()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -392,8 +387,8 @@
 }
 
 /*
- * cmyth_recorder_stop_playing(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_stop_playing()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -414,8 +409,8 @@
 }
 
 /*
- * cmyth_recorder_frontend_ready(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_frontend_ready()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -435,14 +430,15 @@
 }
 
 /*
- * cmyth_recorder_cancel_next_recording(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_cancel_next_recording()
+ *
  * Scope: PUBLIC
  *
  * Description
  *
- * Request that the recorder 'rec' cancel its next scheduled
- * recording.
+ * Request that the recorder 'rec' cancels its next scheduled recording.
+ * This is used as response to ASK_RECORDING when the user does not want
+ * to allow the recorder to be taken for a pending recording.
  *
  * Return Value:
  *
@@ -451,14 +447,42 @@
  * Failure: -(ERRNO)
  */
 int
-cmyth_recorder_cancel_next_recording(cmyth_recorder_t rec)
+cmyth_recorder_cancel_next_recording(cmyth_recorder_t rec, int cancel)
 {
-	return -ENOSYS;
+	int err;
+	int ret = -1;
+	char msg[256];
+
+	if (!rec) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no recorder connection\n", __FUNCTION__);
+		return -ENOSYS;
+	}
+
+	pthread_mutex_lock(&mutex);
+
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]CANCEL_NEXT_RECORDING[]:[]%"PRIu32 ,rec->rec_id, cancel == 1);
+
+	if ((err = cmyth_send_message(rec->rec_conn, msg)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
+		goto fail;
+	}
+
+	if ((err = cmyth_rcv_okay(rec->rec_conn)) < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_okay() failed (%d)\n", __FUNCTION__, err);
+		goto fail;
+	}
+
+	ret = 0;
+
+fail:
+	pthread_mutex_unlock(&mutex);
+
+	return ret;
 }
 
 /*
- * cmyth_recorder_pause(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_pause()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -489,7 +513,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	sprintf(Buffer, "QUERY_RECORDER %ld[]:[]PAUSE", (long) rec->rec_id);
+	sprintf(Buffer, "QUERY_RECORDER %"PRIu32"[]:[]PAUSE", rec->rec_id);
 	if ((ret=cmyth_send_message(rec->rec_conn, Buffer)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_send_message('%s') failed\n",
@@ -512,8 +536,8 @@
 }
 
 /*
- * cmyth_recorder_finish_recording(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_finish_recording()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -534,8 +558,8 @@
 }
 
 /*
- * cmyth_recorder_toggle_channel_favorite(cmyth_recorder_t rec)
- * 
+ * cmyth_recorder_toggle_channel_favorite()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -558,9 +582,8 @@
 }
 
 /*
- * cmyth_recorder_change_channel(cmyth_recorder_t rec,
- *                               cmyth_channeldir_t direction)
- * 
+ * cmyth_recorder_change_channel()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -569,11 +592,11 @@
  * followin
  *
  * CHANNEL_DIRECTION_UP       - Go up one channel in the listing
- * 
+ *
  * CHANNEL_DIRECTION_DOWN     - Go down one channel in the listing
- * 
+ *
  * CHANNEL_DIRECTION_FAVORITE - Go to the next favorite channel
- * 
+ *
  * CHANNEL_DIRECTION_SAME     - Stay on the same (current) channel
  *
  * Note that the recorder must not be actively recording when this
@@ -604,7 +627,7 @@
 	pthread_mutex_lock(&mutex);
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %d[]:[]CHANGE_CHANNEL[]:[]%d",
+		 "QUERY_RECORDER %"PRIu32"[]:[]CHANGE_CHANNEL[]:[]%d",
 		 rec->rec_id, direction);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -641,9 +664,8 @@
 }
 
 /*
- * cmyth_recorder_set_channel(cmyth_recorder_t rec,
- *                            char *channame)
- * 
+ * cmyth_recorder_set_channel()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -678,7 +700,7 @@
 	pthread_mutex_lock(&mutex);
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %d[]:[]SET_CHANNEL[]:[]%s",
+		 "QUERY_RECORDER %"PRIu32"[]:[]SET_CHANNEL[]:[]%s",
 		 rec->rec_id, channame);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -715,9 +737,8 @@
 }
 
 /*
- * cmyth_recorder_change_color(cmyth_recorder_t rec,
- *                             cmyth_adjdir_t direction)
- * 
+ * cmyth_recorder_change_color()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -746,9 +767,8 @@
 }
 
 /*
- * cmyth_recorder_change_brightness(cmyth_recorder_t rec,
- *                                  cmyth_adjdir_t direction)
- * 
+ * cmyth_recorder_change_brightness()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -778,9 +798,8 @@
 }
 
 /*
- * cmyth_recorder_change_contrast(cmyth_recorder_t rec,
- *                                cmyth_adjdir_t direction)
- * 
+ * cmyth_recorder_change_contrast()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -809,9 +828,8 @@
 }
 
 /*
- * cmyth_recorder_change_hue(cmyth_recorder_t rec,
- *                           cmyth_adjdir_t direction)
- * 
+ * cmyth_recorder_change_hue()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -840,8 +858,8 @@
 }
 
 /*
- * cmyth_recorder_check_channel(cmyth_recorder_t rec, char *channame)
- * 
+ * cmyth_recorder_check_channel()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -874,7 +892,7 @@
 	pthread_mutex_lock(&mutex);
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %d[]:[]CHECK_CHANNEL[]:[]%s",
+		 "QUERY_RECORDER %"PRIu32"[]:[]CHECK_CHANNEL[]:[]%s",
 		 rec->rec_id, channame);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -885,13 +903,11 @@
 	}
 
 	if ((err=cmyth_rcv_feedback(rec->rec_conn, "1")) < 0) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_rcv_feedback() failed (%d)\n",
-			  __FUNCTION__, err);
+		ret = 0;
 		goto fail;
 	}
 
-	ret = 0;
+	ret = 1;
 
     fail:
 	pthread_mutex_unlock(&mutex);
@@ -900,9 +916,8 @@
 }
 
 /*
- * cmyth_recorder_check_channel_prefix(cmyth_recorder_t rec,
- *                                     char *channame)
- * 
+ * cmyth_recorder_check_channel_prefix()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -923,7 +938,7 @@
 }
 
 /*
- * cmyth_recorder_get_program_info(cmyth_recorder_t rec)
+ * cmyth_recorder_get_program_info()
  *
  * Scope: PRIVATE (static)
  *
@@ -964,10 +979,10 @@
 	pthread_mutex_lock(&mutex);
 
 	if(rec->rec_conn->conn_version >= 26)
-		snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]GET_CURRENT_RECORDING",
+		snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]GET_CURRENT_RECORDING",
 		 	rec->rec_id);
 	else
-		snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]GET_PROGRAM_INFO",
+		snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]GET_PROGRAM_INFO",
 		 	rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -985,7 +1000,7 @@
 		ct = cmyth_rcv_proginfo(rec->rec_conn, &err, proginfo, count);
 	else
 		ct = cmyth_rcv_chaninfo(rec->rec_conn, &err, proginfo, count);
-		
+
 	if (ct != count) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_proginfo() < count\n", __FUNCTION__);
@@ -1001,7 +1016,7 @@
 }
 
 /*
- * cmyth_recorder_get_cur_proginfo(cmyth_recorder_t rec)
+ * cmyth_recorder_get_cur_proginfo()
  *
  * Scope: PUBLIC
  *
@@ -1038,9 +1053,7 @@
 }
 
 /*
- * cmyth_recorder_get_next_program_info(cmyth_recorder_t rec,
- *                                      cmyth_proginfo_t proginfo,
- *                                      cmyth_browsedir_t direction)
+ * cmyth_recorder_get_next_program_info()
  *
  * Scope: PRIVATE (static)
  *
@@ -1101,7 +1114,7 @@
 		 tm->tm_year + 1900, tm->tm_mon + 1,
 		 tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
 
-        snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]GET_NEXT_PROGRAM_INFO[]:[]%s[]:[]%ld[]:[]%i[]:[]%s",
+        snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]GET_NEXT_PROGRAM_INFO[]:[]%s[]:[]%"PRIu32"[]:[]%d[]:[]%s",
                  rec->rec_id, cur_prog->proginfo_channame,
 		 cur_prog->proginfo_chanId, direction, date);
 
@@ -1170,14 +1183,14 @@
 		next_prog->proginfo_chansign = cmyth_utf8tolatin1(callsign);
 	}
 	next_prog->proginfo_chanicon = ref_strdup(iconpath);
-	
+
 	next_prog->proginfo_chanId = atoi(chanid);
 
 	ref_hold(next_prog->proginfo_start_ts);
 	ref_hold(next_prog->proginfo_end_ts);
 
 	ret = 0;
- 
+
     out:
         pthread_mutex_unlock(&mutex);
 
@@ -1185,9 +1198,7 @@
 }
 
 /*
- * cmyth_recorder_get_next_proginfo(cmyth_recorder_t rec,
- *                                  cmyth_proginfo_t current,
- *                                  cmyth_browsedir_t direction)
+ * cmyth_recorder_get_next_proginfo()
  *
  * Scope: PUBLIC
  *
@@ -1244,7 +1255,7 @@
 }
 
 /*
- * cmyth_recorder_get_input_name(cmyth_recorder_t rec)
+ * cmyth_recorder_get_input_name()
  *
  * Scope: PUBLIC
  *
@@ -1275,10 +1286,7 @@
 }
 
 /*
- * cmyth_recorder_seek(cmyth_recorder_t rec,
- *                     long long pos,
- *                     cmyth_whence_t whence,
- *                     long long curpos)
+ * cmyth_recorder_seek()
  *
  * Scope: PUBLIC
  *
@@ -1304,18 +1312,18 @@
  *
  * Failure: (long long) -(ERRNO)
  */
-long long
+int64_t
 cmyth_recorder_seek(cmyth_recorder_t rec,
-                    long long pos,
-		    cmyth_whence_t whence,
-		    long long curpos)
+                    int64_t pos,
+		    int8_t whence,
+		    int64_t curpos)
 
 {
-	return (long long) -ENOSYS;
+	return (int64_t) -ENOSYS;
 }
 
 /*
- * cmyth_recorder_spawn_livetv(cmyth_recorder_t rec)
+ * cmyth_recorder_spawn_livetv()
  *
  * Scope: PUBLIC
  *
@@ -1345,7 +1353,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]SPAWN_LIVETV",
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]SPAWN_LIVETV",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -1396,15 +1404,15 @@
 	/* Get the current date and time to create a unique id */
 	t = time(NULL);
 	strftime(datestr, 32, "%Y-%m-%dT%H:%M:%S", localtime(&t));
-	
+
 	/* Now build the SPAWN_LIVETV message */
 	if(rec->rec_conn->conn_version >= 34 && channame)
 		snprintf(msg, sizeof(msg),
-			"QUERY_RECORDER %d[]:[]SPAWN_LIVETV[]:[]live-%s-%s[]:[]%d[]:[]%s",
+			"QUERY_RECORDER %"PRIu32"[]:[]SPAWN_LIVETV[]:[]live-%s-%s[]:[]%d[]:[]%s",
 			 rec->rec_id, myhostname, datestr, 0, channame);
 	else
 		snprintf(msg, sizeof(msg),
-			"QUERY_RECORDER %d[]:[]SPAWN_LIVETV[]:[]live-%s-%s[]:[]%d",
+			"QUERY_RECORDER %"PRIu32"[]:[]SPAWN_LIVETV[]:[]live-%s-%s[]:[]%d",
 			 rec->rec_id, myhostname, datestr, 0);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -1448,7 +1456,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]STOP_LIVETV",
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]STOP_LIVETV",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -1491,7 +1499,7 @@
 
 	pthread_mutex_lock(&mutex);
 
-	snprintf(msg, sizeof(msg), "QUERY_RECORDER %d[]:[]DONE_RINGBUF",
+	snprintf(msg, sizeof(msg), "QUERY_RECORDER %"PRIu32"[]:[]DONE_RINGBUF",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -1517,7 +1525,7 @@
 }
 
 /*
- * cmyth_recorder_start_stream(cmyth_recorder_t rec)
+ * cmyth_recorder_start_stream()
  *
  * Scope: PUBLIC
  *
@@ -1539,7 +1547,7 @@
 }
 
 /*
- * cmyth_recorder_end_stream(cmyth_recorder_t rec)
+ * cmyth_recorder_end_stream()
  *
  * Scope: PUBLIC
  *
@@ -1571,24 +1579,29 @@
 		return NULL;
 	}
 
-	if(rec->rec_conn->conn_version >= 26) 
-		snprintf(buf, sizeof(buf), "%s",
-			rec->rec_livetv_chain->chain_urls[rec->rec_livetv_chain->chain_current]);
+	if (rec->rec_conn->conn_version >= 26) {
+		if (rec->rec_livetv_chain && rec->rec_livetv_chain->chain_current >= 0) {
+			snprintf(buf, sizeof(buf), "%s",
+				rec->rec_livetv_chain->chain_urls[rec->rec_livetv_chain->chain_current]);
+		}
+		else
+			buf[0] = '\0';
+	}
 	else
-		snprintf(buf, sizeof(buf), "ringbuf%d.nuv", rec->rec_id);
+		snprintf(buf, sizeof(buf), "ringbuf%"PRIu32".nuv", rec->rec_id);
 
 	ret = ref_strdup(buf);
 
 	return ret;
 }
 
-int
+uint32_t
 cmyth_recorder_get_recorder_id(cmyth_recorder_t rec)
 {
 	if (!rec) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no recorder connection\n",
 			  __FUNCTION__);
-		return -EINVAL;
+		return 0;
 	}
 
 	return rec->rec_id;
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/recordingrule.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/recordingrule.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/recordingrule.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/recordingrule.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,855 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <cmyth_local.h>
+
+/*
+ * cmyth_recordingrule_destroy()
+ *
+ * Scope: PRIVATE (static)
+ *
+ * Description
+ *
+ * Destroy the recording schedule structure pointed to by 'rr' and release
+ * its storage.  This should only be called by ref_release().
+ * All others should use ref_release() to release references to a recording
+ * schedule structure.
+ *
+ * Return Value:
+ *
+ * None.
+ */
+static void
+cmyth_recordingrule_destroy(cmyth_recordingrule_t rr)
+{
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!rr) {
+		return;
+	}
+
+	if (rr->title)
+		ref_release(rr->title);
+	if (rr->description)
+		ref_release(rr->description);
+	if (rr->category)
+		ref_release(rr->category);
+	if (rr->recgroup)
+		ref_release(rr->recgroup);
+	if (rr->storagegroup)
+		ref_release(rr->storagegroup);
+	if (rr->playgroup)
+		ref_release(rr->playgroup);
+	if (rr->starttime)
+		ref_release(rr->starttime);
+	if (rr->endtime)
+		ref_release(rr->endtime);
+	if (rr->profile)
+		ref_release(rr->profile);
+	if (rr->inetref)
+		ref_release(rr->inetref);
+}
+
+/*
+ * cmyth_recordingrule_create()
+ *
+ * Scope: PRIVATE
+ *
+ * Description
+ *
+ * Create a recording schedule structure to be used to hold channel and return
+ * a pointer to the structure.
+ * Before forgetting the reference to this recording schedule structure the
+ * caller must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_channel_t (this type is a pointer)
+ *
+ * Failure: NULL
+ */
+cmyth_recordingrule_t
+cmyth_recordingrule_create(void)
+{
+	cmyth_recordingrule_t ret = ref_alloc(sizeof(*ret));
+	memset(ret, 0, sizeof(*ret));
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s: ref_alloc() failed\n", __FUNCTION__);
+		return NULL;
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_recordingrule_destroy);
+
+	ret->starttime = cmyth_timestamp_create();
+	if (!ret->starttime) {
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s: cmyth_timestamp_create() failed\n", __FUNCTION__);
+		goto err;
+	}
+	ret->endtime = cmyth_timestamp_create();
+	if (!ret->endtime) {
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s: cmyth_timestamp_create() failed\n", __FUNCTION__);
+		goto err;
+	}
+	return ret;
+
+	err:
+	ref_release(ret);
+	return NULL;
+}
+
+/*
+ * cmyth_recordingrulelist_destroy()
+ *
+ * Scope: PRIVATE (static)
+ *
+ * Description
+ *
+ * Destroy the recordings schedule list structure pointed to by 'rrl' and
+ * release its storage.  This should only be called by ref_release().
+ * All others should use ref_release() to release references to a recordings
+ * schedule list structure.
+ *
+ * Return Value:
+ *
+ * None.
+ */
+static void
+cmyth_recordingrulelist_destroy(cmyth_recordingrulelist_t rrl)
+{
+	int i;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!rrl) {
+		return;
+	}
+	for (i  = 0; i < rrl->recordingrulelist_count; ++i) {
+		if (rrl->recordingrulelist_list[i]) {
+			ref_release(rrl->recordingrulelist_list[i]);
+		}
+		rrl->recordingrulelist_list[i] = NULL;
+	}
+	if (rrl->recordingrulelist_list) {
+		free(rrl->recordingrulelist_list);
+	}
+}
+
+/*
+ * cmyth_recordingrulelist_create()
+ *
+ * Scope: PRIVATE
+ *
+ * Description
+ *
+ * Create a recordings schedule list structure and return a pointer to the
+ * structure.
+ * Before forgetting the reference to this recordings schedule list structure
+ * the caller must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_recordingrulelist_t (this type is a pointer)
+ *
+ * Failure: NULL
+ */
+cmyth_recordingrulelist_t
+cmyth_recordingrulelist_create(void)
+{
+	cmyth_recordingrulelist_t ret;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	ret = ref_alloc(sizeof(*ret));
+	if (!ret) {
+		return(NULL);
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_recordingrulelist_destroy);
+
+	ret->recordingrulelist_list = NULL;
+	ret->recordingrulelist_count = 0;
+	return ret;
+}
+
+/*
+ * cmyth_recordingrule_init()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Initialize a new recording schedule structure.  The structure is initialized
+ * to default values.
+ * Before forgetting the reference to this recording schedule structure
+ * the caller must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_recordingrule_t (this type is a pointer)
+ *
+ * Failure: NULL
+ */
+cmyth_recordingrule_t
+cmyth_recordingrule_init(void)
+{
+	cmyth_recordingrule_t rr = cmyth_recordingrule_create();
+	if (!rr) {
+		cmyth_dbg(CMYTH_DBG_ERROR,"%s: cmyth_recordingrule_create failed\n", __FUNCTION__);
+		return NULL;
+	}
+	cmyth_recordingrule_set_recordid(rr, 0);
+	cmyth_recordingrule_set_chanid(rr, 0);
+	cmyth_recordingrule_set_callsign(rr, "");
+	cmyth_recordingrule_set_starttime(rr, 0);
+	cmyth_recordingrule_set_endtime(rr, 0);
+	cmyth_recordingrule_set_title(rr, "");
+	cmyth_recordingrule_set_description(rr, "");
+	cmyth_recordingrule_set_type(rr, RRULE_DONT_RECORD);
+	cmyth_recordingrule_set_category(rr, "");
+	cmyth_recordingrule_set_subtitle(rr, "");
+	cmyth_recordingrule_set_recpriority(rr, 0);
+	cmyth_recordingrule_set_startoffset(rr, 0);
+	cmyth_recordingrule_set_endoffset(rr, 0);
+	cmyth_recordingrule_set_searchtype(rr, RRULE_NO_SEARCH);
+	cmyth_recordingrule_set_inactive(rr, 0);
+	cmyth_recordingrule_set_dupmethod(rr, RRULE_CHECK_NONE);
+	cmyth_recordingrule_set_dupin(rr, RRULE_IN_RECORDED);
+	cmyth_recordingrule_set_recgroup(rr, "Default");
+	cmyth_recordingrule_set_storagegroup(rr, "Default");
+	cmyth_recordingrule_set_playgroup(rr, "Default");
+	cmyth_recordingrule_set_autotranscode(rr, 0);
+	cmyth_recordingrule_set_userjobs(rr, 0);
+	cmyth_recordingrule_set_autocommflag(rr, 0);
+	cmyth_recordingrule_set_autoexpire(rr, 0);
+	cmyth_recordingrule_set_maxepisodes(rr, 0);
+	cmyth_recordingrule_set_maxnewest(rr, 0);
+	cmyth_recordingrule_set_transcoder(rr, 0);
+        cmyth_recordingrule_set_profile(rr, "Default");
+	cmyth_recordingrule_set_prefinput(rr, 0);
+	cmyth_recordingrule_set_autometadata(rr, 0);
+	cmyth_recordingrule_set_inetref(rr, "");
+	cmyth_recordingrule_set_season(rr, 0);
+	cmyth_recordingrule_set_episode(rr, 0);
+	cmyth_recordingrule_set_filter(rr, 0);
+	return rr;
+}
+
+uint32_t
+cmyth_recordingrule_recordid(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->recordid;
+}
+
+void
+cmyth_recordingrule_set_recordid(cmyth_recordingrule_t rr, uint32_t recordid)
+{
+	rr->recordid = recordid;
+}
+
+uint32_t
+cmyth_recordingrule_chanid(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->chanid;
+}
+
+void
+cmyth_recordingrule_set_chanid(cmyth_recordingrule_t rr, uint32_t chanid)
+{
+	rr->chanid = chanid;
+}
+
+char *
+cmyth_recordingrule_callsign(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->callsign);
+}
+
+void
+cmyth_recordingrule_set_callsign(cmyth_recordingrule_t rr, char *callsign)
+{
+	if (rr->callsign)
+		ref_release(rr->callsign);
+	rr->callsign = ref_strdup(callsign);
+}
+
+time_t
+cmyth_recordingrule_starttime(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return cmyth_timestamp_to_unixtime(rr->starttime);
+}
+
+void
+cmyth_recordingrule_set_starttime(cmyth_recordingrule_t rr, time_t starttime)
+{
+	if (rr->starttime)
+		ref_release(rr->starttime);
+	rr->starttime = cmyth_timestamp_from_unixtime(starttime);
+}
+
+time_t
+cmyth_recordingrule_endtime(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return cmyth_timestamp_to_unixtime(rr->endtime);
+}
+
+void
+cmyth_recordingrule_set_endtime(cmyth_recordingrule_t rr, time_t endtime)
+{
+	if (rr->endtime)
+		ref_release(rr->endtime);
+	rr->endtime = cmyth_timestamp_from_unixtime(endtime);
+}
+
+char *
+cmyth_recordingrule_title(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->title);
+}
+
+void
+cmyth_recordingrule_set_title(cmyth_recordingrule_t rr, char *title)
+{
+	if (rr->title)
+		ref_release(rr->title);
+	rr->title = ref_strdup(title);
+}
+
+char *
+cmyth_recordingrule_description(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->description);
+}
+
+void
+cmyth_recordingrule_set_description(cmyth_recordingrule_t rr, char *description)
+{
+	if (rr->description)
+		ref_release(rr->description);
+	rr->description = ref_strdup(description);
+}
+
+uint8_t
+cmyth_recordingrule_type(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->type;
+}
+
+void
+cmyth_recordingrule_set_type(cmyth_recordingrule_t rr, uint8_t type)
+{
+	rr->type = type;
+}
+
+char *
+cmyth_recordingrule_category(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->category);
+}
+
+void
+cmyth_recordingrule_set_category(cmyth_recordingrule_t rr, char *category)
+{
+	if (rr->category)
+		ref_release(rr->category);
+	rr->category = ref_strdup(category);
+}
+
+char *
+cmyth_recordingrule_subtitle(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->subtitle);
+}
+
+void
+cmyth_recordingrule_set_subtitle(cmyth_recordingrule_t rr, char *subtitle)
+{
+	if (rr->subtitle)
+		ref_release(rr->subtitle);
+	rr->subtitle = ref_strdup(subtitle);
+}
+
+int8_t
+cmyth_recordingrule_recpriority(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->recpriority;
+}
+
+void
+cmyth_recordingrule_set_recpriority(cmyth_recordingrule_t rr, int8_t recpriority)
+{
+	rr->recpriority = recpriority;
+}
+
+uint8_t
+cmyth_recordingrule_startoffset(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->startoffset;
+}
+
+void
+cmyth_recordingrule_set_startoffset(cmyth_recordingrule_t rr, uint8_t startoffset)
+{
+	rr->startoffset = startoffset;
+}
+
+uint8_t
+cmyth_recordingrule_endoffset(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->endoffset;
+}
+
+void
+cmyth_recordingrule_set_endoffset(cmyth_recordingrule_t rr, uint8_t endoffset)
+{
+	rr->endoffset = endoffset;
+}
+
+uint8_t
+cmyth_recordingrule_searchtype(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->searchtype;
+}
+
+void
+cmyth_recordingrule_set_searchtype(cmyth_recordingrule_t rr, uint8_t searchtype)
+{
+	rr->searchtype = searchtype;
+}
+
+uint8_t
+cmyth_recordingrule_inactive(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->inactive;
+}
+
+void
+cmyth_recordingrule_set_inactive(cmyth_recordingrule_t rr, uint8_t inactive)
+{
+	rr->inactive = inactive;
+}
+
+uint8_t
+cmyth_recordingrule_dupmethod(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->dupmethod;
+}
+
+void
+cmyth_recordingrule_set_dupmethod(cmyth_recordingrule_t rr, uint8_t dupmethod)
+{
+	rr->dupmethod = dupmethod;
+}
+
+uint8_t
+cmyth_recordingrule_dupin(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->dupin;
+}
+
+void
+cmyth_recordingrule_set_dupin(cmyth_recordingrule_t rr, uint8_t dupin)
+{
+	rr->dupin = dupin;
+}
+
+char *
+cmyth_recordingrule_recgroup(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->recgroup);
+}
+
+void
+cmyth_recordingrule_set_recgroup(cmyth_recordingrule_t rr, char *recgroup)
+{
+	if (rr->recgroup)
+		ref_release(rr->recgroup);
+	rr->recgroup = ref_strdup(recgroup);
+}
+
+char *
+cmyth_recordingrule_storagegroup(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->storagegroup);
+}
+
+void
+cmyth_recordingrule_set_storagegroup(cmyth_recordingrule_t rr, char *storagegroup)
+{
+	if (rr->storagegroup)
+		ref_release(rr->storagegroup);
+	rr->storagegroup = ref_strdup(storagegroup);
+}
+
+char *
+cmyth_recordingrule_playgroup(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->playgroup);
+}
+
+void
+cmyth_recordingrule_set_playgroup(cmyth_recordingrule_t rr, char *playgroup)
+{
+	if (rr->playgroup)
+		ref_release(rr->playgroup);
+	rr->playgroup = ref_strdup(playgroup);
+}
+
+uint8_t
+cmyth_recordingrule_autotranscode(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->autotranscode;
+}
+
+void
+cmyth_recordingrule_set_autotranscode(cmyth_recordingrule_t rr, uint8_t autotranscode)
+{
+	rr->autotranscode = autotranscode;
+}
+
+uint8_t
+cmyth_recordingrule_userjobs(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->userjobs;
+}
+
+void
+cmyth_recordingrule_set_userjobs(cmyth_recordingrule_t rr, uint8_t userjobs)
+{
+	rr->userjobs = userjobs;
+}
+
+uint8_t
+cmyth_recordingrule_autocommflag(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->autocommflag;
+}
+
+void
+cmyth_recordingrule_set_autocommflag(cmyth_recordingrule_t rr, uint8_t autocommflag)
+{
+	rr->autocommflag = autocommflag;
+}
+
+uint8_t
+cmyth_recordingrule_autoexpire(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->autoexpire;
+}
+
+void
+cmyth_recordingrule_set_autoexpire(cmyth_recordingrule_t rr, uint8_t autoexpire)
+{
+	rr->autoexpire = autoexpire;
+}
+
+uint32_t
+cmyth_recordingrule_maxepisodes(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->maxepisodes;
+}
+
+void
+cmyth_recordingrule_set_maxepisodes(cmyth_recordingrule_t rr, uint32_t maxepisodes)
+{
+	rr->maxepisodes = maxepisodes;
+}
+
+uint8_t
+cmyth_recordingrule_maxnewest(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->maxnewest;
+}
+
+void
+cmyth_recordingrule_set_maxnewest(cmyth_recordingrule_t rr, uint8_t maxnewest)
+{
+	rr->maxnewest = maxnewest;
+}
+
+uint32_t
+cmyth_recordingrule_transcoder(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->transcoder;
+}
+
+void
+cmyth_recordingrule_set_transcoder(cmyth_recordingrule_t rr, uint32_t transcoder)
+{
+	rr->transcoder = transcoder;
+}
+
+char *
+cmyth_recordingrule_profile(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->profile);
+}
+
+void
+cmyth_recordingrule_set_profile(cmyth_recordingrule_t rr, char *profile)
+{
+	if (rr->profile)
+		ref_release(rr->profile);
+	rr->profile = ref_strdup(profile);
+}
+
+uint32_t
+cmyth_recordingrule_prefinput(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->prefinput;
+}
+
+void
+cmyth_recordingrule_set_prefinput(cmyth_recordingrule_t rr, uint32_t prefinput)
+{
+	rr->prefinput = prefinput;
+}
+
+uint8_t
+cmyth_recordingrule_autometadata(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->autometadata;
+}
+
+void
+cmyth_recordingrule_set_autometadata(cmyth_recordingrule_t rr, uint8_t autometadata)
+{
+	rr->autometadata = autometadata;
+}
+
+char *
+cmyth_recordingrule_inetref(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return NULL;
+	}
+	return ref_hold(rr->inetref);
+}
+
+void
+cmyth_recordingrule_set_inetref(cmyth_recordingrule_t rr, char *inetref)
+{
+	if (rr->inetref)
+		ref_release(rr->inetref);
+	rr->inetref = ref_strdup(inetref);
+}
+
+uint16_t
+cmyth_recordingrule_season(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->season;
+}
+
+void
+cmyth_recordingrule_set_season(cmyth_recordingrule_t rr, uint16_t season)
+{
+	rr->season = season;
+}
+
+uint16_t
+cmyth_recordingrule_episode(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->episode;
+}
+
+void
+cmyth_recordingrule_set_episode(cmyth_recordingrule_t rr, uint16_t episode)
+{
+	rr->episode = episode;
+}
+
+uint32_t
+cmyth_recordingrule_filter(cmyth_recordingrule_t rr)
+{
+	if (!rr) {
+		return 0;
+	}
+	return rr->filter;
+}
+
+void
+cmyth_recordingrule_set_filter(cmyth_recordingrule_t rr, uint32_t filter)
+{
+	rr->filter = filter;
+}
+
+/*
+ * cmyth_recordingrulelist_get_item()
+ *
+ * Scope: PUBLIC
+ *
+ * Description
+ *
+ * Retrieve the recording schedule structure found at index 'index' in the list
+ * in 'rrl'.  Return the recording schedule structure held.
+ * Before forgetting the reference to this recording schedule structure the
+ * caller must call ref_release().
+ *
+ * Return Value:
+ *
+ * Success: A non-NULL cmyth_recordingrule_t (this type is a pointer)
+ *
+ * Failure: NULL
+ */
+cmyth_recordingrule_t
+cmyth_recordingrulelist_get_item(cmyth_recordingrulelist_t rrl, int index)
+{
+	if (!rrl) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL recordingrule list\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+	if (!rrl->recordingrulelist_list) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL list\n",
+			  __FUNCTION__);
+		return NULL;
+	}
+	if ((index < 0) || (index >= rrl->recordingrulelist_count)) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: index %d out of range\n",
+			  __FUNCTION__, index);
+		return NULL;
+	}
+	ref_hold(rrl->recordingrulelist_list[index]);
+	return rrl->recordingrulelist_list[index];
+}
+
+/*
+ * cmyth_recordingrulelist_get_count()
+ *
+ * Scope: PUBLIC
+ *
+ * Description:
+ *
+ * Retrieve the number of elements in the recording schedule list
+ * structure in 'rrl'.
+ *
+ * Return Value:
+ *
+ * Success: A number >= 0 indicating the number of items in 'rrl'
+ *
+ * Failure: -(errno)
+ */
+int
+cmyth_recordingrulelist_get_count(cmyth_recordingrulelist_t rrl)
+{
+	if (!rrl) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL recordingrule list\n",
+			  __FUNCTION__);
+		return -EINVAL;
+	}
+	return rrl->recordingrulelist_count;
+}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/ringbuf.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/ringbuf.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/ringbuf.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/ringbuf.c	2013-03-12 10:51:22.000000000 +0000
@@ -32,8 +32,8 @@
 #include <cmyth_local.h>
 
 /*
- * cmyth_ringbuf_destroy(cmyth_ringbuf_t rb)
- * 
+ * cmyth_ringbuf_destroy()
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -64,8 +64,8 @@
 }
 
 /*
- * cmyth_ringbuf_create(void)
- * 
+ * cmyth_ringbuf_create()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -101,8 +101,8 @@
 }
 
 /*
- * cmyth_ringbuf_setup(cmyth_recorder_t old_rec)
- * 
+ * cmyth_ringbuf_setup()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -148,7 +148,7 @@
 	pthread_mutex_lock(&mutex);
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %u[]:[]SETUP_RING_BUFFER[]:[]0",
+		 "QUERY_RECORDER %"PRIu32"[]:[]SETUP_RING_BUFFER[]:[]0",
 		 rec->rec_id);
 
 	if ((err=cmyth_send_message(control, msg)) < 0) {
@@ -164,7 +164,7 @@
 		r = cmyth_rcv_string(control, &err, buf, sizeof(buf)-1, count);
 		count -= r;
 	}
-	r = cmyth_rcv_string(control, &err, url, sizeof(url)-1, count); 
+	r = cmyth_rcv_string(control, &err, url, sizeof(url)-1, count);
 	count -= r;
 
 	if ((r=cmyth_rcv_int64(control, &err, &size, count)) < 0) {
@@ -223,7 +223,7 @@
 	}
 	ref_release(rec);
         new_rec->rec_ring = cmyth_ringbuf_create();
-        
+
 	tmp = *(port - 1);
 	*(port - 1) = '\0';
 	new_rec->rec_ring->ringbuf_hostname = ref_strdup(host);
@@ -249,17 +249,22 @@
 }
 
 /*
- * cmyth_ringbuf_get_block(cmyth_recorder_t rec, char *buf, unsigned long len)
+ * cmyth_ringbuf_get_block()
+ *
  * Scope: PUBLIC
+ *
  * Description
+ *
  * Read incoming file data off the network into a buffer of length len.
  *
  * Return Value:
- * Sucess: number of bytes read into buf
+ *
+ * Success: number of bytes read into buf
+ *
  * Failure: -1
  */
-int
-cmyth_ringbuf_get_block(cmyth_recorder_t rec, char *buf, unsigned long len)
+int32_t
+cmyth_ringbuf_get_block(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	struct timeval tv;
 	fd_set fds;
@@ -267,6 +272,9 @@
 	if (rec == NULL)
 		return -EINVAL;
 
+	if(len > rec->rec_ring->conn_data->conn_tcp_rcvbuf)
+		len = rec->rec_ring->conn_data->conn_tcp_rcvbuf;
+
 	tv.tv_sec = 10;
 	tv.tv_usec = 0;
 	FD_ZERO(&fds);
@@ -306,8 +314,8 @@
 }
 
 /*
- * cmyth_ringbuf_request_block(cmyth_ringbuf_t file, unsigned long len)
- * 
+ * cmyth_ringbuf_request_block()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -321,12 +329,13 @@
  *
  * Failure: an int containing -errno
  */
-int
-cmyth_ringbuf_request_block(cmyth_recorder_t rec, unsigned long len)
+int32_t
+cmyth_ringbuf_request_block(cmyth_recorder_t rec, int32_t len)
 {
 	int err, count;
 	int r;
-	long c, ret;
+	int ret;
+	int32_t c;
 	char msg[256];
 
 	if (!rec) {
@@ -337,11 +346,11 @@
 
 	pthread_mutex_lock(&mutex);
 
-	if(len > (unsigned int)rec->rec_conn->conn_tcp_rcvbuf)
-		len = (unsigned int)rec->rec_conn->conn_tcp_rcvbuf;
+	if(len > rec->rec_ring->conn_data->conn_tcp_rcvbuf)
+		len = rec->rec_ring->conn_data->conn_tcp_rcvbuf;
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %u[]:[]REQUEST_BLOCK_RINGBUF[]:[]%ld",
+		 "QUERY_RECORDER %"PRIu32"[]:[]REQUEST_BLOCK_RINGBUF[]:[]%"PRId32,
 		 rec->rec_id, len);
 
 	if ((err = cmyth_send_message(rec->rec_conn, msg)) < 0) {
@@ -353,7 +362,7 @@
 	}
 
 	count = cmyth_rcv_length(rec->rec_conn);
-	if ((r=cmyth_rcv_long(rec->rec_conn, &err, &c, count)) < 0) {
+	if ((r = cmyth_rcv_int32(rec->rec_conn, &err, &c, count)) < 0) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_length() failed (%d)\n",
 			  __FUNCTION__, r);
@@ -371,8 +380,8 @@
 }
 
 /*
- * cmyth_ringbuf_read (cmyth_recorder_t rec, char *buf, unsigned long len)
- * 
+ * cmyth_ringbuf_read ()
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -385,7 +394,7 @@
  *
  * Failure: an int containing -errno
  */
-int cmyth_ringbuf_read(cmyth_recorder_t rec, char *buf, unsigned long len)
+int32_t cmyth_ringbuf_read(cmyth_recorder_t rec, char *buf, int32_t len)
 {
 	int err, count;
 	int ret, req, nfds;
@@ -403,8 +412,11 @@
 
 	pthread_mutex_lock (&mutex);
 
+	if(len > rec->rec_ring->conn_data->conn_tcp_rcvbuf)
+		len = rec->rec_ring->conn_data->conn_tcp_rcvbuf;
+
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %u[]:[]REQUEST_BLOCK_RINGBUF[]:[]%ld",
+		 "QUERY_RECORDER %"PRIu32"[]:[]REQUEST_BLOCK_RINGBUF[]:[]%"PRId32,
 		 rec->rec_id, len);
 
 	if ( (err = cmyth_send_message (rec->rec_conn, msg) ) < 0)
@@ -464,7 +476,7 @@
 				goto out;
 			}
 
-			if ((ret = cmyth_rcv_ulong (rec->rec_conn, &err, &len, count))< 0)
+			if ((ret = cmyth_rcv_int32 (rec->rec_conn, &err, &len, count))< 0)
 			{
 				cmyth_dbg (CMYTH_DBG_ERROR,
 				           "%s: cmyth_rcv_long() failed (%d)\n",
@@ -482,7 +494,7 @@
 		if (FD_ISSET(rec->rec_ring->conn_data->conn_fd, &fds))
 		{
 
-			if ((ret = recv (rec->rec_ring->conn_data->conn_fd, cur, end-cur, 0)) < 0)
+			if ((ret = recv (rec->rec_ring->conn_data->conn_fd, cur, (int32_t)(end - cur), 0)) < 0)
 			{
 				cmyth_dbg (CMYTH_DBG_ERROR,
 				           "%s: recv() failed (%d)\n",
@@ -493,26 +505,25 @@
 		}
 	}
 
-	ret = end - buf;
+	ret = (int32_t)(cur - buf);
 out:
 	pthread_mutex_unlock (&mutex);
 	return ret;
 }
 
 /*
- * cmyth_ringbuf_seek(
- *                    cmyth_ringbuf_t file, long long offset, int whence)
- * 
+ * cmyth_ringbuf_seek()
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Seek to a new position in the file based on the value of whence:
- *	SEEK_SET
+ *	WHENCE_SET
  *		The offset is set to offset bytes.
- *	SEEK_CUR
+ *	WHENCE_CUR
  *		The offset is set to the current position plus offset bytes.
- *	SEEK_END
+ *	WHENCE_END
  *		The offset is set to the size of the file minus offset bytes.
  *
  * Return Value:
@@ -521,16 +532,14 @@
  *
  * Failure: an int containing -errno
  */
-long long
+int64_t
 cmyth_ringbuf_seek(cmyth_recorder_t rec,
-		   long long offset, int whence)
+		   int64_t offset, int8_t whence)
 {
 	char msg[128];
 	int err;
-	int count;
-	int64_t c;
-	long r;
-	long long ret;
+	int r, count;
+	int64_t c, ret;
 	cmyth_ringbuf_t ring;
 
 	if (rec == NULL)
@@ -538,13 +547,13 @@
 
 	ring = rec->rec_ring;
 
-	if ((offset == 0) && (whence == SEEK_CUR))
+	if ((offset == 0) && (whence == WHENCE_CUR))
 		return ring->file_pos;
 
 	pthread_mutex_lock(&mutex);
 
 	snprintf(msg, sizeof(msg),
-		 "QUERY_RECORDER %u[]:[]SEEK_RINGBUF[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%d",
+		 "QUERY_RECORDER %"PRIu32"[]:[]SEEK_RINGBUF[]:[]%"PRId32"[]:[]%"PRId32"[]:[]%"PRId8"[]:[]%"PRId32"[]:[]%"PRId32,
 		 rec->rec_id,
 		 (int32_t)(offset >> 32),
 		 (int32_t)(offset & 0xffffffff),
@@ -570,13 +579,13 @@
 	}
 
 	switch (whence) {
-	case SEEK_SET:
+	case WHENCE_SET:
 		ring->file_pos = offset;
 		break;
-	case SEEK_CUR:
+	case WHENCE_CUR:
 		ring->file_pos += offset;
 		break;
-	case SEEK_END:
+	case WHENCE_END:
 		ring->file_pos = ring->file_length - offset;
 		break;
 	}
@@ -585,6 +594,6 @@
 
     out:
 	pthread_mutex_unlock(&mutex);
-	
+
 	return ret;
 }
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/safe_string.h xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/safe_string.h
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/safe_string.h	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/safe_string.h	2013-03-12 10:51:22.000000000 +0000
@@ -42,8 +42,8 @@
 
 #define sizeof_strncpy(dest,src) (safe_strncpy(dest,src,sizeof(dest)))
 
-#define safe_atol(str) (((str) == NULL)? (long)0: atol(str))
-#define safe_atoll(str) (((str) == NULL)? (long long)0: atoll(str))
+#define safe_atol(str) (((str) == NULL)? (int32_t)0: atol(str))
+#define safe_atoll(str) (((str) == NULL)? (int64_t)0: atoll(str))
 #define safe_atoi(str) (((str) == NULL)? (int)0: atoi(str))
 
 #endif /* __CMYTH_STRING_H */
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/socket.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/socket.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/socket.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/socket.c	2013-03-12 10:51:22.000000000 +0000
@@ -19,7 +19,7 @@
 
 /*
  * socket.c - functions to handle low level socket interactions with a
- *            MythTV frontend.  
+ *            MythTV frontend.
  */
 #include <stdlib.h>
 #include <stdio.h>
@@ -36,14 +36,14 @@
 
 /*
  * cmyth_send_message(cmyth_conn_t conn, char *request)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_send_message)
  *
  * Description
  *
  * Send a myth protocol on the socket indicated by 'conn'.  The
  * message sent has the form:
- * 
+ *
  *   <length><request>
  *
  * Where <length> is the 8 character, space padded, left justified
@@ -126,7 +126,7 @@
 
 /*
  * cmyth_rcv_length(cmyth_conn_t conn)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_length)
  *
  * Description
@@ -168,22 +168,17 @@
 		tv.tv_usec = 0;
 		FD_ZERO(&fds);
 		FD_SET(conn->conn_fd, &fds);
-		if ((r=select((int)conn->conn_fd+1, &fds, NULL, NULL, &tv)) == 0) {
-			conn->conn_hang = 1;
-			hangcount++;
-			if (++hangcount > 6 && r > 0)
-				return -ETIMEDOUT;
-		} else if (r > 0) {
+		r = select((int)conn->conn_fd+1, &fds, NULL, NULL, &tv);
+		if (r > 0) {
 			conn->conn_hang = 0;
 			r = recv(conn->conn_fd, &buf[rtot], 8 - rtot, 0);
 		}
-		if (r < 0) {
-			cmyth_dbg(CMYTH_DBG_ERROR, "%s: read() failed (%d)\n",
-				  __FUNCTION__, errno);
+		if (r == 0) {
 			conn->conn_hang = 1;
-			return -errno;
+			if (++hangcount > 2)
+				return -ETIMEDOUT;
 		}
-		if (r == 0) {
+		if (r < 0) {
 			cmyth_dbg(CMYTH_DBG_ERROR, "%s: read() failed (%d)\n",
 				  __FUNCTION__, errno);
 			conn->conn_hang = 1;
@@ -199,7 +194,7 @@
 
 /*
  * cmyth_conn_refill(cmyth_conn_t conn, int len)
- * 
+ *
  * Scope: PRIVATE (static)
  *
  * Description
@@ -232,7 +227,7 @@
 			  __FUNCTION__);
 		return -EINVAL;
 	}
-	if (len > conn->conn_buflen) {
+	if ((unsigned)len > conn->conn_buflen) {
 		len = conn->conn_buflen;
 	}
 	p = conn->conn_buf;
@@ -276,7 +271,7 @@
 
 /*
  * cmyth_rcv_string(cmyth_conn_t conn, char *buf, int buflen, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_length)
  *
  * Description
@@ -423,14 +418,14 @@
 }
 
 /*
- * cmyth_rcv_ulong(cmyth_conn_t conn, int *err, unsigned long *buf,
+ * cmyth_rcv_uint32(cmyth_conn_t conn, int *err, uint32_t *buf,
  *                      int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_ulong_long)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_uint32)
  *
  * Description
  *
- * Receive an unsigned long long (64 bit) integer token from a list of
+ * Receive an unsigned (32 bit) integer token from a list of
  * tokens in a MythTV Protocol message.  Tokens in MythTV Protocol
  * messages are separated by the string: []:[] or terminated by
  * running out of message.  Up to 'count' Bytes will be consumed from
@@ -457,13 +452,12 @@
  * EINVAL       The token received is not numeric or is signed
  */
 int
-cmyth_rcv_ulong(cmyth_conn_t conn, int *err, unsigned long *buf,
-		int count)
+cmyth_rcv_uint32(cmyth_conn_t conn, int *err, uint32_t *buf, int count)
 {
 	char num[32];
 	char *num_p = num;
-	unsigned long long val = 0;
-	unsigned long limit = 0xffffffff;
+	uint64_t val = 0;
+	uint64_t limit = UINT32_MAX;
 	int consumed;
 	int tmp;
 
@@ -510,18 +504,18 @@
 	/*
 	 * Got a result, return it.
 	 */
-	*buf = (unsigned long)val;
+	*buf = (uint32_t)val;
 	return consumed;
 }
 
 /*
- * cmyth_rcv_long(cmyth_conn_t conn, int *err, long *buf, int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_long_long)
+ * cmyth_rcv_int32(cmyth_conn_t conn, int *err, int32_t *buf, int count)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_int32)
  *
  * Description
  *
- * Receive a long (signed 32 bit) integer token from a list of
+ * Receive a signed (32 bit) integer token from a list of
  * tokens in a MythTV Protocol message.  Tokens in MythTV Protocol
  * messages are separated by the string: []:[] or terminated by
  * running out of message.  Up to 'count' Bytes will be consumed from
@@ -547,13 +541,13 @@
  * EINVAL       The token received is not numeric
  */
 int
-cmyth_rcv_long(cmyth_conn_t conn, int *err, long *buf, int count)
+cmyth_rcv_int32(cmyth_conn_t conn, int *err, int32_t *buf, int count)
 {
 	char num[32];
 	char *num_p = num;
-	unsigned long long val = 0;
+	uint64_t val = 0;
 	int sign = 1;
-	long limit = 0x7fffffff;
+	uint64_t limit = INT32_MAX;
 	int consumed;
 	int tmp;
 
@@ -590,7 +584,7 @@
 		 * Check and make sure we are still under the limit (this is
 		 * an absolute value limit, sign will be applied later).
 		 */
-		if (val > (unsigned long)limit) {
+		if (val > limit) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
 				  "%s: long out of range: '%s'\n",
 				  __FUNCTION__, num);
@@ -603,14 +597,14 @@
 	/*
 	 * Got a result, return it.
 	 */
-	*buf = (long)(sign * val);
+	*buf = (int32_t)(sign * val);
 
 	return consumed;
 }
 
 /*
  * cmyth_rcv_okay(cmyth_conn_t conn)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_okay)
  *
  * Description
@@ -652,7 +646,7 @@
 		cmyth_dbg(CMYTH_DBG_INFO,
 			  "%s: did not consume everything\n",
 			  __FUNCTION__);
-		while(count > 0) {
+		while(count > 0 && err == 0) {
 			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count);
 			count -= consumed;
 			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: leftover data %s\n", __FUNCTION__, tmp);
@@ -704,7 +698,7 @@
 		cmyth_dbg(CMYTH_DBG_INFO,
 			  "%s: did not consume everything\n",
 			  __FUNCTION__);
-		while(count > 0) {
+		while(count > 0 && err == 0) {
 			consumed = cmyth_rcv_string(conn, &err, tmp, sizeof(tmp) - 1, count);
 			count -= consumed;
 			cmyth_dbg(CMYTH_DBG_DEBUG, "%s: leftover data %s\n", __FUNCTION__, tmp);
@@ -715,7 +709,7 @@
 
 /*
  * cmyth_rcv_version(cmyth_conn_t conn, unsigned long *vers)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_version)
  *
  * Description
@@ -732,12 +726,12 @@
  * Failure: -(errno)
  */
 int
-cmyth_rcv_version(cmyth_conn_t conn, unsigned long *vers)
+cmyth_rcv_version(cmyth_conn_t conn, uint32_t *vers)
 {
 	int len;
 	int consumed;
 	char buf[8];
-	unsigned long tmp_vers;
+	uint32_t tmp_vers;
 	int err;
 
 	if (!vers) {
@@ -761,7 +755,7 @@
 	 * either case, the number following it is the correct version, and
 	 * we use it as an unsigned long.
 	 */
-	consumed = cmyth_rcv_ulong(conn, &err, vers, len);
+	consumed = cmyth_rcv_uint32(conn, &err, vers, len);
 	if (consumed < len) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: did not consume everything %d < %d\n",
@@ -771,9 +765,9 @@
 }
 
 /*
- * cmyth_rcv_byte(cmyth_conn_t conn, int *err, char *buf, int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_byte)
+ * cmyth_rcv_int8(cmyth_conn_t conn, int *err, int8_t *buf, int count)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_int8)
  *
  * Description
  *
@@ -803,9 +797,9 @@
  * EINVAL       The token received is not numeric
  */
 int
-cmyth_rcv_byte(cmyth_conn_t conn, int *err, char *buf, int count)
+cmyth_rcv_int8(cmyth_conn_t conn, int *err, int8_t *buf, int count)
 {
-	long val;
+	int32_t val;
 	int consumed;
 	int tmp;
 
@@ -816,7 +810,7 @@
 		*err = EINVAL;
 		return 0;
 	}
-	consumed = cmyth_rcv_long(conn, err, &val, count);
+	consumed = cmyth_rcv_int32(conn, err, &val, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
@@ -824,24 +818,24 @@
 		return consumed;
 	}
 	if ((val > 127) || (val < -128)) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: value doesn't fit: '%lld'\n",
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: value doesn't fit: '%"PRId32"'\n",
 			  __FUNCTION__, val);
 		*err = ERANGE;
 		return consumed;
 	}
 	*err = 0;
-	*buf = (char)val;
+	*buf = (int8_t)val;
 	return consumed;
 }
 
 /*
- * cmyth_rcv_short(cmyth_conn_t conn, int *err, short *buf, int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_short)
+ * cmyth_rcv_int16(cmyth_conn_t conn, int *err, int16_t *buf, int count)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_int16)
  *
  * Description
  *
- * Receive a short (signed 16 bit) integer token from a list of tokens
+ * Receive a signed (16 bit) integer token from a list of tokens
  * in a MythTV Protocol message.  Tokens in MythTV Protocol messages
  * are separated by the string: []:[] or terminated by running out of
  * message.  Up to 'count' Bytes will be consumed from the socket
@@ -866,9 +860,9 @@
  * EINVAL       The token received is not numeric
  */
 int
-cmyth_rcv_short(cmyth_conn_t conn, int *err, short *buf, int count)
+cmyth_rcv_int16(cmyth_conn_t conn, int *err, int16_t *buf, int count)
 {
-	long val;
+	int32_t val;
 	int consumed;
 	int tmp;
 
@@ -879,7 +873,7 @@
 		*err = EINVAL;
 		return 0;
 	}
-	consumed = cmyth_rcv_long(conn, err, &val, count);
+	consumed = cmyth_rcv_int32(conn, err, &val, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_long() failed (%d)\n",
@@ -887,19 +881,19 @@
 		return consumed;
 	}
 	if ((val > 32767) || (val < -32768)) {
-		cmyth_dbg(CMYTH_DBG_ERROR, "%s: value doesn't fit: '%lld'\n",
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: value doesn't fit: '%"PRId32"'\n",
 			  __FUNCTION__, val);
 		*err = ERANGE;
 		return consumed;
 	}
 	*err = 0;
-	*buf = (short)val;
+	*buf = (int16_t)val;
 	return consumed;
 }
 
 /*
  * cmyth_rcv_old_int64(cmyth_conn_t conn, int *err, long long *buf, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_long)
  *
  * Description
@@ -934,7 +928,7 @@
 	int64_t val;
 	int consumed;
 	int tmp;
-	unsigned long hi, lo;
+	uint32_t hi, lo;
 
 	if (!err) {
 		err = &tmp;
@@ -945,21 +939,21 @@
 		return 0;
 	}
 
-	consumed = cmyth_rcv_u_long(conn, err, &hi, count);
+	consumed = cmyth_rcv_int32(conn, err, (int32_t*)&hi, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_u_long() failed (%d)\n",
 			  __FUNCTION__, consumed);
 		return consumed;
 	}
-	consumed += cmyth_rcv_u_long(conn, err, &lo, count-consumed);
+	consumed += cmyth_rcv_int32(conn, err, (int32_t*)&lo, count-consumed);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_u_long() failed (%d)\n",
 			  __FUNCTION__, consumed);
 		return consumed;
 	}
-	val = (((long long)hi) << 32) | ((long long)(lo & 0xFFFFFFFF));
+	val = (((int64_t)hi) << 32) | ((int64_t)(lo & 0xffffffff));
 
 	*err = 0;
 	*buf = val;
@@ -1009,9 +1003,9 @@
 {
 	char num[32];
 	char *num_p = num;
-	unsigned long long val = 0;
+	uint64_t val = 0;
 	int sign = 1;
-	long long limit = 0x7fffffffffffffffLL;
+	uint64_t limit = INT64_MAX;
 	int consumed;
 	int tmp;
 
@@ -1057,118 +1051,10 @@
 		 * Check and make sure we are still under the limit (this is
 		 * an absolute value limit, sign will be applied later).
 		 */
-		if (val > (unsigned long long)limit) {
+		if (val > limit) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
 				  "%s: long long out of range: '%s'\n",
-				  __FUNCTION__, num, limit);
-			*err = ERANGE;
-			return consumed;
-		}
-		num_p++;
-	}
-
-	/*
-	 * Got a result, return it.
-	 */
-	*buf = (long long)(sign * val);
-
-	return consumed;
-}
-
-/*
- * cmyth_rcv_new_uint64(cmyth_conn_t conn, int *err, uint64_t *buf, int count)
- *
- * Scope: PRIVATE (mapped to __cmyth_rcv_long)
- *
- * Description
- *
- * Receive a long long (signed 64 bit) integer token from a list of tokens
- * in a MythTV Protocol message.  Tokens in MythTV Protocol messages
- * are separated by the string: []:[] or terminated by running out of
- * message.  Up to 'count' Bytes will be consumed from the socket
- * specified by 'conn' (stopping when a separator is seen or 'count'
- * is exhausted).  The long integer value of the token is placed in
- * the location pointed to by 'buf'.  If an error is encountered and
- * 'err' is not NULL, an indication of the nature of the error will be
- * recorded by placing an error code in the location pointed to by
- * 'err'.  If all goes well, 'err' wil be set to 0.
- *
- * As of protocol version 57, Myth now sends a single 64bit string instead
- * of 2 32bit strings when sending proginfo data.  This does not seem to
- * apply uniformly though. For instance 'ANN FILETRANSFER' still uses
- * the old method
- *
- * Return Value:
- *
- * A value >=0 indicating the number of bytes consumed.
- *
- * Error Codes:
- *
- * In addition to system call error codes, the following errors may be
- * placed in 'err':
- *
- * ERANGE       The token received is too large to fit in a long integer
- *
- * EINVAL       The token received is not numeric
- */
-int
-cmyth_rcv_new_uint64(cmyth_conn_t conn, int *err, uint64_t *buf, int count,
-		     int forced)
-{
-	char num[32];
-	char *num_p = num;
-	uint64_t val = 0;
-	int sign = 1;
-	long long limit = 0x7fffffffffffffffLL;
-	int consumed;
-	int tmp;
-
-	/*
-	 * Between protocols 57 and 66, not all messages used the new
-	 * format for 64-bit values.
-	 */
-	if ((conn->conn_version < 57) ||
-	    ((conn->conn_version < 66) && !forced)) {
-		return cmyth_rcv_old_uint64(conn, err, buf, count);
-	}
-
-	if (!err) {
-		err = &tmp;
-	}
-	if (count <= 0) {
-		*err = EINVAL;
-		return 0;
-	}
-	*err = 0;
-	consumed = cmyth_rcv_string(conn, err, num, sizeof(num), count);
-	if (*err) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			"%s: cmyth_rcv_string() failed (%d)\n",
-			__FUNCTION__, consumed);
-		return consumed;
-	}
-	if (*num_p && (*num_p == '-')) {
-		++num_p;
-		sign = -1;
-	}
-	while (*num_p) {
-		if (!isdigit(*num_p)) {
-			cmyth_dbg(CMYTH_DBG_ERROR,
-				  "%s: received illegal integer: '%s'\n",
 				  __FUNCTION__, num);
-			*err = EINVAL;
-			return consumed;
-		}
-		val *= 10;
-		val += ((*num_p) - '0');
-		/*
-		 * Check and make sure we are still under the limit (this is
-		 * an absolute value limit, sign will be applied later).
-		 */
-		if (val > (unsigned long long)limit) {
-			cmyth_dbg(CMYTH_DBG_ERROR,
-				  "%s: long long out of range: '%s'\n",
-				  __FUNCTION__, num, limit);
 			*err = ERANGE;
 			return consumed;
 		}
@@ -1178,15 +1064,15 @@
 	/*
 	 * Got a result, return it.
 	 */
-	*buf = (long long)(sign * val);
+	*buf = (int64_t)(sign * val);
 
 	return consumed;
 }
 
 /*
- * cmyth_rcv_ubyte(cmyth_conn_t conn, int *err, unsigned char *buf, int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_ubyte)
+ * cmyth_rcv_uint8(cmyth_conn_t conn, int *err, uint8_t *buf, int count)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_uint8)
  *
  * Description
  *
@@ -1217,9 +1103,9 @@
  * EINVAL       The token received is not numeric or is signed
  */
 int
-cmyth_rcv_ubyte(cmyth_conn_t conn, int *err, unsigned char *buf, int count)
+cmyth_rcv_uint8(cmyth_conn_t conn, int *err, uint8_t *buf, int count)
 {
-	unsigned long val;
+	uint32_t val;
 	int consumed;
 	int tmp;
 
@@ -1230,7 +1116,7 @@
 		*err = EINVAL;
 		return 0;
 	}
-	consumed = cmyth_rcv_ulong(conn, err, &val, count);
+	consumed = cmyth_rcv_uint32(conn, err, &val, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_ulong() failed (%d)\n",
@@ -1244,19 +1130,18 @@
 		return consumed;
 	}
 	*err = 0;
-	*buf = (unsigned char)val;
+	*buf = (uint8_t)val;
 	return consumed;
 }
 
 /*
- * cmyth_rcv_ushort(cmyth_conn_t conn, int *err, unsigned short *buf,
- *                  int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_ushort)
+ * cmyth_rcv_uint16(cmyth_conn_t conn, int *err, uint16_t *buf, int count)
+ *
+ * Scope: PRIVATE (mapped to __cmyth_rcv_uint16)
  *
  * Description
  *
- * Receive an unsigned short (16 bit) integer token from a list of
+ * Receive an unsigned (16 bit) integer token from a list of
  * tokens in a MythTV Protocol message.  Tokens in MythTV Protocol
  * messages are separated by the string: []:[] or terminated by
  * running out of message.  Up to 'count' Bytes will be consumed from
@@ -1283,9 +1168,9 @@
  * EINVAL       The token received is not numeric or is signed
  */
 int
-cmyth_rcv_ushort(cmyth_conn_t conn, int *err, unsigned short *buf, int count)
+cmyth_rcv_uint16(cmyth_conn_t conn, int *err, uint16_t *buf, int count)
 {
-	unsigned long val;
+	uint32_t val;
 	int consumed;
 	int tmp;
 
@@ -1296,7 +1181,7 @@
 		*err = EINVAL;
 		return 0;
 	}
-	consumed = cmyth_rcv_ulong(conn, err, &val, count);
+	consumed = cmyth_rcv_uint32(conn, err, &val, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_ulong() failed (%d)\n",
@@ -1310,88 +1195,14 @@
 		return consumed;
 	}
 	*err = 0;
-	*buf = (unsigned short)val;
-	return consumed;
-}
-
-/*
- * cmyth_rcv_ulong(cmyth_conn_t conn, int *err, unsigned long *buf, int count)
- * 
- * Scope: PRIVATE (mapped to __cmyth_rcv_ulong)
- *
- * Description
- *
- * Receive an unsigned long (32 bit) integer token from a list of
- * tokens in a MythTV Protocol message.  Tokens in MythTV Protocol
- * messages are separated by the string: []:[] or terminated by
- * running out of message.  Up to 'count' Bytes will be consumed from
- * the socket specified by 'conn' (stopping when a separator is seen
- * or 'count' is exhausted).  The unsigned long integer value of the
- * token is placed in the location pointed to by 'buf'.  If an error
- * is encountered and 'err' is not NULL, an indication of the nature
- * of the error will be recorded by placing an error code in the
- * location pointed to by 'err'.  If all goes well, 'err' wil be set
- * to 0.
- *
- * Return Value:
- *
- * A value >=0 indicating the number of bytes consumed.
- *
- * Error Codes:
- *
- * In addition to system call error codes, the following errors may be
- * placed in 'err':
- *
- * ERANGE       The token received is too large to fit in an unsigned
- *              long integer
- *
- * EINVAL       The token received is not numeric or is signed
- */
-int
-cmyth_rcv_old_uint64(cmyth_conn_t conn, int *err, uint64_t *buf, int count)
-{
-	unsigned long long val;
-	unsigned long hi, lo;
-	int consumed;
-	int tmp;
-
-	*buf = 0;
-
-	if (!err) {
-		err = &tmp;
-	}
-
-	if (count <= 0) {
-		*err = EINVAL;
-		return 0;
-	}
-	
-	consumed = cmyth_rcv_u_long(conn, err, &hi, count);
-	if (*err) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_rcv_u_long() failed (%d)\n",
-			  __FUNCTION__, consumed);
-		return consumed;
-	}
-	consumed += cmyth_rcv_u_long(conn, err, &lo, count - consumed);
-	if (*err) {
-		cmyth_dbg(CMYTH_DBG_ERROR,
-			  "%s: cmyth_rcv_u_long() failed (%d)\n",
-			  __FUNCTION__, consumed);
-		return consumed;
-	}
-	val = (((unsigned long long)hi) << 32) | ((unsigned long long)(lo & 0xFFFFFFFF));
-
-	*err = 0;
-	*buf = val;
-
+	*buf = (uint16_t)val;
 	return consumed;
 }
 
 /*
  * cmyth_rcv_timestamp(cmyth_conn_t conn, int *err, cmyth_timestamp_t buf,
  *                     int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_timestamp)
  *
  * Description
@@ -1476,7 +1287,7 @@
 /*
  * cmyth_rcv_datetime(cmyth_conn_t conn, int *err, cmyth_timestamp_t buf,
  *                     int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_datetime)
  *
  * Description
@@ -1511,7 +1322,7 @@
 		   int count)
 {
 	int consumed;
-	char tbuf[CMYTH_LONG_LEN + 1];
+	char tbuf[CMYTH_INT32_LEN + 1];
 	int tmp;
 
 	if (!err) {
@@ -1522,8 +1333,8 @@
 		return 0;
 	}
 	*err = 0;
-	tbuf[CMYTH_LONG_LEN] = '\0';
-	consumed = cmyth_rcv_string(conn, err, tbuf, CMYTH_LONG_LEN, count);
+	tbuf[CMYTH_INT32_LEN] = '\0';
+	consumed = cmyth_rcv_string(conn, err, tbuf, CMYTH_INT32_LEN, count);
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
 			  "%s: cmyth_rcv_string() failed (%d)\n",
@@ -1651,7 +1462,7 @@
 
 /*
  * cmyth_rcv_proginfo(cmyth_conn_t conn, cmyth_proginfo_t buf, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_proginfo)
  *
  * Description
@@ -1698,7 +1509,7 @@
 	tmp_str[sizeof(tmp_str) - 1] = '\0';
 
 	buf->proginfo_version = conn->conn_version;
-	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: VERSION IS %ld\n",
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: VERSION IS %"PRIu32"\n",
 		  __FUNCTION__, buf->proginfo_version);
 
 	/*
@@ -1750,7 +1561,7 @@
 		/*
 		 * Get season and episode (unsigned int)
 		 */
-		consumed = cmyth_rcv_ushort(conn, err,
+		consumed = cmyth_rcv_uint16(conn, err,
 					   &buf->proginfo_season, count);
 		count -= consumed;
 		total += consumed;
@@ -1759,7 +1570,7 @@
 			goto fail;
 		}
 
-		consumed = cmyth_rcv_ushort(conn, err,
+		consumed = cmyth_rcv_uint16(conn, err,
 					   &buf->proginfo_episode, count);
 		count -= consumed;
 		total += consumed;
@@ -1785,17 +1596,16 @@
 	buf->proginfo_category = ref_strdup(tmp_str);
 
 	/*
-	 * Get proginfo_chanId (long)
+	 * Get proginfo_chanId (ulong)
 	 */
-	consumed = cmyth_rcv_string(conn, err,
-				    tmp_str, sizeof(tmp_str) - 1, count);
+	consumed = cmyth_rcv_uint32(conn, err,
+				    &buf->proginfo_chanId, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
-		failed = "cmyth_rcv_string";
+		failed = "cmyth_rcv_ulong";
 		goto fail;
 	}
-	buf->proginfo_chanId = atoi(tmp_str);
 
 	/*
 	 * Get proginfo_chanstr (string)
@@ -1910,7 +1720,7 @@
 		consumed = cmyth_rcv_timestamp(conn, err,
 					       &(buf->proginfo_start_ts),
 					       count);
-	}	
+	}
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -1929,7 +1739,7 @@
 	else {
 		consumed = cmyth_rcv_timestamp(conn, err,
 					       &(buf->proginfo_end_ts), count);
-	}	
+	}
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -1955,7 +1765,7 @@
 				ref_release(buf->proginfo_unknown_0);
 			buf->proginfo_unknown_0 = ref_strdup(tmp_str);
 		} else { /* Assume version 1 */
-			consumed = cmyth_rcv_ulong(conn, err,
+			consumed = cmyth_rcv_uint32(conn, err,
 						   &buf->proginfo_conflicting, count);
 			count -= consumed;
 			total += consumed;
@@ -1968,7 +1778,7 @@
 		/*
 		 * Get proginfo_recording (ulong)
 		 */
-		consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_recording, count);
+		consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_recording, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
@@ -1980,7 +1790,7 @@
 	/*
 	 * Get proginfo_override (ulong)
 	 */
-	consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_override, count);
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_override, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2004,9 +1814,9 @@
 	buf->proginfo_hostname = ref_strdup(tmp_str);
 
 	/*
-	 * Get proginfo_source_id (long)
+	 * Get proginfo_source_id (ulong)
 	 */
-	consumed = cmyth_rcv_long(conn, err, &buf->proginfo_source_id, count);
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_source_id, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2015,9 +1825,9 @@
 	}
 
 	/*
-	 * Get proginfo_card_id (long)
+	 * Get proginfo_card_id (ulong)
 	 */
-	consumed = cmyth_rcv_long(conn, err, &buf->proginfo_card_id, count);
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_card_id, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2026,9 +1836,9 @@
 	}
 
 	/*
-	 * Get proginfo_input_id (long)
+	 * Get proginfo_input_id (ulong)
 	 */
-	consumed = cmyth_rcv_long(conn, err, &buf->proginfo_input_id, count);
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_input_id, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2037,35 +1847,32 @@
 	}
 
 	/*
-	 * Get proginfo_rec_priority (long)
+	 * Get proginfo_rec_priority (byte)
 	 */
-	consumed = cmyth_rcv_string(conn, err,
-				    tmp_str, sizeof(tmp_str) - 1, count);
+	consumed = cmyth_rcv_int8(conn, err,
+				    &buf->proginfo_rec_priority, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
-		failed = "cmyth_rcv_string";
+		failed = "cmyth_rcv_long";
 		goto fail;
 	}
-	if (buf->proginfo_rec_priority)
-		ref_release(buf->proginfo_rec_priority);
-	buf->proginfo_rec_priority = ref_strdup(tmp_str);
 
 	/*
-	 * Get proginfo_rec_status (ulong)
+	 * Get proginfo_rec_status (byte)
 	 */
-	consumed = cmyth_rcv_long(conn, err, &buf->proginfo_rec_status, count);
+	consumed = cmyth_rcv_int8(conn, err, &buf->proginfo_rec_status, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
-		failed = "cmyth_rcv_ulong";
+		failed = "cmyth_rcv_byte";
 		goto fail;
 	}
 
 	/*
 	 * Get proginfo_record_id (ulong)
 	 */
-	consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_record_id, count);
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_record_id, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2074,37 +1881,37 @@
 	}
 
 	/*
-	 * Get proginfo_rec_type (ulong)
+	 * Get proginfo_rec_type (ubyte)
 	 */
-	consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_rec_type, count);
+	consumed = cmyth_rcv_uint8(conn, err, &buf->proginfo_rec_type, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
-		failed = "cmyth_rcv_ulong";
+		failed = "cmyth_rcv_ubyte";
 		goto fail;
 	}
 
 	/*
-	 * Get proginfo_rec_dups (ulong)
+	 * Get proginfo_rec_dupin (ubyte)
 	 */
-	consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_rec_dups, count);
+	consumed = cmyth_rcv_uint8(conn, err, &buf->proginfo_rec_dupin, count);
 	count -= consumed;
 	total += consumed;
 	if (*err) {
-		failed = "cmyth_rcv_ulong";
+		failed = "cmyth_rcv_ubyte";
 		goto fail;
 	}
 
 	if (buf->proginfo_version >= 8) {
 		/*
-		 * Get proginfo_unknown_1 (long)
+		 * Get proginfo_rec_dupmethod (ubyte)
 		 */
-		consumed = cmyth_rcv_ulong(conn, err,
-					   &buf->proginfo_unknown_1, count);
+		consumed = cmyth_rcv_uint8(conn, err,
+					   &buf->proginfo_rec_dupmethod, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ubyte";
 			goto fail;
 		}
 	}
@@ -2121,7 +1928,7 @@
 		consumed = cmyth_rcv_timestamp(conn, err,
 					       &(buf->proginfo_rec_start_ts),
 					       count);
-	}	
+	}
 
 	count -= consumed;
 	total += consumed;
@@ -2142,8 +1949,8 @@
 		consumed = cmyth_rcv_timestamp(conn, err,
 					       &(buf->proginfo_rec_end_ts),
 					       count);
-	}	
-	
+	}
+
 	count -= consumed;
 	total += consumed;
 	if (*err) {
@@ -2153,21 +1960,21 @@
 
 	if (buf->proginfo_version < 57) {
 		/*
-		 * Get proginfo_repeat (ulong)
+		 * Get proginfo_repeat (ubyte)
 		 */
-		consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_repeat, count);
+		consumed = cmyth_rcv_uint8(conn, err, &buf->proginfo_repeat, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ubyte";
 			goto fail;
 		}
 	}
 
 	/*
-	 * Get proginfo_program_flags (long)
+	 * Get proginfo_program_flags (ulong)
 	 */
-	consumed = cmyth_rcv_ulong(conn, err, &buf->proginfo_program_flags,
+	consumed = cmyth_rcv_uint32(conn, err, &buf->proginfo_program_flags,
 				  count);
 	count -= consumed;
 	total += consumed;
@@ -2297,7 +2104,7 @@
 				cmyth_rcv_timestamp(conn, err,
 						    &(buf->proginfo_lastmodified),
 						    count);
-		}	
+		}
 		count -= consumed;
 		total += consumed;
 		if (*err) {
@@ -2341,7 +2148,7 @@
 				cmyth_rcv_timestamp(conn, err,
 						    &(buf->proginfo_originalairdate),
 						    count);
-		}	
+		}
 		count -= consumed;
 		total += consumed;
 		if (*err) {
@@ -2351,16 +2158,19 @@
 	}
 
 	if (buf->proginfo_version >= 15 && buf->proginfo_version < 57) {
-		consumed = cmyth_rcv_ulong(conn, err,
+		/*
+		 * Get has_air_date (ubyte)
+		 */
+		consumed = cmyth_rcv_uint8(conn, err,
 					   &buf->proginfo_hasairdate, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong";
+			failed = "cmyth_rcv_ubyte";
 			goto fail;
 		}
 	}
-	
+
 	if (buf->proginfo_version >= 18) {
 		/*
 		 * Get playgroup (string)
@@ -2379,31 +2189,28 @@
 	}
 	if (buf->proginfo_version >= 25) {
 		/*
-		 * Get proginfo_recpriority_2 (string)
+		 * Get proginfo_recpriority_2 (byte)
 		 */
-		consumed = cmyth_rcv_string(conn, err,
-					    tmp_str, sizeof(tmp_str) - 1,
+		consumed = cmyth_rcv_int8(conn, err,
+					    &buf->proginfo_recpriority_2,
 					    count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_string";
+			failed = "cmyth_rcv_long";
 			goto fail;
 		}
-		if (buf->proginfo_recpriority_2)
-			ref_release(buf->proginfo_recpriority_2);
-		buf->proginfo_recpriority_2 = ref_strdup(tmp_str);
 	}
 	if (buf->proginfo_version >= 31) {
 		/*
-		 * Get proginfo_parentid (long)
+		 * Get proginfo_parentid (ulong)
 		 */
-		consumed = cmyth_rcv_long(conn, err,
+		consumed = cmyth_rcv_uint32(conn, err,
 					&buf->proginfo_parentid, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_long";
+			failed = "cmyth_rcv_ulong";
 			goto fail;
 		}
 	}
@@ -2425,39 +2232,39 @@
 	}
 	if (buf->proginfo_version >= 35) {
 		/*
-		 * Get audioproperties,videoproperties,subtitletype (int)
+		 * Get audioproperties,videoproperties,subtitletype (ushort)
 		 */
-		consumed = cmyth_rcv_ulong(conn, err,
+		consumed = cmyth_rcv_uint16(conn, err,
 				&buf->proginfo_audioproperties, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong audio";
+			failed = "cmyth_rcv_ushort audio";
 			goto fail;
 		}
-		consumed = cmyth_rcv_ulong(conn, err,
+		consumed = cmyth_rcv_uint16(conn, err,
 				&buf->proginfo_videoproperties, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong video";
+			failed = "cmyth_rcv_ushort video";
 			goto fail;
 		}
-		consumed = cmyth_rcv_ulong(conn, err,
+		consumed = cmyth_rcv_uint16(conn, err,
 				&buf->proginfo_subtitletype, count);
 		count -= consumed;
 		total += consumed;
 		if (*err) {
-			failed = "cmyth_rcv_ulong subtitletype";
+			failed = "cmyth_rcv_ushort subtitletype";
 			goto fail;
 		}
-	}	
+	}
 
 	/*
 	 * Get Year
 	 */
 	if (buf->proginfo_version >= 43) {
-		consumed = cmyth_rcv_ushort(conn, err, &buf->proginfo_year,
+		consumed = cmyth_rcv_uint16(conn, err, &buf->proginfo_year,
 						count);
 		count -= consumed;
 		total += consumed;
@@ -2480,7 +2287,7 @@
 
 /*
  * cmyth_rcv_chaninfo(cmyth_conn_t conn, cmyth_proginfo_t buf, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_chaninfo)
  *
  * Description
@@ -2749,7 +2556,7 @@
 /*
  * cmyth_rcv_proglist(cmyth_conn_t conn, int *err, cmyth_proglist_t buf,
  *                    int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_proglist)
  *
  * Description
@@ -2801,7 +2608,7 @@
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL buffer\n", __FUNCTION__);
 		return 0;
 	}
-	r = cmyth_rcv_long(conn, err, &buf->proglist_count, count);
+	r = cmyth_rcv_int32(conn, err, &buf->proglist_count, count);
 	consumed += r;
 	if (*err) {
 		cmyth_dbg(CMYTH_DBG_ERROR,
@@ -2846,7 +2653,7 @@
 /*
  * cmyth_rcv_keyframe(cmyth_conn_t conn, int *err, cmyth_keyframe_t buf,
  *                    int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_keyframe)
  *
  * Description
@@ -2893,7 +2700,7 @@
 
 /*
  * cmyth_rcv_freespace(cmyth_conn_t conn, cmyth_freespace_t buf, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_freespace)
  *
  * Description
@@ -2942,7 +2749,7 @@
 /*
  * cmyth_rcv_recorder(cmyth_conn_t conn, cmyth_recorder_t buf,
  *                    int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_recorder)
  *
  * Description
@@ -2991,7 +2798,7 @@
 /*
  * cmyth_rcv_ringbuf(cmyth_conn_t conn, int *err, cmyth_ringbuf_t buf,
  *                   int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_ringbuf)
  *
  * Description
@@ -3038,7 +2845,7 @@
 
 /*
  * cmyth_rcv_data(cmyth_conn_t conn, int *err, unsigned char *buf, int count)
- * 
+ *
  * Scope: PRIVATE (mapped to __cmyth_rcv_data)
  *
  * Description
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/storagegroup.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/storagegroup.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/storagegroup.c	1970-01-01 00:00:00.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/storagegroup.c	2013-03-12 10:51:22.000000000 +0000
@@ -0,0 +1,375 @@
+/*
+ *      Copyright (C) 2005-2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <cmyth_local.h>
+
+static void
+cmyth_storagegroup_file_destroy(cmyth_storagegroup_file_t fl)
+{
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!fl) {
+		return;
+	}
+	if(fl->filename)
+		ref_release(fl->filename);
+	if(fl->storagegroup)
+		ref_release(fl->storagegroup);
+	if(fl->hostname)
+		ref_release(fl->hostname);
+}
+
+cmyth_storagegroup_file_t
+cmyth_storagegroup_file_create(void)
+{
+	cmyth_storagegroup_file_t ret = ref_alloc(sizeof(*ret));
+	memset(ret, 0, sizeof(*ret));
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s {\n", __FUNCTION__);
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_DEBUG, "%s }!\n", __FUNCTION__);
+		return NULL;
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_storagegroup_file_destroy);
+
+	return ret;
+}
+
+static void
+cmyth_storagegroup_filelist_destroy(cmyth_storagegroup_filelist_t fl)
+{
+	int i;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	if (!fl) {
+		return;
+	}
+	for (i = 0; i < fl->storagegroup_filelist_count; ++i) {
+		if (fl->storagegroup_filelist_list[i]) {
+			ref_release(fl->storagegroup_filelist_list[i]);
+		}
+		fl->storagegroup_filelist_list[i] = NULL;
+	}
+	if (fl->storagegroup_filelist_list) {
+		free(fl->storagegroup_filelist_list);
+	}
+}
+
+cmyth_storagegroup_filelist_t
+cmyth_storagegroup_filelist_create(void)
+{
+	cmyth_storagegroup_filelist_t ret;
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s\n", __FUNCTION__);
+	ret = ref_alloc(sizeof(*ret));
+	if (!ret) {
+		return(NULL);
+	}
+	ref_set_destroy(ret, (ref_destroy_t)cmyth_storagegroup_filelist_destroy);
+
+	ret->storagegroup_filelist_list = NULL;
+	ret->storagegroup_filelist_count = 0;
+	return ret;
+}
+
+static int
+cmyth_storagegroup_update_fileinfo(cmyth_conn_t control, cmyth_storagegroup_file_t file)
+{
+	char msg[256];
+	int count;
+	int err = 0;
+	int consumed; /* = profiles;*/
+	char tmp_str[2048];
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
+		return -1;
+	}
+
+	if (!file) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no file specified\n", __FUNCTION__);
+		return -1;
+	}
+
+	snprintf(msg, sizeof(msg), "QUERY_SG_FILEQUERY[]:[]%s[]:[]%s[]:[]%s", file->hostname , file->storagegroup, file->filename);
+
+	err = cmyth_send_message(control, msg);
+	if (err < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
+		return -1;
+	}
+
+	count = cmyth_rcv_length(control);
+	if (count < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
+		return -1;
+	}
+
+	consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
+	count -= consumed;
+
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
+		return -1;
+	} else if (count == 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: QUERY_SG_FILEQUERY failed(%s)\n", __FUNCTION__, tmp_str);
+		return -1;
+	}
+
+	consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str), count);
+	count -= consumed;
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
+		return -1;
+	}
+	file->lastmodified = atol(tmp_str);
+
+	consumed = cmyth_rcv_new_int64(control, &err, &(file->size), count, 1);
+	count -= consumed;
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_int64() failed (%d)\n", __FUNCTION__, count);
+		return -1;
+	}
+
+	return 0;
+}
+
+cmyth_storagegroup_filelist_t
+cmyth_storagegroup_get_filelist(cmyth_conn_t control,char *storagegroup, char *hostname)
+{
+	char msg[256];
+	int res = 0;
+	int count = 0;
+	int err = 0;
+	int i = 0;
+	int listsize = 10;
+	cmyth_storagegroup_filelist_t ret = 0;
+	cmyth_storagegroup_file_t file = 0;
+	int consumed = 0; /* = profiles; */
+	char tmp_str[32768];
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
+		return 0;
+	}
+
+	pthread_mutex_lock(&mutex);
+
+	snprintf(msg, sizeof(msg), "QUERY_SG_GETFILELIST[]:[]%s[]:[]%s[]:[][]:[]1", hostname, storagegroup);
+
+	err = cmyth_send_message(control, msg);
+	if (err < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
+		goto out;
+	}
+
+	count = cmyth_rcv_length(control);
+	if (count < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
+		goto out;
+	}
+
+	ret = cmyth_storagegroup_filelist_create();
+
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for list\n", __FUNCTION__);
+		ref_release(ret);
+		ret = 0;
+		goto out;
+	}
+
+	ret->storagegroup_filelist_count = 0;
+	ret->storagegroup_filelist_list = malloc(listsize * sizeof(cmyth_storagegroup_file_t));
+	if (!ret->storagegroup_filelist_list) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for filelist list\n", __FUNCTION__);
+		ref_release(ret);
+		ret = 0;
+		goto out;
+	}
+	while (count) {
+		consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
+		count -= consumed;
+		if (err) {
+			cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
+			ref_release(ret);
+			ret = 0;
+			goto out;
+		}
+		if (res>listsize-1)
+		{
+			listsize += 10;
+			ret->storagegroup_filelist_list = realloc(ret->storagegroup_filelist_list, listsize * sizeof(cmyth_storagegroup_file_t));
+			if (!ret->storagegroup_filelist_list) {
+				cmyth_dbg(CMYTH_DBG_ERROR, "%s: realloc() failed for filelist list\n", __FUNCTION__);
+				ref_release(ret);
+				ret = 0;
+				goto out;
+			}
+		}
+		file = cmyth_storagegroup_file_create();
+		file->filename = ref_strdup(tmp_str);
+		file->storagegroup = ref_strdup(storagegroup);
+		file->hostname = ref_strdup(hostname);
+		file->size = 0;
+		file->lastmodified = 0;
+		ret->storagegroup_filelist_list[res] = file;
+		res++;
+	}
+	ret->storagegroup_filelist_count = res;
+
+	for(i = 0;i < ret->storagegroup_filelist_count;i++) {
+		cmyth_storagegroup_update_fileinfo(control, ret->storagegroup_filelist_list[i]);
+	}
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: results= %d\n", __FUNCTION__, res);
+
+    out:
+	pthread_mutex_unlock(&mutex);
+	return ret;
+}
+
+int
+cmyth_storagegroup_filelist_count(cmyth_storagegroup_filelist_t fl)
+{
+	if (!fl) {
+		return -EINVAL;
+	}
+	return fl->storagegroup_filelist_count;
+}
+
+cmyth_storagegroup_file_t
+cmyth_storagegroup_filelist_get_item(cmyth_storagegroup_filelist_t fl, int index)
+{
+	if (!fl || index >= fl->storagegroup_filelist_count) {
+		return NULL;
+	}
+	ref_hold(fl->storagegroup_filelist_list[index]);
+	return fl->storagegroup_filelist_list[index];
+ }
+
+cmyth_storagegroup_file_t
+cmyth_storagegroup_get_fileinfo(cmyth_conn_t control, char *storagegroup, char *hostname, char *filename)
+{
+	char msg[256];
+	int count = 0;
+	int err = 0;
+	cmyth_storagegroup_file_t ret = NULL;
+	int consumed = 0;
+	char tmp_str[2048];
+
+	if (!control) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: no connection\n", __FUNCTION__);
+		return 0;
+	}
+
+	pthread_mutex_lock(&mutex);
+
+	snprintf(msg, sizeof(msg), "QUERY_SG_FILEQUERY[]:[]%s[]:[]%s[]:[]%s", hostname, storagegroup, filename);
+
+	err = cmyth_send_message(control, msg);
+	if (err < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_send_message() failed (%d)\n", __FUNCTION__, err);
+		goto out;
+	}
+
+	count = cmyth_rcv_length(control);
+	if (count < 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_length() failed (%d)\n", __FUNCTION__, count);
+		goto out;
+	}
+
+	consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
+	count -= consumed;
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
+		ret = NULL;
+		goto out;
+	} else if (count == 0) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: QUERY_SG_FILEQUERY failed(%s)\n", __FUNCTION__, tmp_str);
+		ret = NULL;
+		goto out;
+	}
+
+	ret = cmyth_storagegroup_file_create();
+	if (!ret) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: alloc() failed for file\n", __FUNCTION__);
+		ref_release(ret);
+		ret = NULL;
+		goto out;
+	}
+	ret->filename = ref_strdup(tmp_str);
+
+	consumed = cmyth_rcv_string(control, &err, tmp_str, sizeof(tmp_str) - 1, count);
+	count -= consumed;
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_string() failed (%d)\n", __FUNCTION__, count);
+		ref_release(ret);
+		ret = NULL;
+		goto out;
+	}
+        ret->lastmodified = atol(tmp_str);
+
+	consumed = cmyth_rcv_new_int64(control, &err, &(ret->size), count, 1);
+	count -= consumed;
+	if (err) {
+		cmyth_dbg(CMYTH_DBG_ERROR, "%s: cmyth_rcv_int64() failed (%d)\n", __FUNCTION__, count);
+		ref_release(ret);
+		ret = NULL;
+		goto out;
+	}
+
+	cmyth_dbg(CMYTH_DBG_DEBUG, "%s: filename: %s\n", __FUNCTION__, ret->filename);
+
+out:
+	pthread_mutex_unlock(&mutex);
+	return ret;
+}
+
+char *
+cmyth_storagegroup_file_filename(cmyth_storagegroup_file_t file)
+{
+	if (!file) {
+		return NULL;
+	}
+	return ref_hold(file->filename);
+}
+
+time_t
+cmyth_storagegroup_file_lastmodified(cmyth_storagegroup_file_t file)
+{
+	if (!file) {
+		return 0;
+	}
+	return file->lastmodified;
+}
+
+int64_t
+cmyth_storagegroup_file_size(cmyth_storagegroup_file_t file)
+{
+	if (!file) {
+		return 0;
+	}
+	return file->size;
+}
\ No newline at end of file
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/timestamp.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/timestamp.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/timestamp.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/timestamp.c	2013-03-12 10:51:22.000000000 +0000
@@ -32,7 +32,7 @@
 
 /*
  * cmyth_timestamp_create(void)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -66,7 +66,7 @@
 
 /*
  * cmyth_timestamp_from_string(char *str)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -83,67 +83,76 @@
  * Failure: NULL
  */
 cmyth_timestamp_t
-cmyth_timestamp_from_string(char *str)
+cmyth_timestamp_from_string(const char *str)
 {
 	cmyth_timestamp_t ret;
 	unsigned int i;
 	int datetime = 1;
-	char *yyyy = &str[0];
-	char *MM = &str[5];
-	char *dd = &str[8];
-	char *hh = &str[11];
-	char *mm = &str[14];
-	char *ss = &str[17];
-	
+	char *yyyy;
+	char *MM;
+	char *dd;
+	char *hh;
+	char *mm;
+	char *ss;
+	char buf[CMYTH_TIMESTAMP_LEN + 1];
+
 	if (!str) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL string\n", __FUNCTION__);
 		return NULL;
 	}
 
+	strncpy(buf, str, sizeof(buf));
+	yyyy = buf;
+	MM = buf + 5;
+	dd = buf + 8;
+	hh = buf + 11;
+	mm = buf + 14;
+	ss = buf + 17;
+
 	ret = cmyth_timestamp_create();
 	if (!ret) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: NULL timestamp\n",
 			  __FUNCTION__);
 		return NULL;
 	}
-	if (strlen(str) != CMYTH_TIMESTAMP_LEN) {
+	if (strlen(buf) != CMYTH_TIMESTAMP_LEN) {
 		datetime = 0;
-		if (strlen(str) != CMYTH_DATESTAMP_LEN) {
+		if (strlen(buf) != CMYTH_DATESTAMP_LEN) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
 				  "%s: string is not a timestamp '%s'\n",
-				  __FUNCTION__, str);
+				  __FUNCTION__, buf);
 			goto err;
 		}
 	}
 
 	if ((datetime == 1) &&
-	    ((str[4] != '-') || (str[7] != '-') || (str[10] != 'T') ||
-	     (str[13] != ':') || (str[16] != ':'))) {
+	    ((buf[4] != '-') || (buf[7] != '-') || (buf[10] != 'T') ||
+	     (buf[13] != ':') || (buf[16] != ':'))) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: string is badly formed '%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 	if ((datetime == 0) &&
-	    ((str[4] != '-') || (str[7] != '-'))) {
+	    ((buf[4] != '-') || (buf[7] != '-'))) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: string is badly formed '%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 
-	str[4] = '\0';
-	str[7] = '\0';
+	buf[4] = '\0';
+	buf[7] = '\0';
 	if (datetime) {
-		str[10] = '\0';
-		str[13] = '\0';
-		str[16] = '\0';
+		buf[10] = '\0';
+		buf[13] = '\0';
+		buf[16] = '\0';
 	}
 	for (i = 0;
 	     i < (datetime ? CMYTH_TIMESTAMP_LEN : CMYTH_DATESTAMP_LEN);
 	     ++i) {
-		if (str[i] && !isdigit(str[i])) {
+		if (buf[i] && !isdigit(buf[i])) {
 			cmyth_dbg(CMYTH_DBG_ERROR,
 				  "%s: expected numeral at '%s'[%d]\n",
-				  __FUNCTION__, str, i);
+				  __FUNCTION__, buf, i);
 			goto err;
 		}
 	}
@@ -151,13 +160,13 @@
 	ret->timestamp_month = atoi(MM);
 	if (ret->timestamp_month > 12) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: month value too big'%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 	ret->timestamp_day = atoi(dd);
 	if (ret->timestamp_day > 31) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: day value too big'%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 
@@ -167,19 +176,19 @@
 	ret->timestamp_hour = atoi(hh);
 	if (ret->timestamp_hour > 23) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: hour value too big'%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 	ret->timestamp_minute = atoi(mm);
 	if (ret->timestamp_minute > 59) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: minute value too big'%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 	ret->timestamp_second = atoi(ss);
 	if (ret->timestamp_second > 59) {
 		cmyth_dbg(CMYTH_DBG_ERROR, "%s: second value too big'%s'\n",
-			  __FUNCTION__, str);
+			  __FUNCTION__, buf);
 		goto err;
 	}
 	return ret;
@@ -212,7 +221,7 @@
 
 /*
  * cmyth_timestamp_from_unixtime(time_t l)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -236,14 +245,14 @@
 
 /*
  * cmyth_timestamp_to_longlong( cmyth_timestamp_t ts)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Create a time_t value from the timestamp structure 'ts' and
  * return the result.
- * 
+ *
  *
  * Return Value:
  *
@@ -267,7 +276,7 @@
 
 /*
  * cmyth_timestamp_to_string(char *str, cmyth_timestamp_t ts)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -275,7 +284,7 @@
  * Create a string from the timestamp structure 'ts' and put it in the
  * user supplied buffer 'str'.  The size of 'str' must be
  * CMYTH_TIMESTAMP_LEN + 1 or this will overwrite beyond 'str'.
- * 
+ *
  *
  * Return Value:
  *
@@ -309,7 +318,7 @@
 
 /*
  * cmyth_timestamp_to_isostring(char *str, cmyth_timestamp_t ts)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -317,7 +326,7 @@
  * Create a string from the timestamp structure 'ts' and put it in the
  * user supplied buffer 'str'.  The size of 'str' must be
  * CMYTH_TIMESTAMP_LEN + 1 or this will overwrite beyond 'str'.
- * 
+ *
  *
  * Return Value:
  *
@@ -398,7 +407,7 @@
 
 /*
  * cmyth_datetime_to_string(char *str, cmyth_timestamp_t ts)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
@@ -406,7 +415,7 @@
  * Create a string from the timestamp structure 'ts' and put it in the
  * user supplied buffer 'str'.  The size of 'str' must be
  * CMYTH_DATETIME_LEN + 1 or this will overwrite beyond 'str'.
- * 
+ *
  *
  * Return Value:
  *
@@ -450,14 +459,14 @@
 
 /*
  * cmyth_timestamp_compare(cmyth_timestamp_t ts1, cmyth_timestamp_t ts2)
- * 
+ *
  * Scope: PUBLIC
  *
  * Description
  *
  * Compare ts1 to ts2 and indicate whether ts1 is less than, equal to
  * or greater than ts1.
- * 
+ *
  *
  * Return Value:
  *
@@ -495,7 +504,7 @@
 		return (ts1->timestamp_hour > ts2->timestamp_hour) ? 1 : -1;
 	}
 	if (ts1->timestamp_minute != ts2->timestamp_minute) {
-		return (ts1->timestamp_minute > ts2->timestamp_minute) 
+		return (ts1->timestamp_minute > ts2->timestamp_minute)
 			? 1
 			: -1;
 	}
diff -Nru xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/utf8tolatin1.c xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/utf8tolatin1.c
--- xbmc-pvr-addons-1.0.0~git20130129.2244-96774c4/lib/cmyth/libcmyth/utf8tolatin1.c	2012-11-15 21:18:19.000000000 +0000
+++ xbmc-pvr-addons-1.0.0~git20130312.1151-590f862/lib/cmyth/libcmyth/utf8tolatin1.c	2013-03-12 10:51:22.000000000 +0000
@@ -21,11 +21,12 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include <stdint.h>
 #include "refmem/refmem.h"
 
 char* cmyth_utf8tolatin1(char* s)
 {
-	unsigned long ucs4;
+	uint32_t ucs4;
 	int c, state, octets;
 	char *out, *t;