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

Exclude the file extension from the HRTF name

Browse Source
This commit is contained in:
Chris Robinson
2016-02-24 04:21:03 -08:00
parent 93d73aae4d
commit d04970e568
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/hrtf.c
+9 -1
View File
@@ -514,6 +514,7 @@ static void AddFileEntry(vector_HrtfEntry *list, al_string *filename)
struct Hrtf *hrtf = NULL;
const HrtfEntry *iter;
const char *name;
const char *ext;
ALchar magic[8];
FILE *f;
int i;
@@ -575,10 +576,17 @@ static void AddFileEntry(vector_HrtfEntry *list, al_string *filename)
/* TODO: Get a human-readable name from the HRTF data (possibly coming in a
* format update). */
ext = strrchr(name, '.');
i = 0;
do {
al_string_copy_cstr(&entry.name, name);
if(!ext)
al_string_copy_cstr(&entry.name, name);
else
{
al_string_clear(&entry.name);
al_string_append_range(&entry.name, name, ext);
}
if(i != 0)
{
char str[64];
utils/alsoft-config/mainwindow.cpp
+4 -4
View File
@@ -359,12 +359,12 @@ QStringList MainWindow::collectHrtfs()
if(fname.endsWith(".mhr", Qt::CaseInsensitive))
{
if(!ret.contains(fname))
ret.push_back(fname);
ret.push_back(fname.left(fname.length()-4));
else
{
size_t i = 1;
do {
QString s = fname+" #"+QString::number(i);
QString s = fname.left(fname.length()-4)+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);
@@ -389,12 +389,12 @@ QStringList MainWindow::collectHrtfs()
if(fname.endsWith(".mhr", Qt::CaseInsensitive))
{
if(!ret.contains(fname))
ret.push_back(fname);
ret.push_back(fname.left(fname.length()-4));
else
{
size_t i = 1;
do {
QString s = fname+" #"+QString::number(i);
QString s = fname.left(fname.length()-4)+" #"+QString::number(i);
if(!ret.contains(s))
{
ret.push_back(s);