Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly check for preexisting HRTF names

Browse Source
This commit is contained in:
Chris Robinson
2016-02-28 09:34:02 -08:00
parent 9e3a1942a3
commit 81384949e2
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/alsoft-config/mainwindow.cpp
+34 -32
View File
@@ -379,23 +379,24 @@ QStringList MainWindow::collectHrtfs()
QStringList fnames = dir.entryList(QDir::Files | QDir::Readable, QDir::Name);
foreach(const QString &fname, fnames)
{
if(fname.endsWith(".mhr", Qt::CaseInsensitive))
if(!fname.endsWith(".mhr", Qt::CaseInsensitive))
continue;
QString name = fname.left(fname.length()-4);
if(!ret.contains(name))
ret.push_back(name);
else
{
if(!ret.contains(fname))
ret.push_back(fname.left(fname.length()-4));
else
{
size_t i = 1;
do {
QString s = fname.left(fname.length()-4)+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);
break;
}
++i;
} while(1);
}
size_t i = 1;
do {
QString s = name+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);
break;
}
++i;
} while(1);
}
}
}
@@ -409,23 +410,24 @@ QStringList MainWindow::collectHrtfs()
QStringList fnames = dir.entryList(QDir::Files | QDir::Readable, QDir::Name);
foreach(const QString &fname, fnames)
{
if(fname.endsWith(".mhr", Qt::CaseInsensitive))
if(!fname.endsWith(".mhr", Qt::CaseInsensitive))
continue;
QString name = fname.left(fname.length()-4);
if(!ret.contains(name))
ret.push_back(name);
else
{
if(!ret.contains(fname))
ret.push_back(fname.left(fname.length()-4));
else
{
size_t i = 1;
do {
QString s = fname.left(fname.length()-4)+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);
break;
}
++i;
} while(1);
}
size_t i = 1;
do {
QString s = name+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);
break;
}
++i;
} while(1);
}
}
}