git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
[enigma2.git]
/
lib
/
dvb
/
frontend.h
diff --git
a/lib/dvb/frontend.h
b/lib/dvb/frontend.h
index 8133488641d57e96a97e5153aa907227a2764b2c..bc31755c6070afdaa73c863d66db5900244acae0 100644
(file)
--- a/
lib/dvb/frontend.h
+++ b/
lib/dvb/frontend.h
@@
-75,6
+75,7
@@
private:
int m_dvbid;
int m_slotid;
int m_fd;
int m_dvbid;
int m_slotid;
int m_fd;
+ bool m_rotor_mode;
bool m_need_rotor_workaround;
bool m_can_handle_dvbs2;
char m_filename[128];
bool m_need_rotor_workaround;
bool m_can_handle_dvbs2;
char m_filename[128];
@@
-84,6
+85,12
@@
private:
char m_sec_filename[128];
#endif
FRONTENDPARAMETERS parm;
char m_sec_filename[128];
#endif
FRONTENDPARAMETERS parm;
+ union {
+ eDVBFrontendParametersSatellite sat;
+ eDVBFrontendParametersCable cab;
+ eDVBFrontendParametersTerrestrial ter;
+ } oparm;
+
int m_state;
ePtr<iDVBSatelliteEquipmentControl> m_sec;
ePtr<eSocketNotifier> m_sn;
int m_state;
ePtr<iDVBSatelliteEquipmentControl> m_sec;
ePtr<eSocketNotifier> m_sn;
@@
-103,7
+110,7
@@
private:
void feEvent(int);
void timeout();
void tuneLoop(); // called by m_tuneTimer
void feEvent(int);
void timeout();
void tuneLoop(); // called by m_tuneTimer
- void setFrontend();
+ void setFrontend(
bool recvEvents=true
);
bool setSecSequencePos(int steps);
static int PriorityOrder;
public:
bool setSecSequencePos(int steps);
static int PriorityOrder;
public:
@@
-139,6
+146,7
@@
public:
static void setTypePriorityOrder(int val) { PriorityOrder = val; }
static int getTypePriorityOrder() { return PriorityOrder; }
static void setTypePriorityOrder(int val) { PriorityOrder = val; }
static int getTypePriorityOrder() { return PriorityOrder; }
+ void reopenFrontend();
int openFrontend();
int closeFrontend(bool force=false);
const char *getDescription() const { return m_description; }
int openFrontend();
int closeFrontend(bool force=false);
const char *getDescription() const { return m_description; }