git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NimManager.py: another fix of satellite sort order .. now we sort from the westernmos...
[enigma2.git]
/
lib
/
dvb_ci
/
dvbci_ui.h
diff --git
a/lib/dvb_ci/dvbci_ui.h
b/lib/dvb_ci/dvbci_ui.h
index 640a3b9f51dc52b4c894ea2f51ce4cce88e518f2..65b0f95d0ff645d51aea64eb472e53f8259d025e 100644
(file)
--- a/
lib/dvb_ci/dvbci_ui.h
+++ b/
lib/dvb_ci/dvbci_ui.h
@@
-2,60
+2,32
@@
#define __dvbci_ui_h
#include <string>
#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>
#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;
{
static eDVBCI_UI *instance;
- slot_ui_data slotdata[MAX_SLOTS];
#ifdef SWIG
eDVBCI_UI();
#ifdef SWIG
eDVBCI_UI();
- ~eDVBCI_UI();
#endif
#endif
+ void stateChanged(int val) { ciStateChanged(val); }
public:
public:
- PSignal1<void,int> mmiAvail;
+ enum { rateNormal, rateHigh };
+ PSignal1<void,int> ciStateChanged;
#ifndef SWIG
eDVBCI_UI();
#ifndef SWIG
eDVBCI_UI();
- ~eDVBCI_UI();
#endif
static eDVBCI_UI *getInstance();
#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);
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 getMMIState(int slot);
-
int answerMenu(int slot, int answer);
int answerEnq(int slot, char *val);
int cancelEnq(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);
+ int setClockRate(int slot, int rate);
};
#endif
};
#endif