summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2011-08-27 11:14:54 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2011-08-27 11:14:54 +0200
commit6700e772e5da3757a91fcc500128adc7c16bb355 (patch)
tree40f2f3090c55a165dbd46e17d183493abdf8ed6a
parentac5f296f20d2d573e4b800c26c8ec4fff8e9f838 (diff)
downloadvdr-6700e772e5da3757a91fcc500128adc7c16bb355.tar.gz
vdr-6700e772e5da3757a91fcc500128adc7c16bb355.tar.bz2
The Recordings menu now displays the length (in hours:minutes) of each recording
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--menu.c6
-rw-r--r--recording.c7
4 files changed, 14 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e2e3b7ff..ed4a293c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1116,6 +1116,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for suggesting to implement a way for devices to tell whether they can provide EIT data
for making the Audio and Subtitles options available through the Green and Yellow
keys in the Setup/DVB menu
+ for making the Recordings menu display the length (in hours:minutes) of each recording
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index bedcc3ed..335cc91b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6729,3 +6729,8 @@ Video Disk Recorder Revision History
keys in the Setup/DVB menu (thanks to Rolf Ahrenberg). This is mainly for remote
controls that don't have dedicated keys for these functions.
- The SVDRP command HITK now accepts multiple keys (up to 31).
+- The Recordings menu now displays the length (in hours:minutes) of each recording
+ (thanks to Rolf Ahrenberg). Note that the "new" indicator has been moved from the
+ recording time to the length column. This new format is also used by the SVDRP
+ command LSTR, so in case you have an application that parses the LSTR output,
+ you will need to adjust it to the new format.
diff --git a/menu.c b/menu.c
index 1a2d62b5..ef2bb468 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 2.31 2011/08/26 13:20:23 kls Exp $
+ * $Id: menu.c 2.32 2011/08/27 11:05:33 kls Exp $
*/
#include "menu.h"
@@ -2193,13 +2193,13 @@ void cMenuRecordingItem::IncrementCounter(bool New)
totalEntries++;
if (New)
newEntries++;
- SetText(cString::sprintf("%d\t%d\t%s", totalEntries, newEntries, name));
+ SetText(cString::sprintf("%d\t\t%d\t%s", totalEntries, newEntries, name));
}
// --- cMenuRecordings -------------------------------------------------------
cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-:cOsdMenu(Base ? Base : tr("Recordings"), 9, 7)
+:cOsdMenu(Base ? Base : tr("Recordings"), 9, 6, 6)
{
base = Base ? strdup(Base) : NULL;
level = Setup.RecordingDirs ? Level : -1;
diff --git a/recording.c b/recording.c
index 0067e6fe..93433cc7 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 2.36 2011/08/21 13:43:03 kls Exp $
+ * $Id: recording.c 2.37 2011/08/27 10:55:53 kls Exp $
*/
#include "recording.h"
@@ -873,13 +873,16 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
s++;
else
s = name;
- titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%c%s",
+ titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%d:%02d%c%c%s",
t->tm_mday,
t->tm_mon + 1,
t->tm_year % 100,
Delimiter,
t->tm_hour,
t->tm_min,
+ Delimiter,
+ (LengthInSeconds() >= 0) ? LengthInSeconds() / 3600 : 0,
+ (LengthInSeconds() >= 0) ? LengthInSeconds() / 60 % 60 : 0,
New,
Delimiter,
s));