plugin api change: Plugins() and main functions must receive (and possibly ignore...

[enigma2.git] / lib / gdi / gfbdc.cpp

diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index 08b4586a6077952059e419a793e556831c6e9037..bd259bd2abe585e548807e9155613565be548ebc 100644 (file)
--- a/lib/gdi/gfbdc.cpp
+++ b/lib/gdi/gfbdc.cpp
@@ -2,7 +2,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 
 #include <lib/gdi/accel.h>
 
@@ -34,20 +33,24 @@ gFBDC::gFBDC()
        
        surface.data_phys = 50*1024*1024; // FIXME
        
-       surface_back.type = 0;
-       surface_back.x = 720;
-       surface_back.y = 576;
-       surface_back.bpp = 32;
-       surface_back.bypp = 4;
-       surface_back.stride = fb->Stride();
-       surface_back.offset = surface.y;
-
        int fb_size = surface.stride * surface.y;
 
-       surface_back.data = fb->lfb + fb_size;
-       surface_back.data_phys = surface.data_phys + fb_size;
+       if (fb->getNumPages() > 1)
+       {
+               m_enable_double_buffering = 1;
+               surface_back.type = 0;
+               surface_back.x = 720;
+               surface_back.y = 576;
+               surface_back.bpp = 32;
+               surface_back.bypp = 4;
+               surface_back.stride = fb->Stride();
+               surface_back.offset = surface.y;
+               surface_back.data = fb->lfb + fb_size;
+               surface_back.data_phys = surface.data_phys + fb_size;
        
-       fb_size *= 2;
+               fb_size *= 2;
+       } else
+               m_enable_double_buffering = 0;
        
        eDebug("%dkB available for acceleration surfaces.", (fb->Available() - fb_size)/1024);
        
@@ -139,23 +142,33 @@ void gFBDC::exec(gOpcode *o)
        }
        case gOpcode::flip:
        {
-               gSurface s(surface);
-               surface = surface_back;
-               surface_back = s;
+               if (m_enable_double_buffering)
+               {
+                       gSurface s(surface);
+                       surface = surface_back;
+                       surface_back = s;
                
-               fb->setOffset(surface_back.offset);
+                       fb->setOffset(surface_back.offset);
+               }
                break;
        }
        case gOpcode::waitVSync:
        {
                static timeval l;
+               static int t;
                timeval now;
-               gettimeofday(&now, 0);
                
-               int diff = (now.tv_sec - l.tv_sec) * 1000 + (now.tv_usec - l.tv_usec) / 1000;
-               eDebug("%d ms latency (%d fps)", diff, 1000 / diff ?: 1);
+               if (t == 1000)
+               {
+                       gettimeofday(&now, 0);
+               
+                       int diff = (now.tv_sec - l.tv_sec) * 1000 + (now.tv_usec - l.tv_usec) / 1000;
+                       eDebug("%d ms latency (%d fps)", diff, t * 1000 / (diff ? diff : 1));
+                       l = now;
+                       t = 0;
+               }
                
-               l = now;
+               ++t;
                
                fb->waitVSync();
                break;
@@ -192,19 +205,13 @@ void gFBDC::setGamma(int g)
 
 void gFBDC::saveSettings()
 {
-       eConfig::getInstance()->setKey("/ezap/osd/alpha", alpha);
-       eConfig::getInstance()->setKey("/ezap/osd/gamma", gamma);
-       eConfig::getInstance()->setKey("/ezap/osd/brightness", brightness);
 }
 
 void gFBDC::reloadSettings()
 {
-       if (eConfig::getInstance()->getKey("/ezap/osd/alpha", alpha))
-               alpha=255;
-       if (eConfig::getInstance()->getKey("/ezap/osd/gamma", gamma))
-               gamma=128;
-       if (eConfig::getInstance()->getKey("/ezap/osd/brightness", brightness))
-               brightness=128;
+       alpha=255;
+       gamma=128;
+       brightness=128;
 
        calcRamp();
        setPalette();