From 6b2dbdfe6e18b62f89b4bb31d2226f4c3bf61773 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Fri, 26 Jul 2019 06:18:12 +0100 Subject: [PATCH 1/2] Allow creation of epg based repeating timer rules if autotimers are not available --- src/enigma2/Timers.cpp | 50 ++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/src/enigma2/Timers.cpp b/src/enigma2/Timers.cpp index 6c34fede..f5c4f1be 100644 --- a/src/enigma2/Timers.cpp +++ b/src/enigma2/Timers.cpp @@ -336,23 +336,41 @@ void Timers::GetTimerTypes(std::vector &types) const types.emplace_back(*t); delete t; - // This type can only be created on the Enigma2 device. - /* Repeating epg based */ - t = new TimerType( - Timer::Type::EPG_REPEATING, - PVR_TIMER_TYPE_IS_REPEATING | - PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES | - 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_WEEKDAYS, - LocalizedString(30425)); // Repeating guide-based - types.emplace_back(*t); - delete t; - - if (Settings::GetInstance().SupportsAutoTimers() && m_settings.GetAutoTimersEnabled()) + if (!Settings::GetInstance().SupportsAutoTimers() || !m_settings.GetAutoTimersEnabled()) + { + // Allow this type of timer to be created from kodi if autotimers are not available + // as otherwise there is no way to create a repeating EPG timer rule + /* Repeating epg based */ + t = new TimerType( + Timer::Type::EPG_REPEATING, + PVR_TIMER_TYPE_IS_REPEATING | + 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_WEEKDAYS, + LocalizedString(30425)); // Repeating guide-based + types.emplace_back(*t); + delete t; + } + else { + // This type can only be created on the Enigma2 device (i.e. not via kodi PVR) if autotimers are used. + // In this case this type is superflous and just clutters the UI on creation. + /* Repeating epg based */ + t = new TimerType( + Timer::Type::EPG_REPEATING, + PVR_TIMER_TYPE_IS_REPEATING | + PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES | + 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_WEEKDAYS, + LocalizedString(30425)); // Repeating guide-based + types.emplace_back(*t); + delete t; + /* PVR_Timer.iPreventDuplicateEpisodes values and presentation.*/ static std::vector> deDupValues = { From 1b2cff668442dc4cca982256c0a1185a1e9b1edb Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Fri, 26 Jul 2019 07:40:45 +0100 Subject: [PATCH 2/2] changelog and version --- pvr.vuplus/addon.xml.in | 5 ++++- pvr.vuplus/changelog.txt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pvr.vuplus/addon.xml.in b/pvr.vuplus/addon.xml.in index 6ae19690..b54c4da2 100755 --- a/pvr.vuplus/addon.xml.in +++ b/pvr.vuplus/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -175,6 +175,9 @@ 這是測試版軟體!其原創作者並無法對於以下情況負責,包含:錄影失敗,不正確的定時設定,多餘時數,或任何產生的其它不良影響... @PLATFORM@ +v4.5.0 +- Added: Allow creation of epg based repeating timer rules if autotimers are not available + v4.4.0 - Added: Set program id option for streams with superfluous program data - Added: Undelete and trashcan (when configured on backend) for recordings diff --git a/pvr.vuplus/changelog.txt b/pvr.vuplus/changelog.txt index 0dc5ab06..1fad2672 100644 --- a/pvr.vuplus/changelog.txt +++ b/pvr.vuplus/changelog.txt @@ -1,3 +1,6 @@ +v4.5.0 +- Added: Allow creation of epg-based repeating timer rules if autotimers are not available + v4.4.0 - Added: Set program id option for streams with superfluous program data - Added: Undelete and trashcan (when configured on backend) for recordings