CDImage: Merge bin/ecm handling into one class

Means that cuesheets with ECM tracks will now load as expected.

src/util/CMakeLists.txt

@@ -3,11 +3,9 @@ add_library(util
   audio_stream.h
   cd_image.cpp
   cd_image.h
-  cd_image_bin.cpp
   cd_image_cue.cpp
   cd_image_chd.cpp
   cd_image_device.cpp
-  cd_image_ecm.cpp
   cd_image_hasher.cpp
   cd_image_hasher.h
   cd_image_m3u.cpp

src/util/cd_image.cpp

@@ -83,18 +83,14 @@ std::unique_ptr<CDImage> CDImage::Open(const char* filename, bool allow_patches,
     image = OpenCueSheetImage(filename, error);
   }
   else if (StringUtil::Strcasecmp(extension, ".bin") == 0 || StringUtil::Strcasecmp(extension, ".img") == 0 ||
-           StringUtil::Strcasecmp(extension, ".iso") == 0)
+           StringUtil::Strcasecmp(extension, ".iso") == 0 || StringUtil::Strcasecmp(extension, ".ecm") == 0)
   {
     image = OpenBinImage(filename, error);
   }
   else if (StringUtil::Strcasecmp(extension, ".chd") == 0)
   {
     image = OpenCHDImage(filename, error);
   }
-  else if (StringUtil::Strcasecmp(extension, ".ecm") == 0)
-  {
-    image = OpenEcmImage(filename, error);
-  }
   else if (StringUtil::Strcasecmp(extension, ".mds") == 0)
   {
     image = OpenMdsImage(filename, error);

src/util/cd_image.h

@@ -247,10 +247,9 @@ class CDImage
 
   // Opening disc image.
   static std::unique_ptr<CDImage> Open(const char* filename, bool allow_patches, Error* error);
-  static std::unique_ptr<CDImage> OpenBinImage(const char* filename, Error* error);
-  static std::unique_ptr<CDImage> OpenCueSheetImage(const char* filename, Error* error);
+  static std::unique_ptr<CDImage> OpenBinImage(const char* path, Error* error);
+  static std::unique_ptr<CDImage> OpenCueSheetImage(const char* path, Error* error);
   static std::unique_ptr<CDImage> OpenCHDImage(const char* filename, Error* error);
-  static std::unique_ptr<CDImage> OpenEcmImage(const char* filename, Error* error);
   static std::unique_ptr<CDImage> OpenMdsImage(const char* filename, Error* error);
   static std::unique_ptr<CDImage> OpenPBPImage(const char* filename, Error* error);
   static std::unique_ptr<CDImage> OpenM3uImage(const char* filename, bool apply_patches, Error* error);