Changeset 23879 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Oct 19, 2009 5:26:44 PM (16 years ago)

Author:

vboxsync

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

53659

Message:

Main: rename snapshot APIs, remove DiscardCurrentSnapshotAndState; tree snapshots implementation still missing

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -602 +602 @@
         switch (machineState)
         {
-            case MachineState_Null:                return "<null>";
-            case MachineState_Running:             return "Running";
-            case MachineState_Restoring:           return "Restoring";
-            case MachineState_TeleportingFrom:     return "TeleportingFrom";
-            case MachineState_Starting:            return "Starting";
-            case MachineState_PoweredOff:          return "PoweredOff";
-            case MachineState_Saved:               return "Saved";
-            case MachineState_Aborted:             return "Aborted";
-            case MachineState_Stopping:            return "Stopping";
-            case MachineState_Paused:              return "Paused";
-            case MachineState_Stuck:               return "Stuck";
-            case MachineState_Saving:              return "Saving";
-            case MachineState_Discarding:          return "Discarding";
-            case MachineState_SettingUp:           return "SettingUp";
-            default:                               return "no idea";
+            case MachineState_Null:                 return "<null>";
+            case MachineState_PoweredOff:           return "PoweredOff";
+            case MachineState_Saved:                return "Saved";
+            case MachineState_Aborted:              return "Aborted";
+            case MachineState_Running:              return "Running";
+            case MachineState_Paused:               return "Paused";
+            case MachineState_Stuck:                return "GuruMeditation";
+            case MachineState_Starting:             return "Starting";
+            case MachineState_Stopping:             return "Stopping";
+            case MachineState_Saving:               return "Saving";
+            case MachineState_Restoring:            return "Restoring";
+            case MachineState_TeleportingFrom:      return "TeleportingFrom";
+            case MachineState_RestoringSnapshot:    return "RestoringSnapshot";
+            case MachineState_DeletingSnapshot:     return "DeletingSnapshot";
+            case MachineState_SettingUp:            return "SettingUp";
+            default:                                return "no idea";
         }
     }
@@ -1774 +1775 @@
         {
             gProgress = NULL;
-            CHECK_ERROR(gConsole, DiscardCurrentState(gProgress.asOutParam()));
+
+            ComPtr<ISnapshot> pCurrentSnapshot;
+            CHECK_ERROR_BREAK(gMachine, COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam()));
+
+            CHECK_ERROR(gConsole, RestoreSnapshot(pCurrentSnapshot, gProgress.asOutParam()));
             rc = gProgress->WaitForCompletion(-1);
         }