Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'

[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 72a9daae278730d6eab6cd0ebc48c8a93d89c6d5..b1bfdc25acc9ecb30c40536c1af19fcac289d998 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -5,79 +5,75 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <string>
-
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.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()
+       :eMMI_UI(MAX_SLOTS)
 {
-       int i;
-       
-       for(i=0;i<MAX_SLOTS;i++)
-               state[i] = 0;           //no module
-
        ASSERT(!instance);
        instance = this;
 }
 
-eDVBCI_UI::~eDVBCI_UI()
-{
-}
-
 eDVBCI_UI *eDVBCI_UI::getInstance()
 {
        return instance;
 }
 
-int eDVBCI_UI::getState(int slot)
+void eDVBCI_UI::setInit(int slot)
 {
-       return state[slot];     //exploit me ;)
+       eDVBCIInterfaces::getInstance()->initialize(slot);
 }
 
-void eDVBCI_UI::setState(int slot, int newState)
+void eDVBCI_UI::setReset(int slot)
 {
-       state[slot] = newState;
+       eDVBCIInterfaces::getInstance()->reset(slot);
 }
 
-std::string eDVBCI_UI::getAppName(int slot)
+int eDVBCI_UI::startMMI(int slot)
 {
-       return appName;
+       eDVBCIInterfaces::getInstance()->startMMI(slot);
+       return 0;
 }
 
-void eDVBCI_UI::setAppName(int slot, const char *name)
+int eDVBCI_UI::stopMMI(int slot)
 {
-       printf("set name to -%c-\n", name);
-       appName = name;
+       eDVBCIInterfaces::getInstance()->stopMMI(slot);
+       return 0;
 }
 
-void eDVBCI_UI::setReset(int slot)
+int eDVBCI_UI::answerMenu(int slot, int answer)
 {
-       eDVBCIInterfaces::getInstance()->reset(slot);
+       eDVBCIInterfaces::getInstance()->answerText(slot, answer);
+       return 0;
 }
 
-int eDVBCI_UI::startMMI(int slot)
+int eDVBCI_UI::answerEnq(int slot, char *value)
 {
-       eDVBCIInterfaces::getInstance()->startMMI(slot);
+       eDVBCIInterfaces::getInstance()->answerEnq(slot, value);
+       return 0;
 }
 
-int eDVBCI_UI::stopMMI(int slot)
+int eDVBCI_UI::cancelEnq(int slot)
 {
-       eDVBCIInterfaces::getInstance()->stopMMI(slot);
+       eDVBCIInterfaces::getInstance()->cancelEnq(slot);
+       return 0;
 }
 
-int eDVBCI_UI::initialize(int slot)
+int eDVBCI_UI::getMMIState(int slot)
 {
-       eDVBCIInterfaces::getInstance()->initialize(slot);
+       return eDVBCIInterfaces::getInstance()->getMMIState(slot);
 }
 
-int eDVBCI_UI::answerMMI(int slot, int answer, char *value=0)
+int eDVBCI_UI::setClockRate(int slot, int rate)
 {
-       eDVBCIInterfaces::getInstance()->answerMMI(slot, answer, value);
+       return eDVBCIInterfaces::getInstance()->setCIClockRate(slot, rate);
 }
 
 //FIXME: correct "run/startlevel"