From 93b0f1af144aaf16cd9c728ff7a472207500d469 Mon Sep 17 00:00:00 2001
From: Karl Dietz <dekarl@users.sourceforge.net>
Date: Sat, 25 Feb 2012 00:07:04 +0100
Subject: [PATCH 1/7] add toString to TeletextDescriptor

---
 mythtv/libs/libmythtv/mpeg/dvbdescriptors.h    |   12 ++++++++++++
 mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp |    2 ++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
index d290f9e..c253d65 100644
--- a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
+++ b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
@@ -1797,6 +1797,18 @@ class TeletextDescriptor : public MPEGDescriptor
     uint TeletextPageNum(uint i) const
         { return _data[6 + (i*5)]; }
     // }                           5.0
+    QString toString(void) const
+    {
+        QString str = QString("Teletext Descriptor: %1 pages\n")
+            .arg(StreamCount());
+        for (uint i=0; i<StreamCount(); i++)
+        {
+            if (i!=0) str.append("\n");
+            str.append(QString("      Type (%1) Magazine (%2) Page (%3) Language (%4)").arg(TeletextType(i))
+                .arg(TeletextMagazineNum(i), 0, 16).arg(TeletextPageNum(i), 2, 16, QChar('0')).arg(LanguageString(i)));
+        }
+        return str;
+    }
 };
 
 // DVB Bluebook A038 (Sept 2011) p 89
diff --git a/mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp b/mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp
index 4e4d36b..87c2c96 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp
+++ b/mythtv/libs/libmythtv/mpeg/mpegdescriptors.cpp
@@ -429,6 +429,8 @@ QString MPEGDescriptor::toString() const
         SET_STRING(CueIdentifierDescriptor);
     else if (DescriptorID::scte_revision_detection == DescriptorTag())
         SET_STRING(RevisionDetectionDescriptor);
+    else if (DescriptorID::teletext == DescriptorTag())
+        SET_STRING(TeletextDescriptor);
     /// POSSIBLY UNSAFE ! -- begin
     else if (PrivateDescriptorID::dvb_uk_channel_list == DescriptorTag())
         SET_STRING(UKChannelListDescriptor);
-- 
1.7.4.1