fix for canAllocateChannel

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

diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index 11163df1f9304fa23347fd27e6aefcc2ed0a6704..191d6ca400727c147b6ec6528cb667116b5bd80b 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -43,6 +43,9 @@ int eDVBCI_UI::getState(int slot)
 void eDVBCI_UI::setState(int slot, int newState)
 {
        state[slot] = newState;
+       
+       if(newState == 2)               //enable TS
+               eDVBCIInterfaces::getInstance()->enableTS(slot, 1);
 }
 
 std::string eDVBCI_UI::getAppName(int slot)
@@ -81,9 +84,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, value);
+}
+
+int eDVBCI_UI::cancelEnq(int slot)
 {
-       eDVBCIInterfaces::getInstance()->answerEnq(slot, answer, value);
+       eDVBCIInterfaces::getInstance()->cancelEnq(slot);
 }
 
 int eDVBCI_UI::availableMMI(int slot)
@@ -91,6 +99,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 +131,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;
@@ -149,8 +181,16 @@ int eDVBCI_UI::mmiScreenFinish(int slot)
        return 0;
 }
 
+int eDVBCI_UI::getMMIState(int slot)
+{
+       return eDVBCIInterfaces::getInstance()->getMMIState(slot);
+}
+
 PyObject *eDVBCI_UI::getMMIScreen(int slot)
 {
+       if(mmiScreenReady != 1)
+               return Py_None;
+               
        mmiScreenReady = 0;
 
        return mmiScreen;