Changeset 29354 in vbox

Timestamp:

May 11, 2010 1:44:25 PM (14 years ago)

Author:

vboxsync

Message:

Main: Make API change to query saved screenshots of any configured monitor in a snapshot. Not implemented, yet.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (8 diffs)
• Main/idl/VirtualBox.xidl (modified) (5 diffs)
• Main/include/MachineImpl.h (modified) (1 diff)

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

@@ -70 +70 @@
     /* Get thumbnail if present */
     ULONG width = 0, height = 0;
-    QVector <BYTE> thumbData = machine.ReadSavedThumbnailToArray (true, width, height);
+    QVector <BYTE> thumbData = machine.ReadSavedThumbnailToArray (0, true, width, height);
     mThumbnail = thumbData.size() != 0 ? QPixmap::fromImage (QImage (thumbData.data(), width, height, QImage::Format_RGB32).copy()) : QPixmap();
-    QVector <BYTE> screenData = machine.ReadSavedScreenshotPNGToArray (width, height);
+    QVector <BYTE> screenData = machine.ReadSavedScreenshotPNGToArray (0, width, height);
     mScreenshot = screenData.size() != 0 ? QPixmap::fromImage (QImage::fromData (screenData.data(), screenData.size(), "PNG")) : QPixmap();
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4654 +4654 @@
 }
 
-STDMETHODIMP Machine::QuerySavedThumbnailSize(ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
+STDMETHODIMP Machine::QuerySavedThumbnailSize(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
 {
     LogFlowThisFunc(("\n"));
@@ -4661 +4661 @@
     CheckComArgNotNull(aWidth);
     CheckComArgNotNull(aHeight);
+
+    if (aScreenId != 0)
+        return E_NOTIMPL;
 
     AutoCaller autoCaller(this);
@@ -4688 +4691 @@
 }
 
-STDMETHODIMP Machine::ReadSavedThumbnailToArray(BOOL aBGR, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData))
+STDMETHODIMP Machine::ReadSavedThumbnailToArray(ULONG aScreenId, BOOL aBGR, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData))
 {
     LogFlowThisFunc(("\n"));
@@ -4695 +4698 @@
     CheckComArgNotNull(aHeight);
     CheckComArgOutSafeArrayPointerValid(aData);
+
+    if (aScreenId != 0)
+        return E_NOTIMPL;
 
     AutoCaller autoCaller(this);
@@ -4747 +4753 @@
 }
 
-STDMETHODIMP Machine::QuerySavedScreenshotPNGSize(ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
+STDMETHODIMP Machine::QuerySavedScreenshotPNGSize(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight)
 {
     LogFlowThisFunc(("\n"));
@@ -4754 +4760 @@
     CheckComArgNotNull(aWidth);
     CheckComArgNotNull(aHeight);
+
+    if (aScreenId != 0)
+        return E_NOTIMPL;
 
     AutoCaller autoCaller(this);
@@ -4781 +4790 @@
 }
 
-STDMETHODIMP Machine::ReadSavedScreenshotPNGToArray(ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData))
+STDMETHODIMP Machine::ReadSavedScreenshotPNGToArray(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData))
 {
     LogFlowThisFunc(("\n"));
@@ -4788 +4797 @@
     CheckComArgNotNull(aHeight);
     CheckComArgOutSafeArrayPointerValid(aData);
+
+    if (aScreenId != 0)
+        return E_NOTIMPL;
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4215 +4215 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="b5d4457e-888f-46ef-b2db-644616db94fd"
+     uuid="6d9212cb-a5c0-48b7-bbc1-3fa2ba2ee6d2"
      wsmap="managed"
      >
@@ -5940 +5940 @@
         Returns size in bytes and dimensions in pixels of a saved thumbnail bitmap from saved state.
       </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Saved guest screen to query info from.
+        </desc>
+      </param>
       <param name="size" type="unsigned long" dir="out">
         <desc>
@@ -5961 +5966 @@
         Thumbnail is retrieved to an array of bytes in uncompressed 32-bit BGRA or RGBA format.
       </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Saved guest screen to read from.
+        </desc>
+      </param>
       <param name="BGR" type="boolean" dir="in">
         <desc>
@@ -5988 +5998 @@
         Returns size in bytes and dimensions of a saved PNG image of screenshot from saved state.
       </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Saved guest screen to query info from.
+        </desc>
+      </param>
       <param name="size" type="unsigned long" dir="out">
         <desc>
@@ -6009 +6024 @@
         Screenshot in PNG format is retrieved to an array of bytes.
       </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Saved guest screen to read from.
+        </desc>
+      </param>
       <param name="width" type="unsigned long" dir="out">
         <desc>

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

@@ -499 +499 @@
     STDMETHOD(GetStorageControllerByName(IN_BSTR aName, IStorageController **storageController));
     STDMETHOD(GetStorageControllerByInstance(ULONG aInstance, IStorageController **storageController));
-    STDMETHOD(QuerySavedThumbnailSize)(ULONG *aSize, ULONG *aWidth, ULONG *aHeight);
-    STDMETHOD(ReadSavedThumbnailToArray)(BOOL aBGR, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData));
-    STDMETHOD(QuerySavedScreenshotPNGSize)(ULONG *aSize, ULONG *aWidth, ULONG *aHeight);
-    STDMETHOD(ReadSavedScreenshotPNGToArray)(ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData));
+    STDMETHOD(QuerySavedThumbnailSize)(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight);
+    STDMETHOD(ReadSavedThumbnailToArray)(ULONG aScreenId, BOOL aBGR, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData));
+    STDMETHOD(QuerySavedScreenshotPNGSize)(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight);
+    STDMETHOD(ReadSavedScreenshotPNGToArray)(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(HotPlugCPU(ULONG aCpu));
     STDMETHOD(HotUnplugCPU(ULONG aCpu));