X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=b7922bb51a2e8ba372d973e9d097dcda459d98d0;hp=1974d6539fe4b513955ca25111a3b7228b66e559;hb=24c472e37de8db4007cdd4c5d67d3fd4e914f0b1;hpb=012fff37311d068b932abbdaa517f2c2d7a2836a

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 1974d65..b7922bb 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,46 +2,60 @@
 #define __dvbci_ui_h
 
 #include <string>
+                /* avoid warnigs :) */
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
 #include <Python.h>
+#include <lib/python/connections.h>
 
-#define MAX_SLOTS	2	
+#define MAX_SLOTS 4
+
+struct slot_ui_data
+{
+	std::string appName;
+	int state;
+	PyObject *mmiScreen;
+	int mmiTuplePos;
+	int mmiScreenReady;
+};
 
 class eDVBCI_UI
 {
-	int state[MAX_SLOTS];
 	static eDVBCI_UI *instance;
-	std::string appName;
-protected:
+	slot_ui_data slotdata[MAX_SLOTS];
+#ifdef SWIG
+	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 *mmiScreen;
-	int mmiTuplePos;
-	int mmiScreenReady;
-
+	PyObject *getMMIScreen(int slot);
+	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