X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=65b0f95d0ff645d51aea64eb472e53f8259d025e;hp=8018e8947a2b375d187bd9e399cb42a8de7f3da1;hb=c4a55fbb1dbb22ccd43bfd92f1ec9df4f811310f;hpb=6dcb75c26bbfec04b381bb99d75404f9fe50635d

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 8018e89..65b0f95 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,65 +2,32 @@
 #define __dvbci_ui_h
 
 #include <string>
-                /* avoid warnigs :) */
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
-#include <lib/python/python.h>
+#include <lib/mmi/mmi_ui.h>
 #include <lib/python/connections.h>
 
-#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
+class eDVBCI_UI: public eMMI_UI
 {
 	static eDVBCI_UI *instance;
-#ifndef SWIG
-	slot_ui_data slotdata[MAX_SLOTS];
-#else
+#ifdef SWIG
 	eDVBCI_UI();
-	~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 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 *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
+	int setClockRate(int slot, int rate);
 };
 
 #endif