Initial attempt at supporting loading SysEx files from subdirectories which seems to speed up loading significantly.

src/sysexfileloader.cpp

@@ -84,6 +84,7 @@ CSysExFileLoader::~CSysExFileLoader (void)
 void CSysExFileLoader::Load (bool bHeaderlessSysExVoices)
 {
 	m_nNumHighestBank = 0;
+	m_nBanksLoaded = 0;
 
     DIR *pDirectory = opendir (m_DirName.c_str ());
 	if (!pDirectory)
@@ -95,40 +96,69 @@ void CSysExFileLoader::Load (bool bHeaderlessSysExVoices)
 
 	dirent *pEntry;
 	while ((pEntry = readdir (pDirectory)) != nullptr)
+	{
+		LoadBank(m_DirName.c_str (), pEntry->d_name);
+	}
+	LOGDBG ("%u Banks loaded. Highest Bank loaded: #%u", m_nBanksLoaded, m_nNumHighestBank);
+
+	closedir (pDirectory);
+}
+
+void CSysExFileLoader::LoadBank (const char * sDirName, const char * sBankName)
 {
 	unsigned nBank;
-		size_t nLen = strlen (pEntry->d_name);
+	size_t nLen = strlen (sBankName);
 
 	if (   nLen < 5						// "[NNNN]N[_name].syx"
-		    || strcasecmp (&pEntry->d_name[nLen-4], ".syx") != 0
-		    || sscanf (pEntry->d_name, "%u", &nBank) != 1)
+		|| strcasecmp (&sBankName[nLen-4], ".syx") != 0
+		|| sscanf (sBankName, "%u", &nBank) != 1)
+	{
+		// See if this is a subdirectory...
+		std::string Dirname (sDirName);
+		Dirname += "/";
+		Dirname += sBankName;
+
+		DIR *pDirectory = opendir (Dirname.c_str ());
+		if (pDirectory)
+		{
+			LOGDBG ("Processing subdirectory %s", sBankName);
+
+			dirent *pEntry;
+			while ((pEntry = readdir (pDirectory)) != nullptr)
+			{
+				LoadBank(Dirname.c_str (), pEntry->d_name);
+			}
+			closedir (pDirectory);
+		}
+		else
 		{
-			LOGWARN ("%s: Invalid filename format", pEntry->d_name);
+			LOGWARN ("%s: Invalid filename format", sBankName);
+		}
 
-			continue;
+		return;
 	}
 
 	if (nBank > MaxVoiceBankID)
 	{
 		LOGWARN ("Bank #%u is not supported", nBank);
 
-			continue;
+		return;
 	}
 
 	if (m_pVoiceBank[nBank])
 	{
 		LOGWARN ("Bank #%u already loaded", nBank);
 
-			continue;
+		return;
 	}
 
 	m_pVoiceBank[nBank] = new TVoiceBank;
 	assert (m_pVoiceBank[nBank]);
 	assert (sizeof(TVoiceBank) == VoiceSysExHdrSize + VoiceSysExSize);
 
-		std::string Filename (m_DirName);
+	std::string Filename (sDirName);
 	Filename += "/";
-		Filename += pEntry->d_name;
+	Filename += sBankName;
 
 	FILE *pFile = fopen (Filename.c_str (), "rb");
 	if (pFile)
@@ -140,17 +170,22 @@ void CSysExFileLoader::Load (bool bHeaderlessSysExVoices)
 			&& m_pVoiceBank[nBank]->Format      == 0x09
 			&& m_pVoiceBank[nBank]->StatusEnd   == 0xF7)
 		{
-				LOGDBG ("Bank #%u successfully loaded", nBank);
+			if (m_nBanksLoaded % 100 == 0)
+			{
+				LOGDBG ("Banks successfully loaded #%u", m_nBanksLoaded);
+			}
+			//LOGDBG ("Bank #%u successfully loaded", nBank);
 
-				m_BankFileName[nBank] = pEntry->d_name;
+			m_BankFileName[nBank] = sBankName;
 			if (nBank > m_nNumHighestBank)
 			{
 				// This is the bank ID of the highest loaded bank
 				m_nNumHighestBank = nBank;
 			}
+			m_nBanksLoaded++;
 			bBankLoaded = true;
 		}
-			else if (bHeaderlessSysExVoices)
+	/*			else if (bHeaderlessSysExVoices)
 		{
 			// Config says to accept headerless SysEx Voice Banks
 			// so reset file pointer and try again.
@@ -177,7 +212,7 @@ void CSysExFileLoader::Load (bool bHeaderlessSysExVoices)
 				}
 				bBankLoaded = true;
 			}
-			}
+		}*/
 
 		if (!bBankLoaded)
 		{
@@ -196,9 +231,6 @@ void CSysExFileLoader::Load (bool bHeaderlessSysExVoices)
 	}
 }
 
-	closedir (pDirectory);
-}
-
 std::string CSysExFileLoader::GetBankName (unsigned nBankID)
 {
 	if (nBankID <= MaxVoiceBankID)

src/sysexfileloader.h

@@ -75,11 +75,14 @@ private:
 	std::string m_DirName;
 	
 	unsigned m_nNumHighestBank;
+	unsigned m_nBanksLoaded;
 
 	TVoiceBank *m_pVoiceBank[MaxVoiceBankID+1];
 	std::string m_BankFileName[MaxVoiceBankID+1];
 
 	static uint8_t s_DefaultVoice[SizeSingleVoice];
+	
+	void LoadBank (const char * sDirName, const char * sBankName);
 };
 
 #endif