X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=b53ab02d4ba32d51c124e9bb3da840cd0e8423da;hp=3dc62e236d9bcc63da90a0444f1a44d58dc355be;hb=4fc2a70eeb86fa51b783b4a9c034b926db0013a3;hpb=f58346453b1ab66a35c5b12416aa609eb64ab0de

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 3dc62e2..b53ab02 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,50 +2,30 @@
 #define __dvbci_ui_h
 
 #include <string>
-#include <Python.h>
+#include <lib/mmi/mmi_ui.h>
+#include <lib/python/connections.h>
 
-#define MAX_SLOTS	2	
-
-class eDVBCI_UI
+class eDVBCI_UI: public eMMI_UI
 {
-	int state[MAX_SLOTS];
 	static eDVBCI_UI *instance;
-	std::string appName;
-	PyObject *mmiScreen;
-	int mmiTuplePos;
-	int mmiScreenReady;
 #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 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);
-
-	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