X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=3db215faac4886ca032ca823ca96ec53795b09e8;hp=680b7897c070b138160c939e10706e55fcd1cf8e;hb=d43e4676bd757d1de73b8dd669154ffd42192b10;hpb=7ad3257f2a4ddd3f51aa2175f997db7d0b75f6b0

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 680b789..3db215f 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,30 +2,58 @@
 #define __dvbci_ui_h
 
 #include <string>
+                /* avoid warnigs :) */
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
+#include <Python.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:
+#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 answerMMI(int slot, int answer, char *val);
+	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);
+
+	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);
 };
 
 #endif