add ability to filter by tag. they must be created by hand right now.

[enigma2.git] / lib / service / servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index fe9398cbb86ca9b470576f99a34bb62f967a7f84..6c980c76f6b4ceba675265cd40c238903ac68be8 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -3,6 +3,7 @@
 #include <string>
 #include <lib/service/servicedvb.h>
 #include <lib/service/service.h>
+#include <lib/base/estring.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 #include <lib/base/nconfig.h> // access to python config
@@ -211,6 +212,8 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen
                return m_parser.m_description;
        case iServiceInformation::sServiceref:
                return m_parser.m_ref.toString();
+       case iServiceInformation::sTags:
+               return m_parser.m_tags;
        default:
                return "";
        }
@@ -1364,7 +1367,7 @@ std::string eDVBServicePlay::getRadioText(int x)
                switch(x)
                {
                        case 0:
-                               return m_radiotext_parser->getCurrentText();
+                               return convertLatin1UTF8(m_radiotext_parser->getCurrentText());
                }
        return "";
 }
@@ -2061,7 +2064,7 @@ PyObject *eDVBServicePlay::getSubtitleList()
        {
                PyObject *tuple = PyTuple_New(2);
                char desc[20];
-               sprintf(desc, "Page %x", *i);
+               sprintf(desc, "Page %d", *i);
                PyTuple_SetItem(tuple, 0, PyString_FromString(desc));
                PyTuple_SetItem(tuple, 1, PyInt_FromLong(*i));
                PyList_Append(l, tuple);