The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"

5 files changed, 10 insertions, 7 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 13f4e76e..b8d33c30 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1671,6 +1671,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem with cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in
  case only part of the buffer has been accepted by the device
  for reporting missing defines for large files in the 'newplugin' script
+ for pointing out that the full timer file name should be displayed if it ends with
+ "TITLE" or "EPISODE"
 
 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 c3ea0424..faeae423 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6404,3 +6404,5 @@ Video Disk Recorder Revision History
   deleted.
 - Added cChannel::IsSourceType() to test if a channel's source is of a given type.
 - Changed the polarization characters in cDvbSourceParam::GetOsdItem() to uppercase.
+- The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"
+  (pointed out by Udo Richter).
diff --git a/menu.c b/menu.c
index 63b763cd..2d983aea 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.19 2010/03/07 12:32:28 kls Exp $
+ * $Id: menu.c 2.20 2010/03/07 14:08:15 kls Exp $
  */
 
 #include "menu.h"
@@ -1053,7 +1053,7 @@ void cMenuTimerItem::Set(void)
      day = buffer;
      }
   const char *File = strrchr(timer->File(), FOLDERDELIMCHAR);
-  if (File)
+  if (File && strcmp(File + 1, TIMERMACRO_TITLE) && strcmp(File + 1, TIMERMACRO_EPISODE))
      File++;
   else
      File = timer->File();
diff --git a/recording.c b/recording.c
index ef78c40d..96dc95f9 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.22 2010/01/16 11:18:30 kls Exp $
+ * $Id: recording.c 2.23 2010/03/07 14:06:04 kls Exp $
  */
 
 #include "recording.h"
@@ -58,9 +58,6 @@
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
-#define TIMERMACRO_TITLE    "TITLE"
-#define TIMERMACRO_EPISODE  "EPISODE"
-
 #define MAX_SUBTITLE_LENGTH  40
 
 #define MAX_LINK_LEVEL  6
diff --git a/recording.h b/recording.h
index ac52ada2..939878f2 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.13 2010/01/16 11:16:20 kls Exp $
+ * $Id: recording.h 2.14 2010/03/07 14:06:15 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -19,6 +19,8 @@
 #include "tools.h"
 
 #define FOLDERDELIMCHAR '~'
+#define TIMERMACRO_TITLE    "TITLE"
+#define TIMERMACRO_EPISODE  "EPISODE"
 
 extern bool VfatFileSystem;
 extern int InstanceId;