enable setting 'limit_tune_attempts'

metaron-uk · Aug 19, 2015 · f32248a · f32248a
1 parent 000f424
commit f32248a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/client.cpp b/src/client.cpp
@@ -57,6 +57,7 @@ int           g_iTuneDelay              = DEFAULT_TUNE_DELAY;
 int           g_iGroupRecordings        = GROUP_RECORDINGS_ALWAYS;
 int           g_iEnableEDL              = ENABLE_EDL_ALWAYS;
 bool          g_bBlockMythShutdown      = DEFAULT_BLOCK_SHUTDOWN;
+bool          g_bLimitTuneAttempts      = DEFAULT_LIMIT_TUNE_ATTEMPTS;
 
 ///* Client member variables */
 ADDON_STATUS  m_CurStatus               = ADDON_STATUS_UNKNOWN;
@@ -301,6 +302,14 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
     g_bRecordingIcons = DEFAULT_RECORDING_ICONS;
   }
 
+  /* Read setting "limit_tune_attempts" from settings.xml */
+  if (!XBMC->GetSetting("limit_tune_attempts", &g_bLimitTuneAttempts))
+  {
+    /* If setting is unknown fallback to defaults */
+    XBMC->Log(LOG_ERROR, "Couldn't get 'limit_tune_attempts' setting, falling back to '%b' as default", DEFAULT_LIMIT_TUNE_ATTEMPTS);
+    g_bLimitTuneAttempts = DEFAULT_LIMIT_TUNE_ATTEMPTS;
+  }
+
   free (buffer);
   XBMC->Log(LOG_DEBUG, "Loading settings...done");
 
@@ -615,6 +624,12 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
         g_bBlockMythShutdown ? g_client->BlockBackendShutdown() : g_client->AllowBackendShutdown();
     }
   }
+  else if (str == "limit_tune_attempts")
+  {
+    XBMC->Log(LOG_INFO, "Changed Setting 'limit_tune_attempts' from %u to %u", g_bLimitTuneAttempts, *(bool*)settingValue);
+    if (g_bLimitTuneAttempts != *(bool*)settingValue)
+      g_bLimitTuneAttempts = *(bool*)settingValue;
+  }
   return ADDON_STATUS_OK;
 }
 

diff --git a/src/client.h b/src/client.h
@@ -62,6 +62,7 @@
 #define ENABLE_EDL_DIALOG                   1
 #define ENABLE_EDL_NEVER                    2
 #define DEFAULT_BLOCK_SHUTDOWN              true
+#define DEFAULT_LIMIT_TUNE_ATTEMPTS         true
 
 /*!
  * @brief PVR macros for string exchange
@@ -106,6 +107,7 @@ extern int          g_iTuneDelay;
 extern int          g_iGroupRecordings;
 extern int          g_iEnableEDL;
 extern bool         g_bBlockMythShutdown;
+extern bool         g_bLimitTuneAttempts;       ///< Limit channel tuning attempts to first card
 
 extern ADDON::CHelper_libXBMC_addon *XBMC;
 extern CHelper_libXBMC_pvr          *PVR;

diff --git a/src/pvrclient-mythtv.cpp b/src/pvrclient-mythtv.cpp
@@ -1946,8 +1946,9 @@ bool PVRClientMythTV::OpenLiveStream(const PVR_CHANNEL &channel)
   // Suspend fileOps to avoid connection hang
   if (m_fileOps)
     m_fileOps->Suspend();
-  // Set tuning delay
+  // Configure tuning of channel
   m_liveStream->SetTuneDelay(g_iTuneDelay);
+  m_liveStream->SetLimitTuneAttempts(g_bLimitTuneAttempts);
   // Try to open
   if (m_liveStream->SpawnLiveTV(chanset[0]->chanNum, chanset))
   {