Changeset 3761 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Jul 22, 2007 10:43:14 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23084

Message:

Main/Frontends: Cleaned up IFramebuffer interface.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.cpp (modified) (4 diffs)
• DisplayImpl.h (modified) (2 diffs)
• Framebuffer.h (modified) (1 diff)
• SDLFramebuffer.cpp (modified) (1 diff)
• SDLFramebuffer.h (modified) (1 diff)
• VBoxBFE.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -308 +308 @@
  *
  * @returns COM status code
- * @param colorDepth Address of result variable.
- */
-uint32_t VMDisplay::getColorDepth()
+ * @param bitsPerPixel Address of result variable.
+ */
+uint32_t VMDisplay::getBitsPerPixel()
 {
     Assert(mpDrv);
@@ -409 +409 @@
         mFramebuffer->getAddress ((uintptr_t *)&mpDrv->Connector.pu8Data);
         mFramebuffer->getLineSize ((ULONG*)&mpDrv->Connector.cbScanline);
-        mFramebuffer->getColorDepth ((ULONG*)&mpDrv->Connector.cBits);
+        mFramebuffer->getBitsPerPixel ((ULONG*)&mpDrv->Connector.cBits);
         mFramebuffer->getWidth ((ULONG*)&mpDrv->Connector.cx);
         mFramebuffer->getHeight ((ULONG*)&mpDrv->Connector.cy);
@@ -426 +426 @@
     {
         mFramebuffer->getAddress ((uintptr_t *)&mpDrv->Connector.pu8Data);
-        mFramebuffer->getColorDepth ((ULONG*)&mpDrv->Connector.cBits);
+        mFramebuffer->getBitsPerPixel ((ULONG*)&mpDrv->Connector.cBits);
         mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort,
                                           !!(mpDrv->Connector.pu8Data != (uint8_t*)~0UL));
@@ -824 +824 @@
 }
 
-void VMDisplay::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay)
+void VMDisplay::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel, ULONG aDisplay)
 {
     PPDMIVMMDEVPORT pVMMDevPort = gVMMDev->getVMMDevPort ();
 
     if (pVMMDevPort)
-        pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, aWidth, aHeight, aColorDepth, aDisplay);
+        pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, aWidth, aHeight, aBitsPerPixel, aDisplay);
 }
 

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -47 +47 @@
 
     void updatePointerShape(bool fVisible, bool fAlpha, uint32_t xHot, uint32_t yHot, uint32_t width, uint32_t height, void *pShape);
-    void SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay);
+    void SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel, ULONG aDisplay);
 
     static const PDMDRVREG  DrvReg;
@@ -53 +53 @@
     uint32_t getWidth();
     uint32_t getHeight();
-    uint32_t getColorDepth();
+    uint32_t getBitsPerPixel();
 
     STDMETHODIMP RegisterExternalFramebuffer(Framebuffer *Framebuffer);

trunk/src/VBox/Frontends/VBoxBFE/Framebuffer.h

@@ -42 +42 @@
     virtual HRESULT Unlock() = 0;
     virtual HRESULT getAddress(uintptr_t *address) = 0;
-    virtual HRESULT getColorDepth(ULONG *colorDepth) = 0;
+    virtual HRESULT getBitsPerPixel(ULONG *bitsPerPixel) = 0;
     virtual HRESULT getLineSize(ULONG *lineSize) = 0;
     virtual HRESULT NotifyUpdate(ULONG x, ULONG y,

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

@@ -185 +185 @@
  *
  * @returns COM status code
- * @param   colorDepth Address of result variable
- */
-HRESULT SDLFramebuffer::getColorDepth(ULONG *colorDepth)
-{
-    LogFlow(("SDLFramebuffer::GetColorDepth\n"));
-
-    if (!colorDepth)
+ * @param   bitsPerPixel Address of result variable
+ */
+HRESULT SDLFramebuffer::getBitsPerPixel(ULONG *bitsPerPixel)
+{
+    LogFlow(("SDLFramebuffer::GetBitsPerPixel\n"));
+
+    if (!bitsPerPixel)
         return E_INVALIDARG;
-    *colorDepth = (ULONG)(mScreen ? mScreen->format->BitsPerPixel : 0);
+    *bitsPerPixel = (ULONG)(mScreen ? mScreen->format->BitsPerPixel : 0);
     return S_OK;
 }

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h

@@ -48 +48 @@
     virtual HRESULT Unlock();
     virtual HRESULT getAddress(uintptr_t *address);
-    virtual HRESULT getColorDepth(ULONG *colorDepth);
+    virtual HRESULT getBitsPerPixel(ULONG *bitsPerPixel);
     virtual HRESULT getLineSize(ULONG *lineSize);
     virtual HRESULT NotifyUpdate(ULONG x, ULONG y,

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -729 +729 @@
     if (g_u32VRamSizeMB * _1M >=   gFramebuffer->getHostXres() 
                           * gFramebuffer->getHostYres()
-                          * (gDisplay->getColorDepth() / 8))
+                          * (gDisplay->getBitsPerPixel() / 8))
         gDisplay->SetVideoModeHint(gFramebuffer->getHostXres(), gFramebuffer->getHostYres(), 0, 0);
 #endif