Update to 3.1.5

Build compatibility to g++11
2022-02-03 18:32:19 +01:00 · 2022-02-03 18:25:51 +01:00 · 2021-12-30 16:17:16 +01:00 · 2021-12-28 12:13:21 +01:00 · 2021-11-15 08:23:05 +01:00 · 2021-11-06 09:56:34 +01:00
3 changed files with 393 additions and 187 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (vdr-live-3.5.3.tar.gz) = b41e559d8bfe1d21301bfc852f91c92155baed49823d2bbf8fe9d36955b93ddd8aaebf4e4ba2fc1427c60876f2889a36846ca894f320fb5e6b7cdb37f6ac2a58
+SHA512 (vdr-live-3.1.5.tar.gz) = 9a55505a1bcb5b4c5876d6bdf4694435bd35809d38b75da2c3e5d17a09569b5f5b095dc5a8785faac256dfdd1c43bc3435f7f6ea3d8bec04208bcf9ef3b17112
--- a/vdr-live.spec
+++ b/vdr-live.spec
@ -1,33 +1,24 @@
-# https://github.com/MarkusEh/vdr-plugin-live/commit/9967f1d6757a4f4855a6b07abf526258838dd5ac
-%global commit0 9967f1d6757a4f4855a6b07abf526258838dd5ac
+# https://github.com/MarkusEh/vdr-plugin-live/commit/0fbd9b32fc6afcdbe8722daa0e772260cd058f41
+%global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global gitdate 20241103
-# Set vdr_version based on Fedora version
-%if 0%{?fedora} >= 43
-%global vdr_version 2.7.7
-%elif 0%{?fedora} == 42
-%global vdr_version 2.7.4
-%else
-%global vdr_version 2.6.9
-%endif
+%global gitdate 20211228

 Name:           vdr-live
-Version:        3.5.3
-# Release:        0.2.%%{gitdate}git%%{shortcommit0}%%{?dist}
+Version:        3.1.5
+#Release:        0.4.%%{gitdate}git%%{shortcommit0}%%{?dist}
 Release:        1%{?dist}
 Summary:        An interactive web interface with HTML5 live stream support for VDR

-# The entire source code is GPL-2.0-or-later except live/js/mootools/ which is LicenseRef-Callaway-MIT
-License:        GPL-2.0-or-later AND LicenseRef-Callaway-MIT
+# The entire source code is GPLv2+ except live/js/mootools/ which is MIT
+License:        GPLv2+ and MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-live
-# Source0:        https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz
+#Source0:        https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz
 Source0:        https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf

 BuildRequires:  make
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  vdr-devel >= %{vdr_version}
+BuildRequires:  vdr-devel >= 2.2.0
 BuildRequires:  pcre2-devel
 BuildRequires:  tntnet-devel
 BuildRequires:  cxxtools-devel
@ -53,7 +44,7 @@ Requires:      %{name} = %{version}-%{release}
 This package contains images, themes and JavaScript.

 %prep
-#%%autosetup -p1 -n vdr-plugin-live-%{commit0}
+#%%autosetup -p1 -n vdr-plugin-live-%%{commit0}
 %autosetup -p1 -n vdr-plugin-live-%{version}

 # delete unused directories and files
@ -65,7 +56,11 @@ rm -rf httpd
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README

 %build
+%if 0%{?fedora} > 35
 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
+%else
+%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++11 -fPIC"
+%endif

 %install
 %make_install
@ -80,179 +75,12 @@ install -Dpm 644 %{SOURCE1} \
 %doc CONTRIBUTORS README
 %license COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/live.conf
-%config(noreplace) %{_sysconfdir}/vdr/plugins/live/ffmpeg.conf
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}

 %files data
 %{vdr_resdir}/plugins/live/

 %changelog
-* Fri Dec 19 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.3-1
- Update to 3.5.3
-
-* Fri Oct 10 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.2-1
- Update to 3.5.2
-
-* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.1-3
- Rebuilt for new VDR API version 2.7.7
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jul 01 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.1-1
- Update to 3.5.1
-
-* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.0-3
- Rebuilt for new VDR API version 2.7.6
-
-* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.0-2
- Rebuilt for new VDR API version 2.7.5
-
-* Sat Apr 19 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.5.0-1
- Update to 3.5.0
-
-* Sun Mar 02 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.4.2-1
- Update to 3.4.2
-
-* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.4.1-3
- Rebuilt for new VDR API version 2.7.4
-
-* Thu Feb 06 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.4.1-2
- Rebuild
-
-* Tue Feb 04 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.4.1-1
- Update to 3.4.1
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan 02 2025 Martin Gansser <martinkg@fedoraproject.org> - 3.4.0-1
- Update to 3.4.0
-
-* Sun Dec 22 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.12-1
- Update to 3.3.12
-
-* Wed Dec 11 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.11-1
- Update to 3.3.11
-
-* Tue Nov 19 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.10-1
- Update to 3.3.10
-
-* Tue Nov 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.9-1
- Update to 3.3.9
-
-* Sun Nov 03 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.9-0.2.20241103git9967f1d
- Update to 3.3.9-0.2.20241103git9967f1d
-
-* Sat Nov 02 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.9-0.1.20241101gitf67dfc0
- Update to 3.3.9-0.1.20241101gitf67dfc0
-
-* Sat Oct 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.8-1
- Update to 3.3.8
-
-* Tue Oct 22 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.8-0.2.20241022git8b97db3
- Update to 3.3.8-0.2.20241022git8b97db3
-
-* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.8-0.1.20241008git80b8da8
- Rebuilt for new VDR API version 2.7.2
- Update to 3.3.8-0.1.20241008git80b8da8
-
-* Mon Sep 30 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.7-1
- Update to 3.3.7
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 3.3.5-5
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.5-3
- Rebuilt for new VDR API version 2.6.9
-
-* Fri Jul 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.5-2
- Rebuilt for new VDR API version 2.6.8
-
-* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.5-1
- Update to 3.3.5
- Rebuilt for new VDR API version
-
-* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.4-2
- Rebuilt for new VDR API version
-
-* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 3.3.4-1
- Rebuilt for new VDR API version
- Add BR gettext for rawhide
-
-* Wed Dec 20 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.3.3-1
- Update to 3.3.3
-
-* Mon Nov 27 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.3.2-1
- Update to 3.3.2
-
-* Tue Nov 21 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.3.1-1
- Update to 3.3.1
-
-* Sun Nov 19 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.3.0-1
- Update to 3.3.0
-
-* Tue Oct 03 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.2.1-1
- Update to 3.2.1
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Jun 11 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.2.0-1
- Update to 3.2.0
-
-* Sun Jun 11 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.1.12-1
- Update to 3.1.12
- Add %{name}-timerconflict.patch
-
-* Tue Jan 24 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.1.11-3
- Rebuilt
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 18 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.1.11-1
- Update to 3.1.11
-
-* Fri Jan 06 2023 Martin Gansser <martinkg@fedoraproject.org> - 3.1.10-2
- Rebuilt
-
-* Mon Dec 26 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.10-1
- Update to 3.1.10
-
-* Wed Dec 14 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.9-3
- Rebuilt for new VDR API version
-
-* Thu Dec 01 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.9-2
- Rebuilt for new VDR API version
-
-* Sun Nov 27 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.9-1
- Updatae to 3.1.9
-
-* Thu Nov 17 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.8-2
- Rebuilt due undefined symbol: _ZN7vdrlive6cUsers14logged_in_userB5cxx11E
-
-* Mon Oct 10 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.8-1
- Updatae to 3.1.8
-
-* Thu Jul 28 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.7-1
- Updatae to 3.1.7
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 20 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.6-2
- Built against correct vdr-devel version
-
-* Sun Jun 19 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.6-1
- Updatae to 3.1.6
-
-* Sat Feb 12 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.5-2
- Rebuilt
-
 * Thu Feb 03 2022 Martin Gansser <martinkg@fedoraproject.org> - 3.1.5-1
 - Update to 3.1.5

--- a/vdr-plugin-live-noCopyTimer.patch
+++ b/vdr-plugin-live-noCopyTimer.patch
@ -0,0 +1,378 @@
+diff -Naur vdr-plugin-live-3.0.10/pages/searchresults.ecpp vdr-plugin-live-master/pages/searchresults.ecpp
+--- vdr-plugin-live-3.0.10/pages/searchresults.ecpp	2021-07-18 14:51:47.000000000 +0200
+++ vdr-plugin-live-master/pages/searchresults.ecpp	2021-09-10 14:11:46.000000000 +0200
+@@ -62,53 +62,60 @@
+ <%cpp>
+ 				std::string current_day = "";
+ 
+-#if VDRVERSNUM >= 20301
+-				LOCK_CHANNELS_READ;
+-#endif
+ 				for (SearchResults::iterator result = results.begin(); result != results.end(); ++result) {
+ #if VDRVERSNUM >= 20301
+-					cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel());
+                                       	cStateKey StateKey;
+                                      	if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey)) {
+				#ifdef DEBUG_LOCK
+		                		dsyslog("live: pages/searchresults.ecpp LOCK_CHANNELS_READ");
+				#endif
+						cChannel* channel = (cChannel *)Channels->GetByChannelID(result->Channel());
+ #else
+ 					cChannel* channel = Channels.GetByChannelID(result->Channel());
+ #endif
+-					if (!channel) continue;
+-					std::string channelname = channel->Name();
+-					int channelnr = channel->Number();
+-					std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : "");
+-					std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : "");
+-					std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : "");
+-					std::string description = result->Description();
+-					std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId());
+						if (!channel) {
+         						StateKey.Remove();
+							continue;
+						}
+						std::string channelname = channel->Name();
+						int channelnr = channel->Number();
+						std::string start(result->StartTime() ? FormatDateTime(tr("%I:%M %p"), result->StartTime()) : "");
+						std::string end(result->StopTime() ? FormatDateTime(tr("%I:%M %p"), result->StopTime()) : "");
+						std::string day(result->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), result->StartTime()) : "");
+						std::string description = result->Description();
+						std::string epgid = EpgEvents::EncodeDomId(result->Channel(), result->EventId());
+ 
+-					bool truncated = false;
+						bool truncated = false;
+ 
+-					bool bottom = false;
+-					SearchResults::iterator nextResult = result; ++nextResult;
+-					if (nextResult == results.end())
+-						bottom = true;
+-					else {
+-						std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : "");
+-						bottom = (day != nextDay);
+-					}
+						bool bottom = false;
+						SearchResults::iterator nextResult = result; ++nextResult;
+						if (nextResult == results.end())
+							bottom = true;
+						else {
+							std::string nextDay(nextResult->StartTime() ? FormatDateTime(tr("%A, %b %d %Y"), nextResult->StartTime()) : "");
+							bottom = (day != nextDay);
+						}
+ 
+-					if (current_day != day) {
+-						if (current_day != "") {
+						if (current_day != day) {
+							if (current_day != "") {
+ </%cpp>
+-					<tr class="spacer">
+-						<td colspan="4"/>
+-					</tr>
+						<tr class="spacer">
+							<td colspan="4"/>
+						</tr>
+%							}
+						<tr class="head">
+							<td colspan="4"><div class="boxheader"><div><div><$ day $></div></div></div></td>
+						</tr>
+%							current_day = day;
+ %						}
+-					<tr class="head">
+-						<td colspan="4"><div class="boxheader"><div><div><$ day $></div></div></div></td>
+-					</tr>
+-%						current_day = day;
+%					        StateKey.Remove();  // release channels read lock before calling event_timer which make a timers read lock
+							<tr>
+							<td class="action leftcol <? bottom ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
+							<td class="topaligned <? bottom ? "bottomrow"?>"><div class="withmargin"><a href="schedule.html?channel=<$ channelnr $>"><$ channelname $></a></div></td>
+							<td class="topaligned <? bottom ? "bottomrow"?>"><div class="withmargin nowrap"><$ start $> - <$ end $></div></td>
+							<td class="topaligned rightcol <? bottom ? "bottomrow"?>"><div class="more withmargin"><a <& tooltip.hint text=(StringEscapeAndBreak(StringWordTruncate(description, 300, truncated)) + "<br />" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><span class="title"><$ result->Title() $></span><br /><span class="short"><%cpp>if (result->ShortText().empty()) { </%cpp>&nbsp;<%cpp> } </%cpp><$ result->ShortText() $></span></a></div></td>
+						</tr>
+ %					}
+-					<tr>
+-						<td class="action leftcol <? bottom ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
+-						<td class="topaligned <? bottom ? "bottomrow"?>"><div class="withmargin"><a href="schedule.html?channel=<$ channelnr $>"><$ channelname $></a></div></td>
+-						<td class="topaligned <? bottom ? "bottomrow"?>"><div class="withmargin nowrap"><$ start $> - <$ end $></div></td>
+-						<td class="topaligned rightcol <? bottom ? "bottomrow"?>"><div class="more withmargin"><a <& tooltip.hint text=(StringEscapeAndBreak(StringWordTruncate(description, 300, truncated)) + "<br />" + tr("Click to view details.")) &><& tooltip.display domId=(epgid) &>><span class="title"><$ result->Title() $></span><br /><span class="short"><%cpp>if (result->ShortText().empty()) { </%cpp>&nbsp;<%cpp> } </%cpp><$ result->ShortText() $></span></a></div></td>
+-					</tr>
+ %				}
+ 			</table>
+ 		</div>
+diff -Naur vdr-plugin-live-3.0.10/pages/timers.ecpp vdr-plugin-live-master/pages/timers.ecpp
+--- vdr-plugin-live-3.0.10/pages/timers.ecpp	2021-07-18 14:51:47.000000000 +0200
+++ vdr-plugin-live-master/pages/timers.ecpp	2021-09-10 14:11:46.000000000 +0200
+@@ -37,7 +37,7 @@
+ 	timer = 0;
+ 	if ( !timerid.empty() ) {
+ 		std::string tId = SortedTimers::DecodeDomId(timerid);
+-		// dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str());
+//		dsyslog("live: DEBUG: TIMER: tId = %s", tId.c_str());
+ 		timer = timers.GetByTimerId(tId);
+ 		if ( timer == 0 )
+ 			throw HtmlError( tr("Couldn't find timer. Maybe you mistyped your request?") );
+@@ -70,25 +70,26 @@
+ 		<& pageelems.logo &>
+ 		<& menu active=("timers") component=("timers.timer_actions")>
+ 		<div class="inhalt">
+-%			if (timers.size() == 0) {
+<%cpp>
+		#ifdef DEBUG_LOCK
+                        dsyslog("live: pages/timers.ecpp LOCK_TIMERS_READ");
+                #endif
+		        LOCK_TIMERS_READ;
+                        cSortedTimers sortedTimers(Timers);
+			if (sortedTimers.Size() == 0) {
+</%cpp>
+ 				<$ tr("No timer defined") $>
+ %			} else {
+ 			<table class="listing" cellspacing="0" cellpadding="0">
+ <%cpp>
+ 				// output of the timer list:
+-				for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) {
+-				    EpgInfoPtr epgEvent;
+                                for (int i = 0; i < sortedTimers.Size(); i++) {
+                                        const cTimer *timer = sortedTimers[i];
+	                 		EpgInfoPtr epgEvent;
+ 					std::string longDescription;
+ 					std::string searchTimName;
+ 					std::string searchTimId;
+-#if VDRVERSNUM >= 20301
+-					if (!timer->Event()) {
+-						LOCK_SCHEDULES_READ;
+-						timer->SetEventFromSchedule(Schedules);
+-					}
+-#else
+-					if (!timer->Event()) timer->SetEventFromSchedule();
+-#endif
+
+ 					if (timer->Event())
+ 					{
+ 						epgEvent = EpgEvents::CreateEpgInfo(timer->Channel(), timer->Event());
+@@ -98,13 +99,13 @@
+ 						searchTimName = SortedTimers::SearchTimerInfo(*timer, "searchtimer");
+ 						searchTimId = SortedTimers::SearchTimerInfo(*timer, "s-id");
+ 					}
+-					std::string currentDay = SortedTimers::GetTimerDays(*timer);
+-					SortedTimers::iterator nextTimer = timer; ++nextTimer;
+					std::string currentDay = SortedTimers::GetTimerDays(timer);
+                                        const cTimer *nextTimer =  NULL;
+                                        if (i < (sortedTimers.Size() - 1)) nextTimer = sortedTimers[i + 1];
+ 					bool bottom = false;
+-					if (nextTimer == timers.end())
+-						bottom = true;
+					if (i == sortedTimers.Size() - 1) bottom = true;
+ 					else {
+-						std::string nextDay = SortedTimers::GetTimerDays(*nextTimer);
+						std::string nextDay = SortedTimers::GetTimerDays(nextTimer);
+ 						bottom = (currentDay != nextDay);
+ 					}
+ 					if (previousDay != currentDay) {
+diff -Naur vdr-plugin-live-3.0.10/timers.cpp vdr-plugin-live-master/timers.cpp
+--- vdr-plugin-live-3.0.10/timers.cpp	2021-07-18 14:51:47.000000000 +0200
+++ vdr-plugin-live-master/timers.cpp	2021-09-10 14:11:46.000000000 +0200
+@@ -11,11 +11,6 @@
+ #include <vdr/menu.h>
+ #include <vdr/svdrp.h>
+ 
+-static bool operator<( cTimer const& left, cTimer const& right )
+-{
+-	return left.Compare( right ) < 0;
+-}
+-
+ namespace vdrlive {
+ 
+ 	static char const* const TIMER_DELETE = "DELETE";
+@@ -26,7 +21,6 @@
+ 	: m_state( 0 )
+ #endif
+ 	{
+-		ReloadTimers();
+ 	}
+ 
+ 	std::string SortedTimers::GetTimerId( cTimer const& timer )
+@@ -46,6 +40,11 @@
+ 		}
+ 
+ #if VDRVERSNUM >= 20301
+	#ifdef DEBUG_LOCK
+		dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_TIMERS_READ");
+		dsyslog("live: timers.cpp SortedTimers::GetByTimerId() LOCK_CHANNELS_READ");
+	#endif
+		LOCK_TIMERS_READ
+ 		LOCK_CHANNELS_READ;
+ 		cChannel* channel = (cChannel *)Channels->GetByChannelID( tChannelID::FromString( parts[0].c_str() ) );
+ #else
+@@ -64,7 +63,7 @@
+ 
+ 			cMutexLock MutexLock(&m_mutex);
+ 
+-			for ( SortedTimers::iterator timer = begin(); timer != end(); ++timer ) {
+			for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) {
+ 				if ( timer->Channel() == channel &&
+ 					 ( ( weekdays != 0 && timer->WeekDays() == weekdays ) || ( weekdays == 0 && timer->Day() == day ) ) &&
+ 					 timer->Start() == start && timer->Stop() == stop )
+@@ -94,33 +93,12 @@
+ 	}
+ 
+ 
+-	void SortedTimers::ReloadTimers()
+-	{
+-//		dsyslog("live: SortedTimers::ReloadTimers() reloading timers");
+-
+-		cMutexLock MutexLock(&m_mutex);
+-
+-		clear();
+-#if VDRVERSNUM >= 20301
+-		{
+-			LOCK_TIMERS_READ;
+-			for ( cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next( timer ) ) {
+-				push_back( *timer );
+-			}
+-		}
+-#else
+-		for ( cTimer* timer = Timers.First(); timer; timer = Timers.Next( timer ) ) {
+-			push_back( *timer );
+-		}
+-#endif
+-		sort();
+-	}
+-
+-	std::string SortedTimers::GetTimerDays(cTimer const& timer)
+	std::string SortedTimers::GetTimerDays(cTimer const *timer)
+ 	{
+-		std::string currentDay = timer.WeekDays() > 0 ?
+-			*cTimer::PrintDay(0, timer.WeekDays(), true) :
+-			FormatDateTime(tr("%A, %x"), timer.Day());
+		if (!timer) return "";
+		std::string currentDay = timer->WeekDays() > 0 ?
+			*cTimer::PrintDay(0, timer->WeekDays(), true) :
+			FormatDateTime(tr("%A, %x"), timer->Day());
+ 		return currentDay;
+ 	}
+ 
+@@ -269,7 +247,6 @@
+ 		if ( m_updateTimers.size() > 0 ) {
+ 			DoUpdateTimers();
+ 		}
+-		DoReloadTimers();
+ 		// dsyslog("live: SV: signalling waiters");
+ 		m_updateWait.Broadcast();
+ 	}
+@@ -332,6 +309,9 @@
+                     }
+ #if VDRVERSNUM >= 20301
+ 		    	dsyslog("live: DoInsertTimer() add local timer");
+	#ifdef DEBUG_LOCK
+                        dsyslog("live: timers.cpp TimerManager::DoInsertTimer() LOCK_TIMERS_WRITE");
+        #endif
+ 		    	LOCK_TIMERS_WRITE;
+ 		    	Timers->SetExplicitModify();
+ 		    	const cTimer *checkTimer = Timers->GetTimer( newTimer.get() );
+@@ -418,6 +398,9 @@
+ 		else {				// old and new are local
+ 			dsyslog("live: DoUpdateTimer() old and new timer are local");
+ #if VDRVERSNUM >= 20301
+	#ifdef DEBUG_LOCK
+                        dsyslog("live: timers.cpp TimerManager::DoUpdateTimer() LOCK_TIMERS_WRITE");
+	#endif
+ 			LOCK_TIMERS_WRITE;
+ 			Timers->SetExplicitModify();
+ 			cTimer* oldTimer = Timers->GetById( timerData.id, timerData.oldRemote );
+@@ -494,6 +477,9 @@
+ #endif
+ 
+ #if VDRVERSNUM >= 20301
+	#ifdef DEBUG_LOCK
+                        dsyslog("live: timers.cpp TimerManager::DoDeleteTimer() LOCK_TIMERS_WRITE");
+        #endif
+ 			LOCK_TIMERS_WRITE;
+ 			Timers->SetExplicitModify();
+ 			cTimer* oldTimer = Timers->GetById( timerData.id,  timerData.remote );
+@@ -527,6 +513,9 @@
+ 	void TimerManager::DoToggleTimer( timerStruct& timerData )
+ 	{
+ 		if ( timerData.remote ) {		// toggle remote timer via svdrpsend
+	#ifdef DEBUG_LOCK
+                        dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_READ");
+        #endif
+ 			LOCK_TIMERS_READ;
+ 			const cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote );
+ 			std::string command = "MODT ";
+@@ -571,6 +560,9 @@
+ #endif
+ 
+ #if VDRVERSNUM >= 20301
+	#ifdef DEBUG_LOCK
+                        dsyslog("live: timers.cpp TimerManager::DoToggleTimer() LOCK_TIMERS_WRITE");
+	#endif
+ 			LOCK_TIMERS_WRITE;
+ 			Timers->SetExplicitModify();
+ 			cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote );
+@@ -616,20 +608,18 @@
+ 	const cTimer* TimerManager::GetTimer(tEventID eventid, tChannelID channelid)
+ 	{
+ 		cMutexLock timersLock( &LiveTimerManager() );
+-		SortedTimers& timers = LiveTimerManager().GetTimers();
+ 
+-		for ( SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer )
+	#ifdef DEBUG_LOCK
+                dsyslog("live: timers.cpp TimerManager::GetTimer() LOCK_TIMERS_READ");
+	#endif
+                LOCK_TIMERS_READ;
+		for (cTimer* timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) {
+ 			if (timer->Channel() && timer->Channel()->GetChannelID() == channelid)
+ 			{
+-#if VDRVERSNUM >= 20301
+-				LOCK_SCHEDULES_READ;
+-				if (!timer->Event()) timer->SetEventFromSchedule(Schedules);
+-#else
+-				if (!timer->Event()) timer->SetEventFromSchedule();
+-#endif
+ 				if (timer->Event() && timer->Event()->EventID() == eventid)
+ 					return &*timer;
+ 			}
+		}
+ 		return NULL;
+ 	}
+ 
+diff -Naur vdr-plugin-live-3.0.10/timers.h vdr-plugin-live-master/timers.h
+--- vdr-plugin-live-3.0.10/timers.h	2021-07-18 14:51:47.000000000 +0200
+++ vdr-plugin-live-master/timers.h	2021-09-10 14:11:46.000000000 +0200
+@@ -31,7 +31,7 @@
+ 			bool Modified() { return Timers.Modified(m_state); }
+ #endif
+ 
+-			static std::string GetTimerDays(cTimer const& timer);
+			static std::string GetTimerDays(cTimer const *timer);
+ 			static std::string GetTimerInfo(cTimer const& timer);
+ 			static std::string SearchTimerInfo(cTimer const& timer, std::string const& value);
+ 
+@@ -47,7 +47,6 @@
+ 			int m_state;
+ #endif
+ 
+-			void ReloadTimers();
+ 	};
+ 
+ 	class TimerManager: public cMutex
+@@ -64,7 +63,6 @@
+ 			void ToggleTimerActive( int timerId, const char* remote);
+ 			// may only be called from Plugin::MainThreadHook
+ 			void DoPendingWork();
+-			void DoReloadTimers() { m_timers.ReloadTimers(); m_reloadTimers = false; }
+ 			const cTimer* GetTimer(tEventID eventid, tChannelID channelid);
+ 			void SetReloadTimers() { m_reloadTimers = true; }
+ 
+diff -Naur vdr-plugin-live-3.0.10/tools.h vdr-plugin-live-master/tools.h
+--- vdr-plugin-live-3.0.10/tools.h	2021-07-18 14:51:47.000000000 +0200
+++ vdr-plugin-live-master/tools.h	2021-09-10 14:11:46.000000000 +0200
+@@ -1,6 +1,9 @@
+ #ifndef VDR_LIVE_TOOLS_H
+ #define VDR_LIVE_TOOLS_H
+ 
+// uncomment to debug lock sequence 
+// #define DEBUG_LOCK
+
+ // STL headers need to be before VDR tools.h (included by <vdr/channels.h>)
+ #include <istream>
+ #include <sstream>
Author	SHA1	Message	Date
Martin Gansser	2d3aa60da1	Update to 3.1.5	2022-02-03 18:32:19 +01:00
Martin Gansser	62aeaf1678	Update to 3.1.5	2022-02-03 18:25:51 +01:00
Martin Gansser	ff7b8cde58	Build compatibility to g++11	2021-12-30 16:17:16 +01:00
Martin Gansser	298f551a87	Replace obsolete pcre by pcre2 Update to 3.1.4-0.1.20211228git0fbd9b3	2021-12-28 12:13:21 +01:00
Martin Gansser	c0ae7e662e	Update to 3.1.3	2021-11-15 08:23:05 +01:00
Martin Gansser	4a01d026d0	Build compatibility to g++11	2021-11-06 09:56:34 +01:00
Martin Gansser	a30bfa71db	Update to 3.1.1	2021-11-01 08:17:46 +01:00
Martin Gansser	7e377b4f4f	Update to 3.1.0	2021-10-28 11:10:18 +02:00
Martin Gansser	4872a05ed0	Update to 3.0.12	2021-10-15 11:20:01 +02:00
Martin Gansser	0f729baf4e	Add vdr-plugin-live-noCopyTimer.patch to avoid copying vdr timer objects	2021-09-11 13:53:36 +02:00
Martin Gansser	d61bc70371	Rebuilt fixes unresolved symbol	2021-08-06 21:05:47 +02:00
Martin Gansser	0f041d2cfe	Update to 3.0.10	2021-07-18 18:27:53 +02:00
Martin Gansser	fdac5071de	Update to 3.0.9	2021-06-07 11:24:34 +02:00
Martin Gansser	07cc04c4bb	Update to 3.0.8	2021-05-24 14:47:52 +02:00
Martin Gansser	4548c38d50	Update to 3.0.7-0.1.20210307git075080a	2021-03-07 09:34:59 +01:00
Martin Gansser	92f225ddd4	Update to 3.0.6	2021-03-03 12:07:35 +01:00
Martin Gansser	fb3e161ce2	Update to 3.0.6	2021-03-03 11:58:39 +01:00
Martin Gansser	c6c655bf69	Rebuilt for cxxtools/tntnet-3.0 support Update to 3.0.5	2021-03-01 20:01:43 +01:00