X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=65b0f95d0ff645d51aea64eb472e53f8259d025e;hb=a582f7d2a1ff336a1edc59a7d9d7a0707e0c8741;hp=38cf2379b9b865d860adc71f50a8739c250a137d;hpb=a95480c7a50e4ecf72cee72693ba6b2c6654f510;p=vuplus_dvbapp

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 38cf237..65b0f95 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,44 +2,32 @@
 #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;
-protected:
+#ifdef SWIG
+	eDVBCI_UI();
+#endif
+	void stateChanged(int val) { ciStateChanged(val); }
 public:
+	enum { rateNormal, rateHigh };
+	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, int answer, char *val);
-
-	PyObject *eDVBCI_UI::getMMIScreen(int slot);
-	PyObject *mmiScreen;
-	int mmiTuplePos;
-	int mmiScreenReady;
-	
-	int mmiScreenBegin(int slot, int listmenu);
-	int mmiScreenAddText(int slot, int type, char *value);
-	int mmiScreenFinish(int slot);
+	int answerEnq(int slot, char *val);
+	int cancelEnq(int slot);
+	int setClockRate(int slot, int rate);
 };
 
 #endif