Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'

[enigma2.git] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index b6e3b6a4299d734e7271604e206438cea0acd8fc..4cf050813cf27083b82fd4a916c961ee121b1d76 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;
+       bool m_rotor_mode;
        bool m_need_rotor_workaround;
        bool m_can_handle_dvbs2;
        char m_filename[128];
@@ -84,8 +85,12 @@ private:
        char m_sec_filename[128];
 #endif
        FRONTENDPARAMETERS parm;
-       int m_cur_orbpos; // only valid when this is a DVB-S tuner
-       int m_cur_pol; // only valid when this is a DVB-S tuner
+       union {
+               eDVBFrontendParametersSatellite sat;
+               eDVBFrontendParametersCable cab;
+               eDVBFrontendParametersTerrestrial ter;
+       } oparm;
+
        int m_state;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;
        ePtr<eSocketNotifier> m_sn;
@@ -105,7 +110,7 @@ private:
        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: