wirtz
/
MiniDexed
mirror of https://github.com/probonopd/MiniDexed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfix - removed redundant legacy check that results in out of order performance files being skipped on load.

Browse Source
pull/581/head
Kevin 1 year ago
parent e49a410d7e
commit 692f57ae9e
1 changed files with 37 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 78
      src/performanceconfig.cpp

78
src/performanceconfig.cpp
Unescape View File

@ -981,55 +981,51 @@ bool CPerformanceConfig::ListPerformances()
Result = f_findfirst (&Directory, &FileInfo, PerfDir.c_str(), "*.ini"); Result = f_findfirst (&Directory, &FileInfo, PerfDir.c_str(), "*.ini");
for (unsigned i = 0; Result == FR_OK && FileInfo.fname[0]; i++) for (unsigned i = 0; Result == FR_OK && FileInfo.fname[0]; i++)
{ {
if (m_nLastPerformance >= NUM_PERFORMANCES - 1) { if (!(FileInfo.fattrib & (AM_HID | AM_SYS)))
LOGNOTE ("Skipping performance %s", FileInfo.fname); {
} else { std::string OriFileName = FileInfo.fname;
if (!(FileInfo.fattrib & (AM_HID | AM_SYS))) size_t nLen = OriFileName.length();
if ( nLen > 8 && nLen <26 && strcmp(OriFileName.substr(6,1).c_str(), "_")==0)
{ {
std::string OriFileName = FileInfo.fname; // Note: m_nLastPerformance - refers to the number (index) of the last performance in memory,
size_t nLen = OriFileName.length(); // which includes a default performance.
if ( nLen > 8 && nLen <26 && strcmp(OriFileName.substr(6,1).c_str(), "_")==0) //
// Filenames on the disk start from 1 to match what the user might see in MIDI.
// So this means that actually file 000001_ will correspond to index position [0].
// For the default bank though, ID 1 is the default performance, so will already exist.
// m_PerformanceFileName[0] = default performance (file 000001)
// m_PerformanceFileName[1] = first available on-disk performance (file 000002)
//
// Note2: filenames assume 6 digits, underscore, name, finally ".ini"
// i.e. 123456_Performance Name.ini
//
nPIndex=stoi(OriFileName.substr(0,6));
if ((nPIndex < 1) || (nPIndex >= (NUM_PERFORMANCES+1)))
{ {
// Note: m_nLastPerformance - refers to the number (index) of the last performance in memory, // Index is out of range - skip to next file
// which includes a default performance. LOGNOTE ("Performance number out of range: %s (%d to %d)", FileInfo.fname, 1, NUM_PERFORMANCES);
// }
// Filenames on the disk start from 1 to match what the user might see in MIDI. else
// So this means that actually file 000001_ will correspond to index position [0]. {
// For the default bank though, ID 1 is the default performance, so will already exist. // Convert from "user facing" 1..indexed number to internal 0..indexed
// m_PerformanceFileName[0] = default performance (file 000001) nPIndex = nPIndex-1;
// m_PerformanceFileName[1] = first available on-disk performance (file 000002) if (m_PerformanceFileName[nPIndex].empty())
//
// Note2: filenames assume 6 digits, underscore, name, finally ".ini"
// i.e. 123456_Performance Name.ini
//
nPIndex=stoi(OriFileName.substr(0,6));
if ((nPIndex < 1) || (nPIndex >= (NUM_PERFORMANCES+1)))
{
// Index is out of range - skip to next file
LOGNOTE ("Performance number out of range: %s (%d to %d)", FileInfo.fname, 1, NUM_PERFORMANCES);
}
else
{ {
// Convert from "user facing" 1..indexed number to internal 0..indexed if(nPIndex > m_nLastPerformance)
nPIndex = nPIndex-1;
if (m_PerformanceFileName[nPIndex].empty())
{ {
if(nPIndex > m_nLastPerformance) m_nLastPerformance=nPIndex;
{ }
m_nLastPerformance=nPIndex;
}
std::string FileName = OriFileName.substr(0,OriFileName.length()-4).substr(7,14); std::string FileName = OriFileName.substr(0,OriFileName.length()-4).substr(7,14);
m_PerformanceFileName[nPIndex] = FileName; m_PerformanceFileName[nPIndex] = FileName;
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
LOGNOTE ("Loading performance %s (%d, %s)", OriFileName.c_str(), nPIndex, FileName.c_str()); LOGNOTE ("Loading performance %s (%d, %s)", OriFileName.c_str(), nPIndex, FileName.c_str());
#endif #endif
} }
else else
{ {
LOGNOTE ("Duplicate performance %s", OriFileName.c_str()); LOGNOTE ("Duplicate performance %s", OriFileName.c_str());
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save