Added the year (two digits) to recording dates in LSTR, and thus also in menus

4 files changed, 8 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index db49edb1..58927f35 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -714,6 +714,7 @@ Jan Ekholm <chakie@infa.abo.fi>
  for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show()
  for reporting and helping to debug a problem in frequency handling when setting
  the CA descriptors in cDvbTuner::Action()
+ for suggesting to add the year to recording dates in LSTR
 
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
diff --git a/HISTORY b/HISTORY
index 04996979..29205bfd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3591,3 +3591,5 @@ Video Disk Recorder Revision History
   to Rolf Ahrenberg).
 - A device can now detach all receivers for a given PID, as is necessary, e.g.,
   for the bitstreamout plugin (thanks to Werner Fink).
+- Added the year (two digits) to recording dates in LSTR, and thus also in menus
+  (suggested by Jan Ekholm).
diff --git a/menu.c b/menu.c
index e36cc65f..0ca55f50 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.349 2005/05/16 13:59:03 kls Exp $
+ * $Id: menu.c 1.350 2005/06/05 14:11:54 kls Exp $
  */
 
 #include "menu.h"
@@ -1537,7 +1537,7 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 int cMenuRecordings::helpKeys = -1;
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-:cOsdMenu(Base ? Base : tr("Recordings"), 6, 6)
+:cOsdMenu(Base ? Base : tr("Recordings"), 8, 6)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
diff --git a/recording.c b/recording.c
index 4549b464..462b1600 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.108 2005/06/04 11:31:24 kls Exp $
+ * $Id: recording.c 1.109 2005/06/05 14:11:45 kls Exp $
  */
 
 #include "recording.h"
@@ -593,9 +593,10 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s++;
      else
         s = name;
-     asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
+     asprintf(&titleBuffer, "%02d.%02d.%02d%c%02d:%02d%c%c%s",
                             t->tm_mday,
                             t->tm_mon + 1,
+                            t->tm_year % 100,
                             Delimiter,
                             t->tm_hour,
                             t->tm_min,