Merge commit 'dm/experimental' into test_0413

diff --cc data/setup.xml
Simple merge

diff --cc lib/dvb/dvb.cpp
index 61924ad,0b1bdc2..af46823
mode 100755,100644..100755
--- 1/lib/dvb/dvb.cpp
--- 2/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp

diff --cc lib/dvb/frontend.cpp
index 47e1ab5,5718896..7777bf6
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@@ -519,76 -514,63 +519,72 @@@ int eDVBFrontend::openFrontend(
                                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
-               eWarning("frontend %d already opened", m_dvbid);
-       if (m_type == -1)
-       {
-               if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
+               else
+                       eWarning("frontend %d already opened", m_dvbid);
+               if (m_type == -1)
                {
-                       eWarning("ioctl FE_GET_INFO failed");
-                       ::close(m_fd);
-                       m_fd = -1;
-                       return -1;
-               }
+                       if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
+                       {
+                               eWarning("ioctl FE_GET_INFO failed");
+                               ::close(m_fd);
+                               m_fd = -1;
+                               return -1;
+                       }
  
-               switch (fe_info.type)
-               {
-               case FE_QPSK:
-                       m_type = iDVBFrontend::feSatellite;
-                       break;
-               case FE_QAM:
-                       m_type = iDVBFrontend::feCable;
-                       break;
-               case FE_OFDM:
-                       m_type = iDVBFrontend::feTerrestrial;
-                       break;
-               default:
-                       eWarning("unknown frontend type.");
-                       ::close(m_fd);
-                       m_fd = -1;
-                       return -1;
+                       switch (fe_info.type)
+                       {
+                       case FE_QPSK:
+                               m_type = iDVBFrontend::feSatellite;
+                               break;
+                       case FE_QAM:
+                               m_type = iDVBFrontend::feCable;
+                               break;
+                       case FE_OFDM:
+                               m_type = iDVBFrontend::feTerrestrial;
+                               break;
+                       default:
+                               eWarning("unknown frontend type.");
+                               ::close(m_fd);
+                               m_fd = -1;
+                               return -1;
+                       }
+                       if (m_simulate_fe)
+                               m_simulate_fe->m_type = m_type;
+                       eDebugNoSimulate("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);
                }
-               eDebugNoSimulate("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);
-       }
  
  #if HAVE_DVB_API_VERSION < 3
-       if (m_type == iDVBFrontend::feSatellite)
-       {
-                       if (m_secfd < 0)
-                       {
-                               if (!m_simulate)
+               if (m_type == iDVBFrontend::feSatellite)
+               {
+                               if (m_secfd < 0)
                                {
-                                       m_secfd = ::open(m_sec_filename, O_RDWR);
-                                       if (m_secfd < 0)
+                                       if (!m_simulate)
                                        {
-                                               eWarning("failed! (%s) %m", m_sec_filename);
-                                               ::close(m_fd);
-                                               m_fd=-1;
-                                               return -1;
+                                               m_secfd = ::open(m_sec_filename, O_RDWR);
+                                               if (m_secfd < 0)
+                                               {
+                                                       eWarning("failed! (%s) %m", m_sec_filename);
+                                                       ::close(m_fd);
+                                                       m_fd=-1;
+                                                       return -1;
+                                               }
                                        }
                                }
-                       }
-                       else
-                               eWarning("sec %d already opened", m_dvbid);
-       }
+                               else
+                                       eWarning("sec %d already opened", m_dvbid);
+               }
  #endif
  
-       setTone(iDVBFrontend::toneOff);
-       setVoltage(iDVBFrontend::voltageOff);
- 
-       if (!m_simulate)
-       {
                m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Read, false);
                CONNECT(m_sn->activated, eDVBFrontend::feEvent);
        }

diff --cc lib/python/Components/Scanner.py
Simple merge

diff --cc lib/python/Screens/DefaultWizard.py
index a2742ab,54e241d..fd2e54f
mode 100755,100644..100755
--- 1/lib/python/Screens/DefaultWizard.py
--- 2/lib/python/Screens/DefaultWizard.py
+++ b/lib/python/Screens/DefaultWizard.py

diff --cc lib/python/Screens/InfoBarGenerics.py
index d55e661,93a4788..07fbac8
mode 100755,100644..100755
--- 1/lib/python/Screens/InfoBarGenerics.py
--- 2/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py

diff --cc lib/python/Screens/TaskView.py
index fbbbed7,5dd744f..dafc263
mode 100755,100644..100755
--- 1/lib/python/Screens/TaskView.py
--- 2/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py