From 8d508dec84fc8b9c513d4d44a7ff74e2e3d6eae9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 18 Jul 2004 11:17:32 +0200
Subject: [PATCH] Now storing the name of the service provider (aka "bouquet")
 in the channel name

---
 HISTORY |  3 +++
 sdt.c   | 11 ++++++++++-
 vdr.5   |  7 ++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 0efa9432..5f7a344e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2961,3 +2961,6 @@ Video Disk Recorder Revision History
   "linked services" (let's see if this is useful). Thanks to Mike parker for
   helping to test this. Also used some input from the 'autopid' patch by Andreas
   Schultz).
+- Now storing the name of the service provider (aka "bouquet") in the channel
+  name, separated by a semicolon (see man vdr(5) for details). Explicit usage
+  of the various parts of the channel name is yet to come.
diff --git a/sdt.c b/sdt.c
index a4a62b4d..efcad3d5 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.10 2004/07/18 10:58:01 kls Exp $
+ * $Id: sdt.c 1.11 2004/07/18 11:14:42 kls Exp $
  */
 
 #include "sdt.h"
@@ -69,6 +69,15 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            strcpy(ps, NameBuf);
                            pn = ShortNameBuf;
                            }
+                        if (*pn) {
+                           char ProviderNameBuf[1024];
+                           sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
+                           if (*ProviderNameBuf) {
+                              char *p = pn + strlen(pn);
+                              *p++ = ';';
+                              strcpy(p, ProviderNameBuf);
+                              }
+                           }
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels >= 1)
diff --git a/vdr.5 b/vdr.5
index a224a667..4cc522b6 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.27 2004/05/15 09:24:57 kls Exp $
+.\" $Id: vdr.5 1.28 2004/07/18 11:06:54 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -64,6 +64,11 @@ for this channel, it preceeds the full name and is delimited by a comma,
 as in
 
 \fBRTL,RTL Television:...\fR
+
+If present, the name of the service provider or "bouquet" is appended
+to the channel name, separated by a semicolon, as in
+
+\fBRTL,RTL Television;RTL World:...\fR
 .TP
 .B Frequency
 The transponder frequency (as an integer). For DVB-S this value is in MHz. For DVB-C