use convertDVBUTF8 for mmi texts

[enigma2.git] / lib / dvb_ci / dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index 90d2f9f50acc83f5e73f76ed4d3abe1b5ab965e9..75ca63d850df62efc32ca36e9ad14ff124e0ff72 100644 (file)
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -2,6 +2,7 @@
 
 #include <lib/dvb_ci/dvbci_mmi.h>
 #include <lib/dvb_ci/dvbci_ui.h>
 
 #include <lib/dvb_ci/dvbci_mmi.h>
 #include <lib/dvb_ci/dvbci_ui.h>

+#include <lib/base/estring.h>

 
 /*
 PyObject *list = PyList_New(len);
 
 /*
 PyObject *list = PyList_New(len);


@@ -68,7 +69,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
                        
                        printf("enq-text: %s\n",str);
                        
                        
                        printf("enq-text: %s\n",str);
                        

-                       eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, str);
+                       eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, convertDVBUTF8(str).c_str());

 
                        break;          
                }
 
                        break;          
                }


@@ -110,7 +111,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
                                memcpy(str, ((char*)d), textlen);
                                str[textlen] = '\0';
                                
                                memcpy(str, ((char*)d), textlen);
                                str[textlen] = '\0';
                                

-                               eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, str);
+                               eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, convertDVBUTF8(str).c_str());

                                        
                                while (textlen--)
                                        printf("%c", *d++);
                                        
                                while (textlen--)
                                        printf("%c", *d++);


@@ -167,6 +168,8 @@ int eDVBCIMMISession::stopMMI()
        unsigned char tag[]={0x9f, 0x88, 0x00};
        unsigned char data[]={0x00};
        sendAPDU(tag, data, 1);
        unsigned char tag[]={0x9f, 0x88, 0x00};
        unsigned char data[]={0x00};
        sendAPDU(tag, data, 1);

+       
+       return 0;

 }
 
 int eDVBCIMMISession::answerText(int answer)
 }
 
 int eDVBCIMMISession::answerText(int answer)


@@ -177,6 +180,8 @@ int eDVBCIMMISession::answerText(int answer)
        unsigned char data[]={0x00};
        data[0] = answer & 0xff;
        sendAPDU(tag, data, 1);
        unsigned char data[]={0x00};
        data[0] = answer & 0xff;
        sendAPDU(tag, data, 1);

+       
+       return 0;

 }
 
 int eDVBCIMMISession::cancelEnq()
 }
 
 int eDVBCIMMISession::cancelEnq()


@@ -186,5 +191,7 @@ int eDVBCIMMISession::cancelEnq()
        unsigned char tag[]={0x9f, 0x88, 0x08};
        unsigned char data[]={0x00};
        sendAPDU(tag, data, 1);
        unsigned char tag[]={0x9f, 0x88, 0x08};
        unsigned char data[]={0x00};
        sendAPDU(tag, data, 1);

+       
+       return 0;

 }
 
 }