The Timers menu now displays the name of the remote VDR in front of the timer's file name, if this is a remote timer

2 files changed, 6 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index e22377f3..b662cf0f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
 - Bumped all version numbers to 2.2.0.
 - Official release.
 
-2015-09-05: Version 2.3.1
+2015-09-06: Version 2.3.1
 
 - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
   a cPixmap may have on the current OSD. The 'osddemo' example has been modified
@@ -8789,3 +8789,5 @@ Video Disk Recorder Revision History
   timer, which remains valid as long as this instance of VDR is running. This means
   that timers are no longer continuously numbered from 1 to N in LSTT. There may be
   gaps in the sequence, in case timers have been deleted.
+- The Timers menu now displays the name of the remote VDR in front of the timer's
+  file name, if this is a remote timer.
diff --git a/menu.c b/menu.c
index 9a35bb70..999144ec 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 4.3 2015/08/31 13:36:05 kls Exp $
+ * $Id: menu.c 4.4 2015/09/06 09:28:24 kls Exp $
  */
 
 #include "menu.h"
@@ -1152,7 +1152,7 @@ void cMenuTimerItem::Set(void)
      File++;
   else
      File = timer->File();
-  SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
+  SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
                     *name,
@@ -1162,6 +1162,7 @@ void cMenuTimerItem::Set(void)
                     timer->Start() % 100,
                     timer->Stop() / 100,
                     timer->Stop() % 100,
+                    timer->Remote() ? *cString::sprintf("@%s: ", timer->Remote()) : "",
                     File));
 }