use physical device from framebuffer instead of hardcoded value, blit after compositing

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

diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index 75efe891af5e82b4f9f0856c29d2636170d3cb36..80dd2479b52b92d97a983b5ddf38c4de6dd8b326 100644 (file)
--- a/lib/gdi/gfbdc.cpp
+++ b/lib/gdi/gfbdc.cpp
@@ -131,9 +131,13 @@ void gFBDC::exec(gOpcode *o)
 
                ++t;
 
 
                ++t;
 

+               fb->blit();

                fb->waitVSync();
                break;
        }
                fb->waitVSync();
                break;
        }

+       case gOpcode::flush:
+               fb->blit();
+               break;

        default:
                gDC::exec(o);
                break;
        default:
                gDC::exec(o);
                break;


@@ -185,7 +189,7 @@ void gFBDC::setResolution(int xres, int yres)
        surface.data = fb->lfb;
        surface.offset = 0;
 
        surface.data = fb->lfb;
        surface.offset = 0;
 

-       surface.data_phys = 50*1024*1024; // FIXME
+       surface.data_phys = fb->getPhysAddr();

 
        int fb_size = surface.stride * surface.y;
 
 
        int fb_size = surface.stride * surface.y;
 


@@ -239,6 +243,6 @@ void gFBDC::reloadSettings()
 }
 
 // eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 }
 
 // eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");

-#ifndef SDLDC
+#ifndef WITH_SDL

 eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 #endif
 eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 #endif