summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--config.h10
-rw-r--r--timers.c4
4 files changed, 13 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index baa09ee6..e7344e9b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1744,6 +1744,7 @@ Udo Richter <udo_richter@gmx.de>
for a patch that sets the start time of an edited recording to the time of the first
editing mark
for adding the option --outputonly to the dvbsddevice plugin
+ for adding a missing template specification to the c'tor of cSortedTimers
Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 23412f86..bf4d4dc0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7147,3 +7147,8 @@ Video Disk Recorder Revision History
- Speeded up opening menus on systems with many (several thousands) of recordings, by
caching the information whether a recording is stored on the video directory file
system within the cRecording data (based on a patch from Torsten Lang).
+
+2012-06-03: Version 1.7.29
+
+- Added a missing template specification to the c'tor of cSortedTimers (thanks to Udo
+ Richter).
diff --git a/config.h b/config.h
index e283d77c..4c837054 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.47 2012/04/15 10:45:32 kls Exp $
+ * $Id: config.h 2.48 2012/06/03 13:04:49 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "1.7.28"
-#define VDRVERSNUM 10728 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.7.29"
+#define VDRVERSNUM 10729 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.7.28"
-#define APIVERSNUM 10728 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.7.29"
+#define APIVERSNUM 10729 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/timers.c b/timers.c
index 50aebb87..13fce1e2 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.c 2.9 2012/06/02 12:10:00 kls Exp $
+ * $Id: timers.c 2.10 2012/06/03 13:04:23 kls Exp $
*/
#include "timers.h"
@@ -829,7 +829,7 @@ static int CompareTimers(const void *a, const void *b)
}
cSortedTimers::cSortedTimers(void)
-:cVector(Timers.Count())
+:cVector<const cTimer *>(Timers.Count())
{
for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
Append(Timer);