X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c8e724bf4828077d60b2d969fc210c0c5b722506..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/dvb_ci/dvbci_ui.cpp diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp index d36ea6ec..23911453 100644 --- a/lib/dvb_ci/dvbci_ui.cpp +++ b/lib/dvb_ci/dvbci_ui.cpp @@ -9,26 +9,30 @@ #include #include -#include #include -eDVBCI_UI *eDVBCI_UI::instance = 0; +eDVBCI_UI *eDVBCI_UI::instance; eDVBCI_UI::eDVBCI_UI() - :mmiScreen(NULL) - ,mmiTuplePos(0) - ,mmiScreenReady(0) { ASSERT(!instance); instance = this; - for(int i=0;igetSlotState(slot) == eDVBCISlot::stateInvalid) + eDVBCIInterfaces::getInstance()->reset(slot); + return slotdata[slot].state; + } + return 0; } void eDVBCI_UI::setState(int slot, int newState) { - state[slot] = newState; - - if(newState == 2) //enable TS - eDVBCIInterfaces::getInstance()->enableTS(slot, 1); + if (slot < MAX_SLOTS) + slotdata[slot].state = newState; } std::string eDVBCI_UI::getAppName(int slot) { - return appName; + if (slot < MAX_SLOTS) + return slotdata[slot].appName; + return ""; } void eDVBCI_UI::setAppName(int slot, const char *name) { - //printf("set name to -%c-\n", name); - appName = name; + if (slot < MAX_SLOTS) + slotdata[slot].appName = name; } void eDVBCI_UI::setInit(int slot) { - eDVBCIInterfaces::getInstance()->sendCAPMT(slot); + eDVBCIInterfaces::getInstance()->initialize(slot); } void eDVBCI_UI::setReset(int slot) @@ -82,12 +92,6 @@ int eDVBCI_UI::stopMMI(int slot) return 0; } -int eDVBCI_UI::initialize(int slot) -{ - eDVBCIInterfaces::getInstance()->initialize(slot); - return 0; -} - int eDVBCI_UI::answerMenu(int slot, int answer) { eDVBCIInterfaces::getInstance()->answerText(slot, answer); @@ -108,20 +112,27 @@ int eDVBCI_UI::cancelEnq(int slot) int eDVBCI_UI::availableMMI(int slot) { - return mmiScreenReady; + if (slot < MAX_SLOTS) + return slotdata[slot].mmiScreenReady; + return false; } int eDVBCI_UI::mmiScreenEnq(int slot, int blind, int answerLen, char *text) { - mmiScreenReady = 0; + if (slot >= MAX_SLOTS) + return 0; + + slot_ui_data &data = slotdata[slot]; + + data.mmiScreenReady = 0; - if(mmiScreen) - Py_DECREF(mmiScreen); - mmiScreen = PyList_New(2); + if (data.mmiScreen) + Py_DECREF(data.mmiScreen); + data.mmiScreen = PyList_New(2); PyObject *tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, PyString_FromString("ENQ")); - PyList_SET_ITEM(mmiScreen, 0, tuple); + PyList_SET_ITEM(data.mmiScreen, 0, tuple); tuple = PyTuple_New(4); PyTuple_SET_ITEM(tuple, 0, PyString_FromString("PIN")); @@ -129,47 +140,58 @@ int eDVBCI_UI::mmiScreenEnq(int slot, int blind, int answerLen, char *text) PyTuple_SET_ITEM(tuple, 2, PyString_FromString(text)); PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(blind)); - PyList_SET_ITEM(mmiScreen, 1, tuple); + PyList_SET_ITEM(data.mmiScreen, 1, tuple); - mmiScreenReady = 1; + data.mmiScreenReady = 1; return 0; } int eDVBCI_UI::mmiScreenBegin(int slot, int listmenu) { + if (slot >= MAX_SLOTS) + return 0; + printf("eDVBCI_UI::mmiScreenBegin\n"); - mmiScreenReady = 0; + slot_ui_data &data = slotdata[slot]; + + data.mmiScreenReady = 0; + + if (data.mmiScreen) + Py_DECREF(data.mmiScreen); - if(mmiScreen) - Py_DECREF(mmiScreen); - mmiScreen = PyList_New(1); + data.mmiScreen = PyList_New(1); PyObject *tuple = PyTuple_New(1); - if(listmenu == 0) //menu + if (listmenu == 0) //menu PyTuple_SET_ITEM(tuple, 0, PyString_FromString("MENU")); else //list PyTuple_SET_ITEM(tuple, 0, PyString_FromString("LIST")); - PyList_SET_ITEM(mmiScreen, 0, tuple); + PyList_SET_ITEM(data.mmiScreen, 0, tuple); - mmiTuplePos = 1; + data.mmiTuplePos = 1; return 0; } int eDVBCI_UI::mmiScreenAddText(int slot, int type, char *value) { - eDebug("eDVBCI_UI::mmiScreenAddText(%s)",value); + if (slot >= MAX_SLOTS) + return 0; + + eDebug("eDVBCI_UI::mmiScreenAddText(%s)",value ? value : ""); + + slot_ui_data &data = slotdata[slot]; PyObject *tuple = PyTuple_New(3); - if(type == 0) //title + if (type == 0) //title PyTuple_SET_ITEM(tuple, 0, PyString_FromString("TITLE")); - else if(type == 1) //subtitle + else if (type == 1) //subtitle PyTuple_SET_ITEM(tuple, 0, PyString_FromString("SUBTITLE")); - else if(type == 2) //bottom + else if (type == 2) //bottom PyTuple_SET_ITEM(tuple, 0, PyString_FromString("BOTTOM")); else PyTuple_SET_ITEM(tuple, 0, PyString_FromString("TEXT")); @@ -178,12 +200,12 @@ int eDVBCI_UI::mmiScreenAddText(int slot, int type, char *value) PyTuple_SET_ITEM(tuple, 1, PyString_FromString(value)); - if(type > 2) + if (type > 2) PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(type-2)); else PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(-1)); - PyList_Append(mmiScreen, tuple); + PyList_Append(data.mmiScreen, tuple); Py_DECREF(tuple); return 0; @@ -191,10 +213,11 @@ int eDVBCI_UI::mmiScreenAddText(int slot, int type, char *value) int eDVBCI_UI::mmiScreenFinish(int slot) { - printf("eDVBCI_UI::mmiScreenFinish\n"); - - mmiScreenReady = 1; - + if (slot < MAX_SLOTS) + { + printf("eDVBCI_UI::mmiScreenFinish\n"); + slotdata[slot].mmiScreenReady = 1; + } return 0; } @@ -205,11 +228,15 @@ int eDVBCI_UI::getMMIState(int slot) PyObject *eDVBCI_UI::getMMIScreen(int slot) { - if(mmiScreenReady) + if (slot < MAX_SLOTS) { - mmiScreenReady = 0; - Py_INCREF(mmiScreen); - return mmiScreen; + slot_ui_data &data = slotdata[slot]; + if (data.mmiScreenReady) + { + data.mmiScreenReady = 0; + Py_INCREF(data.mmiScreen); + return data.mmiScreen; + } } Py_INCREF(Py_None); return Py_None;