X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/663df8b68d461fe8137367977afa7fefc63f1838..76fe69e113637a200aafdc2d6dede772706e4b09:/lib/dvb_ci/dvbci_ui.h

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 640a3b9f..8018e894 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -5,30 +5,33 @@
                 /* 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 4
 
+#ifndef SWIG
 struct slot_ui_data
 {
 	std::string appName;
 	int state;
-	PyObject *mmiScreen;
+	ePyObject mmiScreen;
 	int mmiTuplePos;
 	int mmiScreenReady;
 };
+#endif
 
 class eDVBCI_UI
 {
 	static eDVBCI_UI *instance;
+#ifndef SWIG
 	slot_ui_data slotdata[MAX_SLOTS];
-#ifdef SWIG
+#else
 	eDVBCI_UI();
 	~eDVBCI_UI();
 #endif
 public:
-	PSignal1<void,int> mmiAvail;
+	PSignal1<void,int> ciStateChanged;
 #ifndef SWIG
 	eDVBCI_UI();
 	~eDVBCI_UI();
@@ -45,17 +48,19 @@ public:
 	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