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

Timestamp:

Oct 27, 2008 2:04:18 PM (16 years ago)

Author:

vboxsync

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

38479

Message:

Ported s2 branch (r37120:38456).

File:

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

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

@@ -1690 +1690 @@
          */
         Bstr hdaFileBstr = hdaFile;
-        ComPtr<IHardDisk> hardDisk;
-        virtualBox->FindHardDisk(hdaFileBstr, hardDisk.asOutParam());
+        ComPtr<IHardDisk2> hardDisk;
+        virtualBox->FindHardDisk2(hdaFileBstr, hardDisk.asOutParam());
         if (!hardDisk)
         {
             /* we've not found the image */
-            RTPrintf("Registering hard disk image '%S'...\n", hdaFile);
-            virtualBox->OpenHardDisk (hdaFileBstr, hardDisk.asOutParam());
-            if (hardDisk)
-                virtualBox->RegisterHardDisk (hardDisk);
+            RTPrintf("Adding hard disk '%S'...\n", hdaFile);
+            virtualBox->OpenHardDisk2 (hdaFileBstr, hardDisk.asOutParam());
         }
         /* do we have the right image now? */
@@ -1708 +1706 @@
             Guid uuid;
             hardDisk->COMGETTER(Id)(uuid.asOutParam());
-            gMachine->DetachHardDisk(StorageBus_IDE, 0, 0);
-            gMachine->AttachHardDisk(uuid, StorageBus_IDE, 0, 0);
+            gMachine->DetachHardDisk2(StorageBus_IDE, 0, 0);
+            gMachine->AttachHardDisk2(uuid, StorageBus_IDE, 0, 0);
             /// @todo why is this attachment saved?
         }
@@ -1737 +1735 @@
         }
 
-        Bstr media = fdaFile;
+        Bstr medium = fdaFile;
         bool done = false;
 
@@ -1747 +1745 @@
             CHECK_ERROR_BREAK (host, COMGETTER(FloppyDrives)(coll.asOutParam()));
             ComPtr <IHostFloppyDrive> hostDrive;
-            rc = coll->FindByName (media, hostDrive.asOutParam());
+            rc = coll->FindByName (medium, hostDrive.asOutParam());
             if (SUCCEEDED (rc))
             {
@@ -1759 +1757 @@
         {
             /* try to find an existing one */
-            ComPtr <IFloppyImage> image;
-            rc = virtualBox->FindFloppyImage (media, image.asOutParam());
+            ComPtr <IFloppyImage2> image;
+            rc = virtualBox->FindFloppyImage (medium, image.asOutParam());
             if (FAILED (rc))
             {
-                /* try to register */
-                RTPrintf ("Registering floppy image '%S'...\n", fdaFile);
+                /* try to add to the list */
+                RTPrintf ("Adding floppy image '%S'...\n", fdaFile);
                 Guid uuid;
-                CHECK_ERROR_BREAK (virtualBox, OpenFloppyImage (media, uuid,
+                CHECK_ERROR_BREAK (virtualBox, OpenFloppyImage (medium, uuid,
                                                                 image.asOutParam()));
-                CHECK_ERROR_BREAK (virtualBox, RegisterFloppyImage (image));
             }
 
@@ -1799 +1796 @@
         }
 
-        Bstr media = cdromFile;
+        Bstr medium = cdromFile;
         bool done = false;
 
@@ -1809 +1806 @@
             CHECK_ERROR_BREAK (host, COMGETTER(DVDDrives)(coll.asOutParam()));
             ComPtr <IHostDVDDrive> hostDrive;
-            rc = coll->FindByName (media, hostDrive.asOutParam());
+            rc = coll->FindByName (medium, hostDrive.asOutParam());
             if (SUCCEEDED (rc))
             {
@@ -1821 +1818 @@
         {
             /* try to find an existing one */
-            ComPtr <IDVDImage> image;
-            rc = virtualBox->FindDVDImage (media, image.asOutParam());
+            ComPtr <IDVDImage2> image;
+            rc = virtualBox->FindDVDImage (medium, image.asOutParam());
             if (FAILED (rc))
             {
-                /* try to register */
-                RTPrintf ("Registering ISO image '%S'...\n", cdromFile);
+                /* try to add to the list */
+                RTPrintf ("Adding ISO image '%S'...\n", cdromFile);
                 Guid uuid;
-                CHECK_ERROR_BREAK (virtualBox, OpenDVDImage (media, uuid,
+                CHECK_ERROR_BREAK (virtualBox, OpenDVDImage (medium, uuid,
                                                              image.asOutParam()));
-                CHECK_ERROR_BREAK (virtualBox, RegisterDVDImage (image));
             }