the CI now is useable for tuner A or tuner B (auto switched)

[vuplus_dvbapp] / lib / dvb_ci / dvbci_ui.h

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 7d45bfa..3dc62e2 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -11,11 +11,18 @@ class eDVBCI_UI
        int state[MAX_SLOTS];
        static eDVBCI_UI *instance;
        std::string appName;
-protected:
+       PyObject *mmiScreen;
+       int mmiTuplePos;
+       int mmiScreenReady;
+#ifdef SWIG
+       eDVBCI_UI();
+       ~eDVBCI_UI();
+#endif
 public:
+#ifndef SWIG
        eDVBCI_UI();
        ~eDVBCI_UI();
-
+#endif
        static eDVBCI_UI *getInstance();
        
        int getState(int slot);
@@ -27,15 +34,15 @@ public:
        int startMMI(int slot);
        int stopMMI(int slot);
        int availableMMI(int slot);
+       int getMMIState(int slot);
 
        int answerMenu(int slot, int answer);
-       int answerEnq(int slot, int answer, char *val);
+       int answerEnq(int slot, char *val);
+       int cancelEnq(int slot);
 
        PyObject *eDVBCI_UI::getMMIScreen(int slot);
-       PyObject *mmiScreen;
-       int mmiTuplePos;
-       int mmiScreenReady;
-       
+
+       int mmiScreenEnq(int slot, int blind, int answerLen, char *text);
        int mmiScreenBegin(int slot, int listmenu);
        int mmiScreenAddText(int slot, int type, char *value);
        int mmiScreenFinish(int slot);