Index: /trunk/doc/manual/en_US/SDKRef.xml
===================================================================
--- /trunk/doc/manual/en_US/SDKRef.xml (revision 55853)
+++ /trunk/doc/manual/en_US/SDKRef.xml (revision 55854)
@@ -4194,4 +4194,20 @@
bitmapFormat. As a consequence of this,
IMachine::ReadSavedThumbnailPNGToArray() has been removed.
+
+
+
+ IMachine::QuerySavedScreenshotPNGSize() has been renamed to
+ IMachine::QuerySavedScreenshotInfo() which also returns
+ an array of available screenshot formats.
+
+
+
+ IMachine::ReadSavedScreenshotPNGToArray() has been renamed to
+ IMachine::ReadSavedScreenshotToArray() which has a new parameter
+ bitmapFormat.
+
+
+
+ IMachine::QuerySavedThumbnailSize() has been removed.
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp (revision 55853)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp (revision 55854)
@@ -76,5 +76,5 @@
QVector 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 screenData = machine.ReadSavedScreenshotPNGToArray (0, width, height);
+ QVector screenData = machine.ReadSavedScreenshotToArray (0, KBitmapFormat_PNG, width, height);
mScreenshot = screenData.size() != 0 ? QPixmap::fromImage (QImage::fromData (screenData.data(), screenData.size(), "PNG")) : QPixmap();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 55853)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 55854)
@@ -647,7 +647,7 @@
/* 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 formats = machine().QuerySavedScreenshotInfo(0, uWidth, uHeight);
+ if (formats.size() > 0)
{
/* Init with the screenshot size: */
@@ -1030,5 +1030,5 @@
/* Acquire the screen-data from the saved-state: */
ULONG uWidth = 0, uHeight = 0;
- const QVector screenData = machine().ReadSavedScreenshotPNGToArray(0, uWidth, uHeight);
+ const QVector screenData = machine().ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, uWidth, uHeight);
/* Make sure there is saved-state screen-data: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp (revision 55853)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp (revision 55854)
@@ -207,5 +207,5 @@
/* Use the screenshot from saved-state if possible: */
ULONG uGuestWidth = 0, uGuestHeight = 0;
- QVector screenData = m_machine.ReadSavedScreenshotPNGToArray(0, uGuestWidth, uGuestHeight);
+ QVector screenData = m_machine.ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, uGuestWidth, uGuestHeight);
/* Make sure screen-data is OK: */
Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55853)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55854)
@@ -4170,5 +4170,5 @@
-
-
- Returns size in bytes and dimensions in pixels of a saved thumbnail bitmap from saved state.
+
+
+ Thumbnail is retrieved to an array of bytes in the requested format.
+ Saved guest screen to read from.
+
+
+
+
+ The requested format.
+
+
+
+
+ Bitmap width.
+
+
+
+
+ Bitmap height.
+
+
+
+
+ Array with resulting bitmap data.
+
+
+
+
+
+
+ Returns available formats and size of the screenshot from saved state.
+
+
+
Saved guest screen to query info from.
-
-
- Size of buffer required to store the bitmap.
-
-
- Bitmap width.
+ Image width.
- Bitmap height.
-
-
-
-
-
-
- Thumbnail is retrieved to an array of bytes in the requested format.
+ Image height.
+
+
+
+
+ Formats supported by readSavedScreenshotToArray.
+
+
+
+
+
+
+ Screenshot in requested format is retrieved to an array of bytes.
@@ -7079,67 +7110,15 @@
- Bitmap width.
+ Image width.
- Bitmap height.
-
-
-
-
- Array with resulting bitmap data.
-
-
-
-
-
-
- Returns size in bytes and dimensions of a saved PNG image of screenshot from saved state.
-
-
-
- Saved guest screen to query info from.
-
-
-
-
- Size of buffer required to store the PNG binary data.
-
-
-
-
- Image width.
-
-
-
-
Image height.
-
-
-
-
- Screenshot in PNG format is retrieved to an array of bytes.
-
-
-
- Saved guest screen to read from.
-
-
-
-
- Image width.
-
-
-
-
- Image height.
-
-
- Array with resulting PNG data.
+ Array with resulting image data.
Index: /trunk/src/VBox/Main/include/MachineImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MachineImpl.h (revision 55853)
+++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 55854)
@@ -1157,8 +1157,4 @@
ULONG *aHeight,
BOOL *aEnabled);
- HRESULT querySavedThumbnailSize(ULONG aScreenId,
- ULONG *aSize,
- ULONG *aWidth,
- ULONG *aHeight);
HRESULT readSavedThumbnailToArray(ULONG aScreenId,
BitmapFormat_T aBitmapFormat,
@@ -1166,12 +1162,14 @@
ULONG *aHeight,
std::vector &aData);
- HRESULT querySavedScreenshotPNGSize(ULONG aScreenId,
- ULONG *aSize,
- ULONG *aWidth,
- ULONG *aHeight);
- HRESULT readSavedScreenshotPNGToArray(ULONG aScreenId,
- ULONG *aWidth,
- ULONG *aHeight,
- std::vector &aData);
+ HRESULT querySavedScreenshotInfo(ULONG aScreenId,
+ ULONG *aWidth,
+ ULONG *aHeight,
+ std::vector &aBitmapFormats);
+ HRESULT readSavedScreenshotToArray(ULONG aScreenId,
+ BitmapFormat_T aBitmapFormat,
+ ULONG *aWidth,
+ ULONG *aHeight,
+ std::vector &aData);
+
HRESULT hotPlugCPU(ULONG aCpu);
HRESULT hotUnplugCPU(ULONG aCpu);
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 55853)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 55854)
@@ -6370,32 +6370,4 @@
}
-HRESULT Machine::querySavedThumbnailSize(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
-{
- if (aScreenId != 0)
- return E_NOTIMPL;
-
- AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
- uint8_t *pu8Data = NULL;
- uint32_t cbData = 0;
- uint32_t u32Width = 0;
- uint32_t u32Height = 0;
-
- int vrc = readSavedDisplayScreenshot(mSSData->strStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
-
- if (RT_FAILURE(vrc))
- return setError(VBOX_E_IPRT_ERROR,
- tr("Saved screenshot data is not available (%Rrc)"),
- vrc);
-
- *aSize = cbData;
- *aWidth = u32Width;
- *aHeight = u32Height;
-
- freeSavedDisplayScreenshot(pu8Data);
-
- return S_OK;
-}
-
HRESULT Machine::readSavedThumbnailToArray(ULONG aScreenId, BitmapFormat_T aBitmapFormat,
ULONG *aWidth, ULONG *aHeight, std::vector &aData)
@@ -6492,5 +6464,8 @@
}
-HRESULT Machine::querySavedScreenshotPNGSize(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
+HRESULT Machine::querySavedScreenshotInfo(ULONG aScreenId,
+ ULONG *aWidth,
+ ULONG *aHeight,
+ std::vector &aBitmapFormats)
{
if (aScreenId != 0)
@@ -6511,7 +6486,8 @@
vrc);
- *aSize = cbData;
*aWidth = u32Width;
*aHeight = u32Height;
+ aBitmapFormats.resize(1);
+ aBitmapFormats[0] = BitmapFormat_PNG;
freeSavedDisplayScreenshot(pu8Data);
@@ -6520,7 +6496,14 @@
}
-HRESULT Machine::readSavedScreenshotPNGToArray(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, std::vector &aData)
+HRESULT Machine::readSavedScreenshotToArray(ULONG aScreenId,
+ BitmapFormat_T aBitmapFormat,
+ ULONG *aWidth,
+ ULONG *aHeight,
+ std::vector &aData)
{
if (aScreenId != 0)
+ return E_NOTIMPL;
+
+ if (aBitmapFormat != BitmapFormat_PNG)
return E_NOTIMPL;