Suppress duplicate messages

The multi-pass scanning of disk images may mean the same message
was displayed multiple times. We now suppress any exact duplicates.

Author: simonowen

include/Util.h

@@ -108,6 +108,7 @@ const char *CHS (int cyl, int head, int sector);
 const char *CHR (int cyl, int head, int record);
 const char *CHSR (int cyl, int head, int sector, int record);
 
+extern std::set<std::string> seen_messages;
 
 template <typename ...Args>
 void Message (MsgType type, const char* pcsz_, Args&& ...args)
@@ -117,6 +118,14 @@ void Message (MsgType type, const char* pcsz_, Args&& ...args)
 	if (type == msgError)
 		throw util::exception(msg);
 
+	if (type != msgStatus)
+	{
+		if (seen_messages.find(msg) != seen_messages.end())
+			return;
+
+		seen_messages.insert(msg);
+	}
+
 	switch (type)
 	{
 		case msgStatus:	 break;

src/Image.cpp

@@ -7,7 +7,6 @@
 #include "BlockDevice.h"
 
 bool UnwrapSDF (std::shared_ptr<Disk> &src_disk, std::shared_ptr<Disk> &disk);
-bool ReadUnsupp (MemFile &file, std::shared_ptr<Disk> &disk);
 
 bool ReadImage (const std::string &path, std::shared_ptr<Disk> &disk, bool normalise)
 {

src/Util.cpp

@@ -2,6 +2,8 @@
 
 #include "SAMdisk.h"
 
+std::set<std::string> seen_messages;
+
 static uint32_t adwUsed[2][3];
 
 const char *ValStr (int val, const char *pcszDec_, const char *pcszHex_, bool fForceDecimal_)