Jarvis timer fixes

pvr.mediaportal.tvserver/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mediaportal.tvserver"
-  version="1.12.0"
+  version="1.13.0"
   name="MediaPortal PVR Client"
   provider-name="Marcel Groothuis">
   <requires>

pvr.mediaportal.tvserver/changelog.txt

@@ -1,3 +1,9 @@
+v1.13.0
+- Timer: fixed: 'unable to resolve timer type' warnings (Kodi expects a manual, no EPG timer type)
+- Timer: fixed: timer disabled state (PVR_TIMER_STATE_CANCELLED should now be PVR_TIMER_STATE_DISABLED)
+- Timer: fixed: don't show the unsupported 'folder' field
+- Coverity fixes
+
 v1.12.0
 - Timer: Add series recording timer types support
 - Timer: Add an backward compatibility option to re-enable the pre-Jarvis series recording dialog

pvr.mediaportal.tvserver/resources/language/resource.language.en_gb/strings.po

@@ -263,7 +263,12 @@ msgctxt "#30121"
 msgid "Anytime"
 msgstr ""
 
-# empty strings from id 30122 to 30124
+msgctxt "#30122"
+msgid "Manual"
+msgstr ""
+
+#empty strings from id 30123 to 30124
+#Channel:
 
 # Channel:
 msgctxt "#30125"

src/Socket.cpp

@@ -451,6 +451,9 @@ bool Socket::reconnect()
   if( !create() )
     return false;
 
+  if (_sd == INVALID_SOCKET)
+    return false;
+
   int status = ::connect ( _sd, reinterpret_cast<sockaddr*>(&_sockaddr), sizeof ( _sockaddr ) );
 
   if ( status == SOCKET_ERROR )

src/lib/tsreader/DeMultiplexer.cpp

@@ -55,6 +55,7 @@ namespace MPTV
         m_ReqPatVersion(-1),
         m_WaitNewPatTmo(0),
         m_receivedPackets(0),
+        m_bStarting(false),
         m_bAudioAtEof(false),
         m_bVideoAtEof(false),
         m_bGotNewChannel(false)

src/pvrclient-mediaportal.cpp

@@ -1369,6 +1369,17 @@ PVR_ERROR cPVRClientMediaPortal::GetTimerTypes(PVR_TIMER_TYPE types[], int *size
   Timer::lifetimeValues->SetLifeTimeValues(types[count]);
   count++;
 
+  if (count > maxsize)
+	  return PVR_ERROR_NO_ERROR;
+
+  /* Kodi specific 'Manual' schedule type */
+  memset(&types[count], 0, sizeof(types[count]));
+  types[count].iId = cKodiTimerTypeOffset + TvDatabase::KodiManual;
+  types[count].iAttributes = MPTV_RECORD_MANUAL;
+  PVR_STRCPY(types[count].strDescription, XBMC->GetLocalizedString(30122)); /* Manual */
+  Timer::lifetimeValues->SetLifeTimeValues(types[count]);
+  count++;
+
   return PVR_ERROR_NO_ERROR;
 }
 

src/timers.cpp

@@ -55,7 +55,8 @@ cTimer::cTimer() :
 }
 
 
-cTimer::cTimer(const PVR_TIMER& timerinfo)
+cTimer::cTimer(const PVR_TIMER& timerinfo):
+  m_genretable(NULL)
 {
 
   m_index = timerinfo.iClientIndex - cKodiTimerIndexOffset;
@@ -108,6 +109,10 @@ cTimer::cTimer(const PVR_TIMER& timerinfo)
   SetKeepMethod(timerinfo.iLifetime);
 
   m_schedtype = static_cast<enum TvDatabase::ScheduleRecordingType>(timerinfo.iTimerType - cKodiTimerTypeOffset);
+  if (m_schedtype == TvDatabase::KodiManual)
+  {
+    m_schedtype = TvDatabase::Once;
+  }
 
   if ((m_schedtype == TvDatabase::Once) && (timerinfo.iWeekdays != PVR_WEEKDAY_NONE)) // huh, still repeating?
   {
@@ -153,7 +158,7 @@ void cTimer::GetPVRtimerinfo(PVR_TIMER &tag)
   else if (m_active)
     tag.state           = PVR_TIMER_STATE_SCHEDULED;
   else
-    tag.state           = PVR_TIMER_STATE_CANCELLED;
+    tag.state           = PVR_TIMER_STATE_DISABLED;
 
   if (m_schedtype == TvDatabase::EveryTimeOnEveryChannel)
   {
@@ -356,6 +361,7 @@ int cTimer::SchedRecType2RepeatFlags(TvDatabase::ScheduleRecordingType schedtype
   switch (schedtype)
   {
     case TvDatabase::Once:
+    case TvDatabase::KodiManual:
       weekdays = PVR_WEEKDAY_NONE;
       break;
     case TvDatabase::Daily:

src/timers.h

@@ -43,7 +43,8 @@ enum ScheduleRecordingType
   EveryTimeOnEveryChannel = 4,     // Record every time on every channel
   Weekends = 5,                    // Record Weekends
   WorkingDays = 6,                 // Record Weekdays
-  WeeklyEveryTimeOnThisChannel = 7 // Weekly on this channel
+  WeeklyEveryTimeOnThisChannel = 7, // Weekly on this channel
+  KodiManual = 99                   // Special type for Kodi since it distinguishes between 'Once (EPG based)' and 'manual'
 };
 
 // From MediaPortal: TvDatabase.KeepMethodType
@@ -96,7 +97,8 @@ const int MPTV_RECORD_ONCE =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_EVERY_TIME_ON_THIS_CHANNEL =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -105,8 +107,8 @@ const int MPTV_RECORD_EVERY_TIME_ON_THIS_CHANNEL =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_EVERY_TIME_ON_EVERY_CHANNEL =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -116,8 +118,8 @@ const int MPTV_RECORD_EVERY_TIME_ON_EVERY_CHANNEL =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_WEEKLY =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -128,8 +130,8 @@ const int MPTV_RECORD_WEEKLY =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_DAILY =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -140,8 +142,8 @@ const int MPTV_RECORD_DAILY =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_WORKING_DAYS =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -151,8 +153,8 @@ const int MPTV_RECORD_WORKING_DAYS =
   PVR_TIMER_TYPE_SUPPORTS_END_TIME |
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
-  PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_LIFETIME;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_WEEEKENDS =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -162,8 +164,8 @@ const int MPTV_RECORD_WEEEKENDS =
   PVR_TIMER_TYPE_SUPPORTS_END_TIME |
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
-  PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_LIFETIME;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
 
 const int MPTV_RECORD_WEEKLY_EVERY_TIME_ON_THIS_CHANNEL =
   PVR_TIMER_TYPE_IS_REPEATING |
@@ -172,8 +174,18 @@ const int MPTV_RECORD_WEEKLY_EVERY_TIME_ON_THIS_CHANNEL =
   PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
   //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
   PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
-  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
-  PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH;
+  //PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+
+const int MPTV_RECORD_MANUAL =
+  PVR_TIMER_TYPE_IS_MANUAL |
+  PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
+  PVR_TIMER_TYPE_SUPPORTS_CHANNELS |
+  PVR_TIMER_TYPE_SUPPORTS_START_TIME |
+  PVR_TIMER_TYPE_SUPPORTS_END_TIME |
+  PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
+  //PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
+  PVR_TIMER_TYPE_SUPPORTS_LIFETIME;
 
 class cLifeTimeValues
 {