Merge commit 'dm/experimental' into vuplus_experimental

diff --combined lib/dvb/frontend.cpp
index 6b09d3d,a1ba8fe..cf36eb0
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@@ -490,11 -490,6 +490,11 @@@ void eDVBFrontend::reopenFrontend(
        openFrontend();
  }
  
 +#ifdef BUILD_VUPLUS /* ikseong */
 +int frontend0_fd;
 +int frontend1_fd;
 +#endif
 +
  int eDVBFrontend::openFrontend()
  {
        if (m_state != stateClosed)
@@@ -519,15 -514,6 +519,15 @@@
                                eWarning("failed! (%s) %m", m_filename);
                                return -1;
                        }
 +#ifdef BUILD_VUPLUS /* ikseong */
 +                      else
 +                      {                               
 +                              if (m_dvbid==0)
 +                                      frontend0_fd = m_fd;
 +                              else if (m_dvbid==1)
 +                                      frontend1_fd = m_fd;
 +                      }
 +#endif
                }
        }
        else
@@@ -753,10 -739,6 +753,10 @@@ void eDVBFrontend::timeout(
        m_tuning = 0;
        if (m_state == stateTuning)
        {
 +#ifdef BUILD_VUPLUS /* ikseong  */
 +              eDVBFrontend *sec_fe = this;
 +              sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
 +#endif
                m_state = stateFailed;
                m_stateChanged(this);
        }
@@@ -1094,6 -1076,7 +1094,7 @@@ static void fillDictWithSatelliteData(e
        case FEC_AUTO: tmp = eDVBFrontendParametersSatellite::FEC_Auto; break;
        default: eDebug("got unsupported FEC from frontend! report as FEC_AUTO!\n");
        }
+       PutToDict(dict, "fec_inner", tmp);
  
        switch (p[0].u.data)
        {