add PyObject refcount debugging code

[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 abf6173..5237e2f 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -5,50 +5,62 @@
                 /* 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      2       
+#define MAX_SLOTS 4
 
-class eDVBCI_UI
+#ifndef SWIG
+struct slot_ui_data
 {
-       int state[MAX_SLOTS];
-       static eDVBCI_UI *instance;
        std::string appName;
+       int state;
        PyObject *mmiScreen;
        int mmiTuplePos;
        int mmiScreenReady;
-#ifdef SWIG
+};
+#endif
+
+class eDVBCI_UI
+{
+       static eDVBCI_UI *instance;
+#ifndef SWIG
+       slot_ui_data slotdata[MAX_SLOTS];
+#else
        eDVBCI_UI();
        ~eDVBCI_UI();
 #endif
 public:
+       PSignal1<void,int> ciStateChanged;
 #ifndef SWIG
        eDVBCI_UI();
        ~eDVBCI_UI();
 #endif
        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 initialize(int slot);
        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, char *val);
        int cancelEnq(int slot);
 
-       PyObject *eDVBCI_UI::getMMIScreen(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