X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_ui.h;h=b53ab02d4ba32d51c124e9bb3da840cd0e8423da;hp=640a3b9f51dc52b4c894ea2f51ce4cce88e518f2;hb=e6fc6c4c345bee12b57a76392abf95c92b29aa3b;hpb=663df8b68d461fe8137367977afa7fefc63f1838

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 640a3b9..b53ab02 100644
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -2,60 +2,30 @@
 #define __dvbci_ui_h
 
 #include <string>
-                /* avoid warnigs :) */
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
-#include <Python.h>
+#include <lib/mmi/mmi_ui.h>
 #include <lib/python/connections.h>
 
-#define MAX_SLOTS 4
-
-struct slot_ui_data
-{
-	std::string appName;
-	int state;
-	PyObject *mmiScreen;
-	int mmiTuplePos;
-	int mmiScreenReady;
-};
-
-class eDVBCI_UI
+class eDVBCI_UI: public eMMI_UI
 {
 	static eDVBCI_UI *instance;
-	slot_ui_data slotdata[MAX_SLOTS];
 #ifdef SWIG
 	eDVBCI_UI();
-	~eDVBCI_UI();
 #endif
+	void stateChanged(int val) { ciStateChanged(val); }
 public:
-	PSignal1<void,int> mmiAvail;
+	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);
-
-	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