CDImage: Support loading CloneCD images

This replaces the old "img" fallback, which did not work for multi-track
games.

Author: stenzek

src/core/fullscreenui_game_list.cpp

@@ -67,8 +67,8 @@ ALIGN_TO_CACHE_LINE static GameListLocals s_game_list_locals;
 
 FullscreenUI::FileSelectorFilters FullscreenUI::GetDiscImageFilters()
 {
-  return {"*.bin",   "*.cue",    "*.iso", "*.img", "*.chd", "*.ecm",     "*.mds", "*.cpe", "*.elf",
-          "*.psexe", "*.ps-exe", "*.exe", "*.psx", "*.psf", "*.minipsf", "*.m3u", "*.pbp"};
+  return {"*.bin",    "*.cue", "*.iso", "*.chd", "*.ecm",     "*.mds", "*.cpe", "*.elf", "*.psexe",
+          "*.ps-exe", "*.exe", "*.psx", "*.psf", "*.minipsf", "*.m3u", "*.pbp", "*.ccd"};
 }
 
 FullscreenUI::FileSelectorFilters FullscreenUI::GetImageFilters()

src/core/system.cpp

@@ -881,9 +881,9 @@ bool System::IsUsingKnownPS1BIOS()
 bool System::IsDiscPath(std::string_view path)
 {
   return (StringUtil::EndsWithNoCase(path, ".bin") || StringUtil::EndsWithNoCase(path, ".cue") ||
-          StringUtil::EndsWithNoCase(path, ".img") || StringUtil::EndsWithNoCase(path, ".iso") ||
-          StringUtil::EndsWithNoCase(path, ".chd") || StringUtil::EndsWithNoCase(path, ".ecm") ||
-          StringUtil::EndsWithNoCase(path, ".mds") || StringUtil::EndsWithNoCase(path, ".pbp") ||
+          StringUtil::EndsWithNoCase(path, ".iso") || StringUtil::EndsWithNoCase(path, ".chd") ||
+          StringUtil::EndsWithNoCase(path, ".ecm") || StringUtil::EndsWithNoCase(path, ".mds") ||
+          StringUtil::EndsWithNoCase(path, ".pbp") || StringUtil::EndsWithNoCase(path, ".ccd") ||
           StringUtil::EndsWithNoCase(path, ".m3u"));
 }
 

src/duckstation-qt/gamelistwidget.cpp

@@ -72,9 +72,10 @@ static constexpr QSize COMPATIBILITY_PIXMAP_SIZE(96, 24);
 
 static const char* SUPPORTED_FORMATS_STRING =
   QT_TRANSLATE_NOOP(GameListWidget, ".cue (Cue Sheets)\n"
-                                    ".iso/.img (Single Track Image)\n"
+                                    ".iso (Single Track Image)\n"
                                     ".ecm (Error Code Modeling Image)\n"
                                     ".mds (Media Descriptor Sidecar)\n"
+                                    ".ccd (CloneCD Image)\n"
                                     ".chd (Compressed Hunks of Data)\n"
                                     ".pbp (PlayStation Portable, Only Decrypted)");
 

src/duckstation-qt/mainwindow.cpp

@@ -105,12 +105,12 @@ static constexpr const char* DEFAULT_TOOLBAR_ACTIONS =
   "ControllerSettings";
 
 static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
-  "MainWindow",
-  "All File Types (*.bin *.img *.iso *.cue *.chd *.cpe *.ecm *.mds *.pbp *.elf *.exe *.psexe *.ps-exe *.psx *.psf "
-  "*.minipsf *.m3u *.psxgpu);;Single-Track Raw Images (*.bin *.img *.iso);;Cue Sheets (*.cue);;MAME CHD Images "
-  "(*.chd);;Error Code Modeler Images (*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp "
-  "*.PBP);;PlayStation Executables (*.cpe *.elf *.exe *.psexe *.ps-exe, *.psx);;Portable Sound Format Files (*.psf "
-  "*.minipsf);;Playlists (*.m3u);;PSX GPU Dumps (*.psxgpu *.psxgpu.zst *.psxgpu.xz)");
+  "MainWindow", "All File Types (*.bin *.iso *.cue *.chd *.cpe *.ecm *.mds *.pbp *.ccd *.elf *.exe *.psexe *.ps-exe "
+                "*.psx *.psf *.minipsf *.m3u *.psxgpu);;Single-Track Raw Images (*.bin *.img *.iso);;Cue Sheets "
+                "(*.cue);;MAME CHD Images (*.chd);;Error Code Modeler Images (*.ecm);;Media Descriptor Sidecar Images "
+                "(*.mds);;CloneCD Images (*.ccd);;PlayStation EBOOTs (*.pbp *.PBP);;PlayStation Executables (*.cpe "
+                "*.elf *.exe *.psexe *.ps-exe, *.psx);;Portable Sound Format Files (*.psf *.minipsf);;Playlists "
+                "(*.m3u);;PSX GPU Dumps (*.psxgpu *.psxgpu.zst *.psxgpu.xz)");
 
 static constexpr char IMAGE_FILTER[] = QT_TRANSLATE_NOOP("MainWindow", "Images (*.jpg *.jpeg *.png *.webp)");
 

src/util/CMakeLists.txt

@@ -5,6 +5,7 @@ add_library(util
   audio_stream.h
   cd_image.cpp
   cd_image.h
+  cd_image_ccd.cpp
   cd_image_cue.cpp
   cd_image_chd.cpp
   cd_image_device.cpp

src/util/cd_image.cpp

@@ -96,6 +96,10 @@ std::unique_ptr<CDImage> CDImage::Open(const char* path, bool allow_patches, Err
   {
     image = OpenPBPImage(path, error);
   }
+  else if (StringUtil::EqualNoCase(extension, "ccd"))
+  {
+    image = OpenCCDImage(path, error);
+  }
   else if (StringUtil::EqualNoCase(extension, "m3u"))
   {
     // skip applying patches to the main path, which isn't a real disc

src/util/cd_image.h

@@ -196,6 +196,7 @@ class CDImage
   static std::unique_ptr<CDImage> OpenCHDImage(const char* path, Error* error);
   static std::unique_ptr<CDImage> OpenMdsImage(const char* path, Error* error);
   static std::unique_ptr<CDImage> OpenPBPImage(const char* path, Error* error);
+  static std::unique_ptr<CDImage> OpenCCDImage(const char* path, Error* error);
   static std::unique_ptr<CDImage> OpenM3uImage(const char* path, bool apply_patches, Error* error);
   static std::unique_ptr<CDImage> OpenDeviceImage(const char* path, Error* error);
   static std::unique_ptr<CDImage> CreateMemoryImage(CDImage* image, ProgressCallback* progress, Error* error);