X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=8018e8947a2b375d187bd9e399cb42a8de7f3da1;hp=3b606d603e103c037fe2373e111dbfae6c426778;hb=afbed85c669a78bb89a38e7bbbda55865a7bf885;hpb=85f2616ef78700cf2639992abaf1011ecaa897bd

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 3b606d6..8018e89 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,50 +2,65 @@
 #define __dvbci_ui_h
 
 #include <string>
-#include <Python.h>
+                /* avoid warnigs :) */
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
+#include <lib/python/python.h>
+#include <lib/python/connections.h>
 
-#define MAX_SLOTS	2	
+#define MAX_SLOTS 4
+
+#ifndef SWIG
+struct slot_ui_data
+{
+	std::string appName;
+	int state;
+	ePyObject mmiScreen;
+	int mmiTuplePos;
+	int mmiScreenReady;
+};
+#endif
 
 class eDVBCI_UI
 {
-	int state[MAX_SLOTS];
 	static eDVBCI_UI *instance;
-	std::string appName;
-#ifdef SWIG
+#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 *mmiScreen;
-	int mmiTuplePos;
-	int mmiScreenReady;
-
+	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