Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'

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

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 5e22e728c2e7c646f0ce9bbe6259acbdda2df808..65b0f95d0ff645d51aea64eb472e53f8259d025e 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,25 +2,32 @@
 #define __dvbci_ui_h
 
 #include <string>
 #define __dvbci_ui_h
 
 #include <string>

+#include <lib/mmi/mmi_ui.h>
+#include <lib/python/connections.h>

 
 

-#define MAX_SLOTS      2       
-
-class eDVBCI_UI
+class eDVBCI_UI: public eMMI_UI

 {
 {

-       int state[MAX_SLOTS];

        static eDVBCI_UI *instance;
        static eDVBCI_UI *instance;

-       std::string appName;
-protected:
+#ifdef SWIG
+       eDVBCI_UI();
+#endif
+       void stateChanged(int val) { ciStateChanged(val); }

 public:
 public:

+       enum { rateNormal, rateHigh };
+       PSignal1<void,int> ciStateChanged;
+#ifndef SWIG

        eDVBCI_UI();
        eDVBCI_UI();

-       ~eDVBCI_UI();
-
+#endif

        static eDVBCI_UI *getInstance();
        static eDVBCI_UI *getInstance();

-       
-       int getState(int slot);
-       void setState(int slot, int state);
-       std::string getAppName(int slot);
-       void setAppName(int slot, const char *name);
+       void setInit(int slot);
+       void setReset(int slot);
+       int startMMI(int slot);
+       int stopMMI(int slot);
+       int getMMIState(int slot);
+       int answerMenu(int slot, int answer);
+       int answerEnq(int slot, char *val);
+       int cancelEnq(int slot);
+       int setClockRate(int slot, int rate);

 };
 
 #endif
 };
 
 #endif