small fix

[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 b06eb45..b53ab02 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,65 +2,30 @@
 #define __dvbci_ui_h
 
 #include <string>
-                /* avoid warnigs :) */
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
-#include <Python.h>
+#include <lib/mmi/mmi_ui.h>
 #include <lib/python/connections.h>
 
-#define MAX_SLOTS 4
-
-#ifndef SWIG
-struct slot_ui_data
-{
-       std::string appName;
-       int state;
-       PyObject *mmiScreen;
-       int mmiTuplePos;
-       int mmiScreenReady;
-};
-#endif
-
-class eDVBCI_UI
+class eDVBCI_UI: public eMMI_UI
 {
        static eDVBCI_UI *instance;
-#ifndef SWIG
-       slot_ui_data slotdata[MAX_SLOTS];
-#else
+#ifdef SWIG
        eDVBCI_UI();
-       ~eDVBCI_UI();
 #endif
+       void stateChanged(int val) { ciStateChanged(val); }
 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 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 *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