[#60] Media system needs revision (Part 26: Fixed multiple property d…

…efinitions of some images)
tomas-nestorovic · Aug 24, 2022 · f191c8c · f191c8c
1 parent 7f2eb26
commit f191c8c
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 40 deletions.
diff --git a/Main/src/BSDOS.cpp b/Main/src/BSDOS.cpp
@@ -1149,6 +1149,16 @@
 
 
 	namespace MBD{
+		static constexpr CImage::TProperties Properties={
+			MAKE_IMAGE_ID('B','S','D','O','S','M','B','D'), // a unique identifier
+			Recognize, // name
+			Instantiate, // instantiation function
+			_T("*.mbd"), // filter
+			Medium::FLOPPY_ANY, // supported media
+			Codec::MFM, // supported Codecs
+			BSDOS_SECTOR_LENGTH_STD,BSDOS_SECTOR_LENGTH_STD	// min and max sector length
+		};
+
 		LPCTSTR Recognize(PTCHAR){
 			static constexpr TCHAR SingleDeviceName[]=_T("MB-02 image\0");
 			return SingleDeviceName;

diff --git a/Main/src/BSDOS.h b/Main/src/BSDOS.h
@@ -262,18 +262,10 @@
 
 
 	namespace MBD{
+		extern const CImage::TProperties Properties;
+
 		LPCTSTR Recognize(PTCHAR);
 		PImage Instantiate(LPCTSTR);
-
-		static constexpr CImage::TProperties Properties={
-			MAKE_IMAGE_ID('B','S','D','O','S','M','B','D'), // a unique identifier
-			Recognize, // name
-			Instantiate, // instantiation function
-			_T("*.mbd"), // filter
-			Medium::FLOPPY_ANY, // supported media
-			Codec::MFM, // supported Codecs
-			BSDOS_SECTOR_LENGTH_STD,BSDOS_SECTOR_LENGTH_STD	// min and max sector length
-		};
 	}
 
 #endif // BSDOS_H
diff --git a/Main/src/GDOS.h b/Main/src/GDOS.h
@@ -200,18 +200,10 @@
 
 
 	namespace MGT{
+		extern const CImage::TProperties Properties;
+
 		LPCTSTR Recognize(PTCHAR);
 		PImage Instantiate(LPCTSTR);
-
-		static constexpr CImage::TProperties Properties={
-			MAKE_IMAGE_ID('G','D','O','S','_','M','G','T'), // a unique identifier
-			Recognize,	// list of recognized device names
-			Instantiate,// instantiation function
-			_T("*.mgt"),	// filter
-			Medium::FLOPPY_DD_ANY, // supported Media
-			Codec::MFM, // supported Codecs
-			GDOS_SECTOR_LENGTH_STD, GDOS_SECTOR_LENGTH_STD	// Sector supported min and max length
-		};
 	}
 
 #endif // GDOS
diff --git a/Main/src/GDOS_Boot.cpp b/Main/src/GDOS_Boot.cpp
@@ -102,6 +102,16 @@
 
 
 	namespace MGT{
+		static constexpr CImage::TProperties Properties={
+			MAKE_IMAGE_ID('G','D','O','S','_','M','G','T'), // a unique identifier
+			Recognize,	// list of recognized device names
+			Instantiate,// instantiation function
+			_T("*.mgt"),	// filter
+			Medium::FLOPPY_DD_ANY, // supported Media
+			Codec::MFM, // supported Codecs
+			GDOS_SECTOR_LENGTH_STD, GDOS_SECTOR_LENGTH_STD	// Sector supported min and max length
+		};
+
 		LPCTSTR Recognize(PTCHAR){
 			static constexpr TCHAR SingleDeviceName[]=_T("MGT image\0");
 			return SingleDeviceName;

diff --git a/Main/src/MDOS2.h b/Main/src/MDOS2.h
@@ -243,18 +243,10 @@
 
 
 	namespace D80{
+		extern const CImage::TProperties Properties;
+
 		LPCTSTR Recognize(PTCHAR);
 		PImage Instantiate(LPCTSTR);
-
-		static constexpr CImage::TProperties Properties={
-			MAKE_IMAGE_ID('M','D','O','S','_','D','x','0'), // a unique identifier
-			Recognize,// name
-			Instantiate,// instantiation function
-			_T("*.d80") IMAGE_FORMAT_SEPARATOR _T("*.d40"),	// filter
-			Medium::FLOPPY_DD_ANY,
-			Codec::MFM, // supported Codecs
-			MDOS2_SECTOR_LENGTH_STD, MDOS2_SECTOR_LENGTH_STD	// min and max length of storable Sectors
-		};
 	}
 
 #endif // MDOS_H
diff --git a/Main/src/MDOS2_Boot.cpp b/Main/src/MDOS2_Boot.cpp
@@ -409,6 +409,16 @@
 
 
 	namespace D80{
+		static constexpr CImage::TProperties Properties={
+			MAKE_IMAGE_ID('M','D','O','S','_','D','x','0'), // a unique identifier
+			Recognize,// name
+			Instantiate,// instantiation function
+			_T("*.d80") IMAGE_FORMAT_SEPARATOR _T("*.d40"),	// filter
+			Medium::FLOPPY_DD_ANY,
+			Codec::MFM, // supported Codecs
+			MDOS2_SECTOR_LENGTH_STD, MDOS2_SECTOR_LENGTH_STD	// min and max length of storable Sectors
+		};
+
 		LPCTSTR Recognize(PTCHAR){
 			static constexpr TCHAR SingleDeviceName[]=_T("Didaktik D40/D80\0");
 			return SingleDeviceName;

diff --git a/Main/src/TRDOS.h b/Main/src/TRDOS.h
@@ -217,18 +217,10 @@
 
 
 	namespace TRD{
+		extern const CImage::TProperties Properties;
+
 		LPCTSTR Recognize(PTCHAR);
 		PImage Instantiate(LPCTSTR);
-
-		static constexpr CImage::TProperties Properties={
-			MAKE_IMAGE_ID('T','R','D','O','S','T','R','D'), // a unique identifier
-			Recognize,// name
-			Instantiate,// instantiation function
-			_T("*.trd"),	// filter
-			Medium::FLOPPY_DD_ANY,
-			Codec::MFM, // supported Codecs
-			TRDOS503_SECTOR_LENGTH_STD,TRDOS503_SECTOR_LENGTH_STD	// min and max length of storable Sectors
-		};
 	}
 
 #endif // TRDOS_H
diff --git a/Main/src/TRDOS503_Boot.cpp b/Main/src/TRDOS503_Boot.cpp
@@ -375,6 +375,16 @@
 
 
 	namespace TRD{
+		static constexpr CImage::TProperties Properties={
+			MAKE_IMAGE_ID('T','R','D','O','S','T','R','D'), // a unique identifier
+			Recognize,// name
+			Instantiate,// instantiation function
+			_T("*.trd"),	// filter
+			Medium::FLOPPY_DD_ANY,
+			Codec::MFM, // supported Codecs
+			TRDOS503_SECTOR_LENGTH_STD,TRDOS503_SECTOR_LENGTH_STD	// min and max length of storable Sectors
+		};
+
 		LPCTSTR Recognize(PTCHAR){
 			static constexpr TCHAR SingleDeviceName[]=_T("TR-DOS image\0");
 			return SingleDeviceName;