allow using other actionmap for InfobarSeekActions, only return MARKS in getNearestCu...

[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 3db215faac4886ca032ca823ca96ec53795b09e8..8018e8947a2b375d187bd9e399cb42a8de7f3da1 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -5,28 +5,33 @@
                 /* avoid warnigs :) */
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 200112L
-#include <Python.h>
+#include <lib/python/python.h>
+#include <lib/python/connections.h>
 
 #define MAX_SLOTS 4
 
+#ifndef SWIG
 struct slot_ui_data
 {
        std::string appName;
        int state;
-       PyObject *mmiScreen;
+       ePyObject mmiScreen;
        int mmiTuplePos;
        int mmiScreenReady;
 };
+#endif
 
 class eDVBCI_UI
 {
        static eDVBCI_UI *instance;
+#ifndef SWIG
        slot_ui_data slotdata[MAX_SLOTS];
-#ifdef SWIG
+#else
        eDVBCI_UI();
        ~eDVBCI_UI();
 #endif
 public:
+       PSignal1<void,int> ciStateChanged;
 #ifndef SWIG
        eDVBCI_UI();
        ~eDVBCI_UI();
@@ -43,17 +48,19 @@ public:
        int stopMMI(int slot);
        int availableMMI(int slot);
        int getMMIState(int slot);
-
        int answerMenu(int slot, int answer);
        int answerEnq(int slot, char *val);
        int cancelEnq(int slot);
 
        PyObject *getMMIScreen(int slot);
-
+#ifndef SWIG
+       int mmiScreenClose(int slot, int timeout);
        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);
+       void mmiSessionDestroyed(int slot);
+#endif
 };
 
 #endif