Enabled/disabled fallback tuner for recordings seperately

As discussed here: http://forums.openpli.org/topic/40376-fallbacktuner-and-timerconflict-dectection/page-5

data/setup.xml

@@ -12,6 +12,7 @@
 		<item level="1" text="12V output" description="12V output" requires="12V_Output.">config.usage.output_12V</item>
 		<item level="2" text="Alternative services tuner priority" description="Configure which tuner type will be preferred, when the same service is available on different types of tuners. Choose 'no priority' to try each alternative one by one independent from tuner type.">config.usage.alternatives_priority</item>
 		<item level="2" text="Enable fallback remote receiver" description="Enable remote enigma2 receiver to be tried to tune into services that cannot be tuned into locally (e.g. tuner is occupied or service type is unavailable on the local tuner. Specify complete URL including http:// and port number (normally ...:8001), e.g. http://second_box:8001.">config.usage.remote_fallback_enabled</item>
+		<item level="2" text="Enable fallback remote receiver for recordings" description="Enable remote enigma2 receiver to be tried to tune into services that cannot be tuned into locally for recordings (e.g. tuner is occupied or service type is unavailable on the local tuner. Specify complete URL including http:// and port number (normally ...:8001), e.g. http://second_box:8001.">config.usage.remote_fallback_recording_enabled</item>
 		<item level="2" text="Fallback remote receiver URL" description="URL of fallback remote receiver">config.usage.remote_fallback</item>
 		<item level="2" text="Preferred tuner" description="Configure which tuner will be preferred, when more than one tuner is available. If set to 'auto' the system will give priority to the tuner having the lowest number of channels/satellites.">config.usage.frontend_priority</item>
 		<item level="2" text="Preferred tuner DVB-S" description="When enabled, this setting has more weight than 'Preferred tuner'." requires="DVB-S_priority_tuner_available">config.usage.frontend_priority_dvbs</item>

lib/python/Components/UsageConfig.py

@@ -197,6 +197,7 @@ def alternativeNumberModeChange(configElement):
 		("127", _("No priority")) ])
 
 	config.usage.remote_fallback_enabled = ConfigYesNo(default = False)
+	config.usage.remote_fallback_recording_enabled = ConfigYesNo(default = False)
 	config.usage.remote_fallback = ConfigText(default = "", fixed_size = False)
 	config.usage.show_timer_conflict_warning = ConfigYesNo(default = True)
 

lib/service/servicedvb.cpp

@@ -2291,15 +2291,16 @@ ePyObject eDVBServicePlay::getRassInteractiveMask()
 	Py_RETURN_NONE;
 }
 
-bool eDVBServiceBase::tryFallbackTuner(eServiceReferenceDVB &service, bool &is_stream, bool is_pvr, bool simulate)
+bool eDVBServiceBase::tryFallbackTuner(eServiceReferenceDVB &service, bool &is_stream, bool is_pvr, bool simulate, bool is_recording)
 {
 	ePtr<eDVBResourceManager> res_mgr;
 	std::ostringstream remote_service_ref;
 	eDVBChannelID chid, chid_ignore;
 	int system;
 	size_t index;
 
-	bool remote_fallback_enabled = eConfigManager::getConfigBoolValue("config.usage.remote_fallback_enabled", false);
+	bool remote_fallback_enabled = is_recording ? eConfigManager::getConfigBoolValue("config.usage.remote_fallback_recording_enabled", false) :
+		eConfigManager::getConfigBoolValue("config.usage.remote_fallback_enabled", false);
 	std::string remote_fallback_url = eConfigManager::getConfigValue("config.usage.remote_fallback");
 
 	if(is_stream || is_pvr || simulate ||

lib/service/servicedvb.h

@@ -71,7 +71,7 @@ class eDVBServiceBase: public iFrontendInformation
 {
 protected:
 	static bool tryFallbackTuner(eServiceReferenceDVB &service,
-			bool &is_stream, bool is_pvr, bool simulate);
+			bool &is_stream, bool is_pvr, bool simulate, bool is_recording=false);
 
 	eDVBServicePMTHandler m_service_handler;
 public:

lib/service/servicedvbrecord.cpp

@@ -218,7 +218,7 @@ int eDVBServiceRecord::doPrepare()
 	{
 		eDVBServicePMTHandler::serviceType servicetype;
 
-		if(tryFallbackTuner(/*REF*/m_ref, /*REF*/m_is_stream_client, m_is_pvr, m_simulate))
+		if(tryFallbackTuner(/*REF*/m_ref, /*REF*/m_is_stream_client, m_is_pvr, m_simulate, /*is_recording*/ true))
 			eDebug("ServiceRecord: fallback tuner selected");
 
 		if (m_streaming)