Changeset 3761 in vbox for trunk/src/VBox/Main/include

Timestamp:

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

Author:

vboxsync

Message:

Main/Frontends: Cleaned up IFramebuffer interface.

Location:

trunk/src/VBox/Main/include

Files:

• DisplayImpl.h (modified) (3 diffs)
• FramebufferImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -166 +166 @@
     STDMETHOD(COMGETTER(Width)) (ULONG *width);
     STDMETHOD(COMGETTER(Height)) (ULONG *height);
-    STDMETHOD(COMGETTER(ColorDepth)) (ULONG *colorDepth);
+    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *bitsPerPixel);
 
     // IDisplay methods
@@ -175 +175 @@
     STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer *aFramebuffer);
     STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
-    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth, ULONG display);
+    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG bitsPerPixel, ULONG display);
     STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
     STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
@@ -226 +226 @@
     /* arguments of the last handleDisplayResize() call */
     void *mLastAddress;
-    uint32_t mLastLineSize;
-    uint32_t mLastColorDepth;
+    uint32_t mLastBytesPerLine;
+    uint32_t mLastBitsPerPixel;
     int mLastWidth;
     int mLastHeight;

trunk/src/VBox/Main/include/FramebufferImpl.h

@@ -51 +51 @@
     STDMETHOD(COMGETTER(Width)) (ULONG *width);
     STDMETHOD(COMGETTER(Height)) (ULONG *height);
-    STDMETHOD(COMGETTER(ColorDepth)) (ULONG *colorDepth);
-    STDMETHOD(COMGETTER(LineSize)) (ULONG *lineSize);
-    STDMETHOD(COMGETTER(PixelFormat)) (FramebufferPixelFormat_T *pixelFormat);
+    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *bitsPerPixel);
+    STDMETHOD(COMGETTER(BytesPerLine)) (ULONG *bytesPerLine);
+    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *pixelFormat);
+    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *usesGuestVRAM);
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
@@ -63 +64 @@
                             ULONG w, ULONG h,
                             BOOL *finished);
-    STDMETHOD(RequestResize)(ULONG uScreenId, FramebufferPixelFormat_T pixelFormat, BYTE *vram,
-                             ULONG lineSize, ULONG w, ULONG h,
+    STDMETHOD(RequestResize)(ULONG uScreenId, ULONG pixelFormat, BYTE *vram,
+                             ULONG bpp, ULONG bpl, ULONG w, ULONG h,
                              BOOL *finished);
     STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T operation,
@@ -80 +81 @@
     int mWidth;
     int mHeight;
-    int mDepth;
-    int mLineSize;
+    int mBitsPerPixel;
+    int mBytesPerLine;
     uint8_t *mData;
     RTSEMMUTEX mMutex;