revert non working changes

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 220d3e87ad995c92dd0206211bb7c9afde218674..a1bc3d9ff2a5361eaf20991ef01bfb2e8c4f1846 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -91,7 +91,6 @@ void eDVBDiseqcCommand::setCommandString(const char *str)
                eDebug("invalid diseqc command string length (string is to long)");
                return;
        }
-       eDebugNoNewLine("send diseqc:");
        unsigned char val=0;
        for (int i=0; i < slen; ++i)
        {
@@ -108,13 +107,11 @@ void eDVBDiseqcCommand::setCommandString(const char *str)
                if ( i % 2 )
                {
                        val |= c;
-                       eDebugNoNewLine("%02x", val);
                        data[i/2] = val;
                }
                else
                        val = c << 4;
        }
-       eDebug("");
        len = slen/2;
 }
 
@@ -546,9 +543,6 @@ void eDVBFrontend::feEvent(int w)
 #endif
                {
                        state = stateLock;
-                       m_data[CSW] = m_data[NEW_CSW];
-                       m_data[UCSW] = m_data[NEW_UCSW];
-                       m_data[TONEBURST] = m_data[NEW_TONEBURST];
                } else
                {
                        if (m_tuning)

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index abc28d92bd22225e14e16186308eab7c5aa66984..3670ceb800ee37745e33f8cdfbbc4b62df56736c 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -58,9 +58,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
        eSecCommandList m_sec_sequence;
 
        enum {
-               NEW_CSW,              // new committed switch cmd
-               NEW_UCSW,             // new uncommitted switch cmd
-               NEW_TONEBURST,        // new toneburst switch cmd
                CSW,                  // state of the committed switch
                UCSW,                 // state of the uncommitted switch
                TONEBURST,            // current state of toneburst switch

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index c679b76260a98b41cd648d241cb493a2f2860cb1..7319a4be2701d058e1058ef1266cec3051f15676 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -774,9 +774,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        else
                                csw = band;
 
-                       frontend.setData(eDVBFrontend::NEW_CSW, csw);
-                       frontend.setData(eDVBFrontend::NEW_UCSW, ucsw);
-                       frontend.setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
+                       frontend.setData(eDVBFrontend::CSW, csw);
+                       frontend.setData(eDVBFrontend::UCSW, ucsw);
+                       frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
 
                        if (!linked && doSetVoltageToneFrontend)
                        {