Merge branch 'experimental' into vuplus_sum_exper

Conflicts:

	lib/dvb/epgcache.cpp
	lib/dvb/frontend.cpp
	lib/dvb/idvb.h
	lib/gdi/lcd.cpp
	lib/python/Components/Converter/TemplatedMultiContent.py
	lib/python/Components/NimManager.py
	lib/python/Components/Renderer/Listbox.py
	lib/python/Screens/Satconfig.py
	lib/python/Screens/ServiceScan.py
	lib/python/Screens/Subtitles.py
	po/nl.po

diff --cc RecordTimer.py
Simple merge

diff --cc configure.ac
Simple merge

diff --cc data/menu.xml
Simple merge

diff --cc data/skin.xml
Simple merge

diff --cc lib/dvb/dvb.cpp
index 4acd385,40d4418..059d417
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 db58a6f,fc2d7ec..6b09d3d
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp

diff --cc lib/gdi/font.cpp
Simple merge

diff --cc lib/gdi/glcddc.cpp
index 2a2973a,a593cfa..096705e
mode 100755,100644..100755
--- 1/lib/gdi/glcddc.cpp
--- 2/lib/gdi/glcddc.cpp
+++ b/lib/gdi/glcddc.cpp

diff --cc lib/gdi/lcd.cpp
index c8560ac,a953ef0..9cb657c
mode 100755,100644..100755
--- 1/lib/gdi/lcd.cpp
--- 2/lib/gdi/lcd.cpp
+++ b/lib/gdi/lcd.cpp
@@@ -141,45 -176,52 +176,55 @@@ eDBoxLCD *eDBoxLCD::getInstance(
  
  void eDBoxLCD::update()
  {
-       if (!is_oled || is_oled == 2)
 +#ifdef BUILD_VUPLUS /* ikseong  */
 +      return ;
 +#endif
+       if (lcdfd >= 0)
        {
-               unsigned char raw[132*8];
-               int x, y, yy;
-               for (y=0; y<8; y++)
+               if (!is_oled || is_oled == 2)
                {
-                       for (x=0; x<132; x++)
+                       unsigned char raw[132*8];
+                       int x, y, yy;
+                       for (y=0; y<8; y++)
                        {
-                               int pix=0;
-                               for (yy=0; yy<8; yy++)
+                               for (x=0; x<132; x++)
                                {
-                                       pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+                                       int pix=0;
+                                       for (yy=0; yy<8; yy++)
+                                       {
+                                               pix|=(_buffer[(y*8+yy)*132+x]>=108)<<yy;
+                                       }
+                                       raw[y*132+x]=(pix^inverted);
                                }
-                               raw[y*132+x]=(pix^inverted);
                        }
-               }
-               if (lcdfd >= 0)
                        write(lcdfd, raw, 132*8);
-       } else
-       {
-               unsigned char raw[64*64];
-               int x, y;
-               memset(raw, 0, 64*64);
-               for (y=0; y<64; y++)
+               }
+               else if (is_oled == 3) {
+                       FILE *f = fopen("/tmp/bla", "w+");
+                       if (f) {
+                               fwrite(_buffer, _stride * res.height(), 1, f);
+                               fclose(f);
+                       }
+                       write(lcdfd, _buffer, _stride * res.height());
+               }
+               else
                {
-                       int pix=0;
-                       for (x=0; x<128 / 2; x++)
+                       unsigned char raw[64*64];
+                       int x, y;
+                       memset(raw, 0, 64*64);
+                       for (y=0; y<64; y++)
                        {
-                               pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
-                               if (inverted)
-                                       pix = 0xFF - pix;
-                               raw[y*64+x] = pix;
+                               int pix=0;
+                               for (x=0; x<128 / 2; x++)
+                               {
+                                       pix = (_buffer[y*132 + x * 2 + 2] & 0xF0) |(_buffer[y*132 + x * 2 + 1 + 2] >> 4);
+                                       if (inverted)
+                                               pix = 0xFF - pix;
+                                       raw[y*64+x] = pix;
+                               }
                        }
-               }
-               if (lcdfd >= 0)
                        write(lcdfd, raw, 64*64);
+               }
        }
  }
  

diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Simple merge

diff --cc lib/python/Screens/InfoBarGenerics.py
index 4be0cbc,6fa8911..6619bbc
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/NetworkSetup.py
index 08aa1c8,2e33ac3..b9be442
--- 1/lib/python/Screens/NetworkSetup.py
--- 2/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@@ -811,13 -822,13 +822,13 @@@ class AdapterSetupConfiguration(Screen
  
        def loadDescription(self):
                if self["menulist"].getCurrent()[1] == 'edit':
 -                      self["description"].setText(_("Edit the network configuration of your Dreambox.\n" ) + self.oktext )
 +                      self["description"].setText(_("Edit the network configuration of your STB.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'test':
 -                      self["description"].setText(_("Test the network configuration of your Dreambox.\n" ) + self.oktext )
 +                      self["description"].setText(_("Test the network configuration of your STB.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'dns':
 -                      self["description"].setText(_("Edit the Nameserver configuration of your Dreambox.\n" ) + self.oktext )
 +                      self["description"].setText(_("Edit the Nameserver configuration of your STB.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'scanwlan':
-                       self["description"].setText(_("Scan your network for wireless Access Points and connect to them using your selected wireless device.\n" ) + self.oktext )
+                       self["description"].setText(_("Scan your network for wireless access points and connect to them using your selected wireless device.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'wlanstatus':
                        self["description"].setText(_("Shows the state of your wireless LAN connection.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'lanrestart':

diff --cc lib/python/Screens/ServiceScan.py
index 1fd32e0,df427f9..e64c3b8
--- 1/lib/python/Screens/ServiceScan.py
--- 2/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@@ -36,22 -35,8 +36,9 @@@ class ServiceScan(Screen)
                        self.close()
        
        def cancel(self):
 +              self.resetTimeout()
                self.close()
                
-       def setTimeout(self):
-               try:
-                       self.oldtimeoutvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
-                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
-               except:
-                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"                
-               
-       def resetTimeout(self):
-               try:
-                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(self.oldtimeoutvalue)
-               except:
-                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
-       
        def __init__(self, session, scanList):
                Screen.__init__(self, session)
                
@@@ -83,4 -66,4 +68,4 @@@
  
        def createSummary(self):
                print "ServiceScanCreateSummary"
--              return ServiceScanSummary
++              return ServiceScanSummary

diff --cc lib/python/enigma_python.i
index f3e67d9,19fb925..0bddce1
mode 100755,100644..100755
--- 1/lib/python/enigma_python.i
--- 2/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i