summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-02-07 13:35:58 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-02-07 13:35:58 +0100
commit94d2bad65725e40239f3958f7c04890ac14281bf (patch)
treed1aa4ec150c4bdc31a91047fd107a4c08582daab
parent1d2eef218baeb7f5a5cea4308fc99328601cbf64 (diff)
downloadvdr-94d2bad65725e40239f3958f7c04890ac14281bf.tar.gz
vdr-94d2bad65725e40239f3958f7c04890ac14281bf.tar.bz2
The file name in the "Timers" menu now shows only the base name of the recording without the folder path
-rw-r--r--HISTORY3
-rw-r--r--menu.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 82b2ea34..0f240c80 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6355,3 +6355,6 @@ Video Disk Recorder Revision History
- Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg).
- Fixed adding new transponders in case there is only a single channel in the
channel list (reported by Halim Sahin).
+- The file name in the "Timers" menu now shows only the base name of the recording
+ without the folder path (if any). Otherwise with long folder paths the actual
+ recording name was not visible at all.
diff --git a/menu.c b/menu.c
index 9e97cb25..27009bae 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.15 2010/02/06 10:16:15 kls Exp $
+ * $Id: menu.c 2.16 2010/02/07 13:31:49 kls Exp $
*/
#include "menu.h"
@@ -1044,6 +1044,11 @@ void cMenuTimerItem::Set(void)
strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
day = buffer;
}
+ const char *File = strrchr(timer->File(), FOLDERDELIMCHAR);
+ if (File)
+ File++;
+ else
+ File = timer->File();
SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
!(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
timer->Channel()->Number(),
@@ -1054,7 +1059,7 @@ void cMenuTimerItem::Set(void)
timer->Start() % 100,
timer->Stop() / 100,
timer->Stop() % 100,
- timer->File()));
+ File));
}
// --- cMenuTimers -----------------------------------------------------------