X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/edc34b9bd8dcfec5c0509663a8e68e20b0066c78..f0443899863b438efb88a57db829ce3ffc87da76:/lib/dvb_ci/dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index 90d2f9f5..5ef7ebbc 100644
--- 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/base/estring.h>
 
 /*
 PyObject *list = PyList_New(len);
@@ -18,12 +19,12 @@ return list;
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {
 	slot = tslot;
-	slot->mmi_session = this;
+	slot->setMMIManager(this);
 }
 
 eDVBCIMMISession::~eDVBCIMMISession()
 {
-	slot->mmi_session = 0;
+	slot->setMMIManager(NULL);
 }
 
 int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@ -68,7 +69,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			
 			printf("enq-text: %s\n",str);
 			
-			eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, str);
+			eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, (char*)convertDVBUTF8(str).c_str());
 
 			break;		
 		}
@@ -110,7 +111,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				memcpy(str, ((char*)d), textlen);
 				str[textlen] = '\0';
 				
-				eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, str);
+				eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, (char*)convertDVBUTF8(str).c_str());
 					
 				while (textlen--)
 					printf("%c", *d++);
@@ -140,8 +141,9 @@ int eDVBCIMMISession::doAction()
 		unsigned char tag[]={0x9f, 0x88, 0x02};
 		unsigned char data[]={0x01, 0x01};
 		sendAPDU(tag, data, 2);
-		state=stateFakeOK;
-		return 1;
+		state=stateIdle;
+		//state=stateFakeOK;
+		//return 1;
 		break;
 	}
 	case stateFakeOK:
@@ -167,6 +169,8 @@ int eDVBCIMMISession::stopMMI()
 	unsigned char tag[]={0x9f, 0x88, 0x00};
 	unsigned char data[]={0x00};
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }
 
 int eDVBCIMMISession::answerText(int answer)
@@ -177,6 +181,8 @@ int eDVBCIMMISession::answerText(int answer)
 	unsigned char data[]={0x00};
 	data[0] = answer & 0xff;
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }
 
 int eDVBCIMMISession::cancelEnq()
@@ -186,5 +192,7 @@ int eDVBCIMMISession::cancelEnq()
 	unsigned char tag[]={0x9f, 0x88, 0x08};
 	unsigned char data[]={0x00};
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }