3 files changed, 11 insertions, 5 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ed2dea47..00f79ee8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2117,6 +2117,8 @@ Martin Wache <M.Wache@gmx.net>
  for suggesting to speed up anti-aliased font rendering by caching the blend indexes
  for extending the option "Setup/Miscellaneous/Show channel names with source" to
  "type" or "full"
+ for making the "Channels" menu indicate whether a channel is encrypted or a radio
+ channel
 
 Matthias Lenk <matthias.lenk@amd.com>
  for reporting an out-of-bounds memory access with audio language ids
diff --git a/HISTORY b/HISTORY
index df089ecb..462cb247 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9119,3 +9119,5 @@ Video Disk Recorder Revision History
 - The option "Setup/Miscellaneous/Show channel names with source" can now be set to
   "type" or "full" to show either the type or the full name of the source (thanks to
   Martin Wache).
+- The "Channels" menu now indicates whether a channel is encrypted ('X') or a radio
+  channel ('R') (thanks to Martin Wache).
diff --git a/menu.c b/menu.c
index 1cb389e0..fbacb384 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.35 2017/06/10 15:13:00 kls Exp $
+ * $Id: menu.c 4.36 2017/06/10 15:53:20 kls Exp $
  */
 
 #include "menu.h"
@@ -327,13 +327,15 @@ void cMenuChannelItem::Set(void)
 {
   cString buffer;
   if (!channel->GroupSep()) {
+     const char *X = *channel->Caids() >= CA_ENCRYPTED_MIN ? "X" : "";
+     const char *R = !channel->Vpid() && (*channel->Apids() || *channel->Dpids()) ? "R" : "";
      if (sortMode == csmProvider)
-        buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+        buffer = cString::sprintf("%d\t%s%s\t%s - %s", channel->Number(), X, R, channel->Provider(), channel->Name());
      else
-        buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name());
+        buffer = cString::sprintf("%d\t%s%s\t%s", channel->Number(), X, R, channel->Name());
      }
   else
-     buffer = cString::sprintf("---\t%s ----------------------------------------------------------------", channel->Name());
+     buffer = cString::sprintf("\t\t%s ----------------------------------------------------------------", channel->Name());
   SetText(buffer);
 }
 
@@ -369,7 +371,7 @@ public:
   };
 
 cMenuChannels::cMenuChannels(void)
-:cOsdMenu(tr("Channels"), CHNUMWIDTH)
+:cOsdMenu(tr("Channels"), CHNUMWIDTH, 3)
 {
   SetMenuCategory(mcChannel);
   number = 0;