From: Ronny Strutz <ronny.strutz@multimedia-labs.de>
Date: Wed, 23 Nov 2005 02:15:37 +0000 (+0000)
Subject: add enq cancel
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=012fff37311d068b932abbdaa517f2c2d7a2836a

add enq cancel
---

diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index e30cd77..2bfabf1 100644
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -81,9 +81,14 @@ int eDVBCI_UI::answerMenu(int slot, int answer)
 	eDVBCIInterfaces::getInstance()->answerText(slot, answer);
 }
 
-int eDVBCI_UI::answerEnq(int slot, int answer, char *value)
+int eDVBCI_UI::answerEnq(int slot, char *value)
 {
-	eDVBCIInterfaces::getInstance()->answerEnq(slot, answer, value);
+	eDVBCIInterfaces::getInstance()->answerEnq(slot, value);
+}
+
+int eDVBCI_UI::cancelEnq(int slot)
+{
+	eDVBCIInterfaces::getInstance()->cancelEnq(slot);
 }
 
 int eDVBCI_UI::availableMMI(int slot)
@@ -91,6 +96,29 @@ int eDVBCI_UI::availableMMI(int slot)
 	return mmiScreenReady;
 }
 
+int eDVBCI_UI::mmiScreenEnq(int slot, int blind, int answerLen, char *text)
+{
+	mmiScreenReady = 0;
+
+	mmiScreen = PyList_New(2);
+
+  PyObject *tuple = PyTuple_New(1);
+ 	PyTuple_SetItem(tuple, 0, PyString_FromString("ENQ"));
+  PyList_SetItem(mmiScreen, 0, tuple);
+
+  tuple = PyTuple_New(4);
+	
+	PyTuple_SetItem(tuple, 0, PyString_FromString("PIN"));
+  PyTuple_SetItem(tuple, 1, PyInt_FromLong(answerLen));
+	PyTuple_SetItem(tuple, 2, PyString_FromString(text));
+  PyTuple_SetItem(tuple, 3, PyInt_FromLong(blind));
+  PyList_SetItem(mmiScreen, 1, tuple);
+
+	mmiScreenReady = 1;
+
+	return 0;
+}
+
 int eDVBCI_UI::mmiScreenBegin(int slot, int listmenu)
 {
 	printf("eDVBCI_UI::mmiScreenBegin\n");
@@ -100,10 +128,11 @@ int eDVBCI_UI::mmiScreenBegin(int slot, int listmenu)
 	mmiScreen = PyList_New(1);
 
   PyObject *tuple = PyTuple_New(1);
-	if(listmenu)
-	 	PyTuple_SetItem(tuple, 0, PyString_FromString("LIST"));
-	else	
+	if(listmenu == 0)				//menu
 	 	PyTuple_SetItem(tuple, 0, PyString_FromString("MENU"));
+	else 	//list
+	 	PyTuple_SetItem(tuple, 0, PyString_FromString("LIST"));
+		
   PyList_SetItem(mmiScreen, 0, tuple);
 	
 	mmiTuplePos = 1;
diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 38cf237..1974d65 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -30,13 +30,15 @@ public:
 	int getMMIState(int slot);
 
 	int answerMenu(int slot, int answer);
-	int answerEnq(int slot, int answer, char *val);
+	int answerEnq(int slot, char *val);
+	int cancelEnq(int slot);
 
 	PyObject *eDVBCI_UI::getMMIScreen(int slot);
 	PyObject *mmiScreen;
 	int mmiTuplePos;
 	int mmiScreenReady;
-	
+
+	int mmiScreenEnq(int slot, int blind, int answerLen, char *text);
 	int mmiScreenBegin(int slot, int listmenu);
 	int mmiScreenAddText(int slot, int type, char *value);
 	int mmiScreenFinish(int slot);