git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update catalan language
[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 56ca25fcc84594f53f991fe5ea9a1cdda86889de..1ff0c3266f2d0f503674e85a6d368ac2d4a0060e 100644
(file)
--- a/
lib/dvb_ci/dvbci_ui.cpp
+++ b/
lib/dvb_ci/dvbci_ui.cpp
@@
-22,7
+22,7
@@
eDVBCI_UI::eDVBCI_UI()
slotdata[i].mmiScreen=NULL;
slotdata[i].mmiScreenReady=0;
slotdata[i].mmiTuplePos=0;
slotdata[i].mmiScreen=NULL;
slotdata[i].mmiScreenReady=0;
slotdata[i].mmiTuplePos=0;
- slotdata[i].state=
0
;
+ slotdata[i].state=
-1
;
}
}
}
}
@@
-43,11
+43,7
@@
eDVBCI_UI *eDVBCI_UI::getInstance()
int eDVBCI_UI::getState(int slot)
{
if (slot < MAX_SLOTS)
int eDVBCI_UI::getState(int slot)
{
if (slot < MAX_SLOTS)
- {
- if (eDVBCIInterfaces::getInstance()->getSlotState(slot) == eDVBCISlot::stateInvalid)
- eDVBCIInterfaces::getInstance()->reset(slot);
return slotdata[slot].state;
return slotdata[slot].state;
- }
return 0;
}
return 0;
}
@@
-179,7
+175,7
@@
int eDVBCI_UI::mmiScreenBegin(int slot, int listmenu)
if (slot >= MAX_SLOTS)
return 0;
if (slot >= MAX_SLOTS)
return 0;
-
printf("eDVBCI_UI::mmiScreenBegin\
n");
+
eDebug("eDVBCI_UI::mmiScreenBegi
n");
slot_ui_data &data = slotdata[slot];
slot_ui_data &data = slotdata[slot];
@@
-242,7
+238,7
@@
int eDVBCI_UI::mmiScreenFinish(int slot)
{
if (slot < MAX_SLOTS)
{
{
if (slot < MAX_SLOTS)
{
-
printf("eDVBCI_UI::mmiScreenFinish\n
");
+
eDebug("eDVBCI_UI::mmiScreenFinish
");
slotdata[slot].mmiScreenReady = 1;
/*emit*/ ciStateChanged(slot);
}
slotdata[slot].mmiScreenReady = 1;
/*emit*/ ciStateChanged(slot);
}