From 091a25c54e2f4d97c6e3a73a1e0c63fd69434f17 Mon Sep 17 00:00:00 2001 From: djp952 Date: Tue, 7 Jan 2020 14:51:19 -0500 Subject: [PATCH] Remove 'Use Original Air Date timestamp for Recorded TV programs' setting --- pvr.hdhomerundvr/changelog.txt | 1 + .../resource.language.en_gb/strings.po | 9 ------- pvr.hdhomerundvr/resources/settings.xml | 6 ----- src/pvr.cpp | 26 ------------------- 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/pvr.hdhomerundvr/changelog.txt b/pvr.hdhomerundvr/changelog.txt index be770708..3b7bbc9b 100644 --- a/pvr.hdhomerundvr/changelog.txt +++ b/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) diff --git a/pvr.hdhomerundvr/resources/language/resource.language.en_gb/strings.po b/pvr.hdhomerundvr/resources/language/resource.language.en_gb/strings.po index 23788bb8..d6d2700d 100644 --- a/pvr.hdhomerundvr/resources/language/resource.language.en_gb/strings.po +++ b/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 "" - diff --git a/pvr.hdhomerundvr/resources/settings.xml b/pvr.hdhomerundvr/resources/settings.xml index 85c3568a..102c73d2 100644 --- a/pvr.hdhomerundvr/resources/settings.xml +++ b/pvr.hdhomerundvr/resources/settings.xml @@ -59,12 +59,6 @@ - - 0 - false - - - 0 86400 diff --git a/src/pvr.cpp b/src/pvr.cpp index ec1ffe9d..993668c1 100644 --- a/src/pvr.cpp +++ b/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(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;