Changeset 66211 in vbox for trunk/src/VBox/Storage

Timestamp:

Mar 22, 2017 7:44:19 PM (8 years ago)

Author:

vboxsync

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

114128

Message:

vdmedia.h,++: Rename VDTYPE_DVD to VDTYPE_OPTICAL_DISC

Location:

trunk/src/VBox/Storage

Files:

• CUE.cpp (modified) (3 diffs)
• DMG.cpp (modified) (2 diffs)
• RAW.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/CUE.cpp

@@ -225 +225 @@
 static const VDFILEEXTENSION s_aCueFileExtensions[] =
 {
-    {"cue", VDTYPE_DVD},
+    {"cue", VDTYPE_OPTICAL_DISC},
     {NULL, VDTYPE_INVALID}
 };
@@ -1427 +1427 @@
 
         if (RT_SUCCESS(rc))
-            *penmType = VDTYPE_DVD;
+            *penmType = VDTYPE_OPTICAL_DISC;
         else
             rc = VERR_VD_GEN_INVALID_HEADER;
@@ -1451 +1451 @@
     AssertReturn(!(uOpenFlags & ~VD_OPEN_FLAGS_MASK), VERR_INVALID_PARAMETER);
     AssertReturn((VALID_PTR(pszFilename) && *pszFilename), VERR_INVALID_PARAMETER);
-    AssertReturn(enmType == VDTYPE_DVD, VERR_NOT_SUPPORTED);
+    AssertReturn(enmType == VDTYPE_OPTICAL_DISC, VERR_NOT_SUPPORTED);
 
     pThis = (PCUEIMAGE)RTMemAllocZ(sizeof(CUEIMAGE));

trunk/src/VBox/Storage/DMG.cpp

@@ -424 +424 @@
 static const VDFILEEXTENSION s_aDmgFileExtensions[] =
 {
-    {"dmg", VDTYPE_DVD},
+    {"dmg", VDTYPE_OPTICAL_DISC},
     {NULL, VDTYPE_INVALID}
 };
@@ -1793 +1793 @@
                 {
                     rc = VINF_SUCCESS;
-                    *penmType = VDTYPE_DVD;
+                    *penmType = VDTYPE_OPTICAL_DISC;
                 }
                 else

trunk/src/VBox/Storage/RAW.cpp

@@ -88 +88 @@
 static const VDFILEEXTENSION s_aRawFileExtensions[] =
 {
-    {"iso", VDTYPE_DVD},
-    {"cdr", VDTYPE_DVD},
+    {"iso", VDTYPE_OPTICAL_DISC},
+    {"cdr", VDTYPE_OPTICAL_DISC},
     {"img", VDTYPE_FLOPPY},
     {"ima", VDTYPE_FLOPPY},
@@ -332 +332 @@
                 else
                 {
-                    *penmType = VDTYPE_DVD;
+                    *penmType = VDTYPE_OPTICAL_DISC;
                     rc = VINF_SUCCESS;
                 }
@@ -393 +393 @@
         if (RT_SUCCESS(rc))
         {
-            if (enmType == VDTYPE_DVD)
+            if (enmType == VDTYPE_OPTICAL_DISC)
                 pImage->cbSector = 2048;
             else
@@ -425 +425 @@
     /* Check the VD container type. Yes, hard disk must be allowed, otherwise
      * various tools using this backend for hard disk images will fail. */
-    if (enmType != VDTYPE_HDD && enmType != VDTYPE_DVD && enmType != VDTYPE_FLOPPY)
+    if (enmType != VDTYPE_HDD && enmType != VDTYPE_OPTICAL_DISC && enmType != VDTYPE_FLOPPY)
         return VERR_VD_INVALID_TYPE;