git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
By Anders Holst:
[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 24139de28f3d8e62a718b25f0a7f70b8ee336c0c..af613c432042ef8d67b3b27bfb4082056a21e7c2 100644
(file)
--- a/
lib/dvb_ci/dvbci_ui.cpp
+++ b/
lib/dvb_ci/dvbci_ui.cpp
@@
-5,64
+5,70
@@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <string>
-
#include <lib/base/init.h>
#include <lib/base/init_num.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
#include <lib/base/eerror.h>
#include <lib/base/eerror.h>
+#include <lib/base/estring.h>
+
+#define MAX_SLOTS 4
-eDVBCI_UI *eDVBCI_UI::instance
= 0
;
+eDVBCI_UI *eDVBCI_UI::instance;
eDVBCI_UI::eDVBCI_UI()
eDVBCI_UI::eDVBCI_UI()
+ :eMMI_UI(MAX_SLOTS)
{
{
- int i;
-
- for(i=0;i<MAX_SLOTS;i++)
- state[i] = 0; //no module
-
ASSERT(!instance);
instance = this;
}
ASSERT(!instance);
instance = this;
}
-eDVBCI_UI
::~eDVBCI_UI
()
+eDVBCI_UI
*eDVBCI_UI::getInstance
()
{
{
+ return instance;
}
}
-
eDVBCI_UI *eDVBCI_UI::getInstance(
)
+
void eDVBCI_UI::setInit(int slot
)
{
{
- return instance;
+ eDVBCIInterfaces::getInstance()->initialize(slot);
+}
+
+void eDVBCI_UI::setReset(int slot)
+{
+ eDVBCIInterfaces::getInstance()->reset(slot);
}
}
-int eDVBCI_UI::
getState
(int slot)
+int eDVBCI_UI::
startMMI
(int slot)
{
{
- return state[slot]; //exploit me ;)
+ eDVBCIInterfaces::getInstance()->startMMI(slot);
+ return 0;
}
}
-
void eDVBCI_UI::setState(int slot, int newState
)
+
int eDVBCI_UI::stopMMI(int slot
)
{
{
- state[slot] = newState;
+ eDVBCIInterfaces::getInstance()->stopMMI(slot);
+ return 0;
}
}
-
std::string eDVBCI_UI::getAppName(int slot
)
+
int eDVBCI_UI::answerMenu(int slot, int answer
)
{
{
- return appName;
+ eDVBCIInterfaces::getInstance()->answerText(slot, answer);
+ return 0;
}
}
-
void eDVBCI_UI::setAppName(int slot, const char *nam
e)
+
int eDVBCI_UI::answerEnq(int slot, char *valu
e)
{
{
-
printf("set name to -%c-\n", nam
e);
-
appName = name
;
+
eDVBCIInterfaces::getInstance()->answerEnq(slot, valu
e);
+
return 0
;
}
}
-
void eDVBCI_UI::setReset
(int slot)
+
int eDVBCI_UI::cancelEnq
(int slot)
{
{
- eDVBCIInterfaces::getInstance()->reset(slot);
+ eDVBCIInterfaces::getInstance()->cancelEnq(slot);
+ return 0;
}
}
-int eDVBCI_UI::
startMMI
(int slot)
+int eDVBCI_UI::
getMMIState
(int slot)
{
{
-
eDVBCIInterfaces::getInstance()->startMMI
(slot);
+
return eDVBCIInterfaces::getInstance()->getMMIState
(slot);
}
//FIXME: correct "run/startlevel"
}
//FIXME: correct "run/startlevel"