Changeset 55854 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 13, 2015 2:40:26 PM (10 years ago)

Author:

vboxsync

Message:

Main: saved screenshot API cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxSnapshotDetailsDlg.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• selector/graphics/details/UIGMachinePreview.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp

@@ -76 +76 @@
     QVector <BYTE> thumbData = machine.ReadSavedThumbnailToArray (0, KBitmapFormat_BGR0, width, height);
     mThumbnail = thumbData.size() != 0 ? QPixmap::fromImage (QImage (thumbData.data(), width, height, QImage::Format_RGB32).copy()) : QPixmap();
-    QVector <BYTE> screenData = machine.ReadSavedScreenshotPNGToArray (0, width, height);
+    QVector <BYTE> screenData = machine.ReadSavedScreenshotToArray (0, KBitmapFormat_PNG, width, height);
     mScreenshot = screenData.size() != 0 ? QPixmap::fromImage (QImage::fromData (screenData.data(), screenData.size(), "PNG")) : QPixmap();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -647 +647 @@
         /* If there is a preview image saved,
          * we will resize the framebuffer to the size of that image: */
-        ULONG uBuffer = 0, uWidth = 0, uHeight = 0;
-        machine().QuerySavedScreenshotPNGSize(0, uBuffer, uWidth, uHeight);
-        if (uBuffer > 0)
+        ULONG uWidth = 0, uHeight = 0;
+        QVector<KBitmapFormat> formats = machine().QuerySavedScreenshotInfo(0, uWidth, uHeight);
+        if (formats.size() > 0)
         {
             /* Init with the screenshot size: */
@@ -1030 +1030 @@
     /* Acquire the screen-data from the saved-state: */
     ULONG uWidth = 0, uHeight = 0;
-    const QVector<BYTE> screenData = machine().ReadSavedScreenshotPNGToArray(0, uWidth, uHeight);
+    const QVector<BYTE> screenData = machine().ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, uWidth, uHeight);
 
     /* Make sure there is saved-state screen-data: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -207 +207 @@
                     /* Use the screenshot from saved-state if possible: */
                     ULONG uGuestWidth = 0, uGuestHeight = 0;
-                    QVector<BYTE> screenData = m_machine.ReadSavedScreenshotPNGToArray(0, uGuestWidth, uGuestHeight);
+                    QVector<BYTE> screenData = m_machine.ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, uGuestWidth, uGuestHeight);
 
                     /* Make sure screen-data is OK: */