Remove 'Use Original Air Date timestamp for Recorded TV programs' set…

…ting

pvr.hdhomerundvr/changelog.txt

@@ -1,6 +1,7 @@
 v3.1.1 (2020.01.xx)
   - (Windows) Use a BELOW_NORMAL thread priority for the background task scheduler
   - Remove obsolete MPEG-TS packet filtering implementation when streaming via HTTP
+  - Remove "Use Original Air Date timestamp for Recorded TV programs" setting
   - Fix bug preventing recording resume position from being set if recording is in-progress
 
 v3.1.0 (2019.12.23)

pvr.hdhomerundvr/resources/language/resource.language.en_gb/strings.po

@@ -144,10 +144,6 @@ msgctxt "#30136"
 msgid "Additional EDL file path"
 msgstr ""
 
-msgctxt "#30137"
-msgid "Use Original Air Date timestamp for Recorded TV programs"
-msgstr ""
-
 msgctxt "#30201"
 msgid "5 Minutes"
 msgstr ""
@@ -455,8 +451,3 @@ msgstr ""
 msgctxt "#30531"
 msgid "Specifies an additional base path to search for Recorded TV Edit Decision List (EDL) files."
 msgstr ""
-
-msgctxt "#30532"
-msgid "When set to ON the timestamp reported for Recorded TV programs will be set to the Original Air Date timestamp instead of the recording timestamp."
-msgstr ""
-

pvr.hdhomerundvr/resources/settings.xml

@@ -59,12 +59,6 @@
           <control type="toggle"/>
         </setting>
 
-        <setting id="use_airdate_as_recordingdate" type="boolean" label="30137" help="30532">
-          <level>0</level>
-          <default>false</default>
-          <control type="toggle"/>
-        </setting>
-
         <setting id="delete_datetime_rules_after_v2" type="integer" label="30108" help="30509">
           <level>0</level>
           <default>86400</default>

src/pvr.cpp

@@ -224,11 +224,6 @@ struct addon_settings {
 	// Flag indicating that a repeat indicator should be appended to episode names
 	bool generate_repeat_indicators;
 
-	// use_airdate_as_recordingdate
-	//
-	// Flag indicating that the original air date should be reported as the recording date
-	bool use_airdate_as_recordingdate;
-
 	// delete_datetime_rules_after
 	//
 	// Amount of time (seconds) after which an expired date/time rule is deleted
@@ -426,7 +421,6 @@ static addon_settings g_settings = {
 	false,					// use_channel_names_from_lineup
 	false,					// disable_recording_categories
 	false,					// generate_repeat_indicators
-	false,					// use_airdate_as_recordingdate
 	86400,					// delete_datetime_rules_after			default = 1 day
 	300, 					// discover_devices_interval;			default = 5 minutes
 	7200,					// discover_episodes_interval			default = 2 hours
@@ -1800,7 +1794,6 @@ ADDON_STATUS ADDON_Create(void* handle, void* props)
 			if(g_addon->GetSetting("use_channel_names_from_lineup", &bvalue)) g_settings.use_channel_names_from_lineup = bvalue;
 			if(g_addon->GetSetting("disable_recording_categories", &bvalue)) g_settings.disable_recording_categories = bvalue;
 			if(g_addon->GetSetting("generate_repeat_indicators", &bvalue)) g_settings.generate_repeat_indicators = bvalue;
-			if(g_addon->GetSetting("use_airdate_as_recordingdate", &bvalue)) g_settings.use_airdate_as_recordingdate = bvalue;
 			if(g_addon->GetSetting("delete_datetime_rules_after_v2", &nvalue)) g_settings.delete_datetime_rules_after = nvalue;
 
 			// Load the discovery interval settings
@@ -2153,19 +2146,6 @@ ADDON_STATUS ADDON_SetSetting(char const* name, void const* value)
 		}
 	}
 
-	// use_airdate_as_recordingdate
-	//
-	else if(strcmp(name, "use_airdate_as_recordingdate") == 0) {
-
-		bool bvalue = *reinterpret_cast<bool const*>(value);
-		if(bvalue != g_settings.use_airdate_as_recordingdate) {
-
-			g_settings.use_airdate_as_recordingdate = bvalue;
-			log_notice(__func__, ": setting use_airdate_as_recordingdate changed to ", (bvalue) ? "true" : "false", " -- trigger recording update");
-			g_pvr->TriggerRecordingUpdate();
-		}
-	}
-
 	// delete_datetime_rules_after
 	//
 	else if(strcmp(name, "delete_datetime_rules_after_v2") == 0) {
@@ -3284,12 +3264,6 @@ PVR_ERROR GetRecordings(ADDON_HANDLE handle, bool deleted)
 
 			// recordingTime
 			recording.recordingTime = item.recordingtime;
-			if((item.category != nullptr) && (settings.use_airdate_as_recordingdate) && (item.originalairdate > 0)) {
-
-				// Only apply use_airdate_as_recordindate to items with a category "series", "movie", and "special"
-				if((strcasecmp(item.category, "series") == 0) || (strcasecmp(item.category, "movie") == 0) || (strcasecmp(item.category, "special") == 0))
-					recording.recordingTime = item.originalairdate;
-			}
 
 			// iDuration
 			recording.iDuration = item.duration;