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

Avoid moving istringstreams

Browse Source 
Doesn't work with GCC 4.x. Hopefully swapping does.
This commit is contained in:
Chris Robinson 2018-11-04 19:11:07 -08:00
parent 4dafb7dab1
commit 9fa31fcd07
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Alc/ambdec.cpp
View File

@ -71,7 +71,7 @@ bool load_ambdec_speakers(AmbDecConf *conf, std::istream &f, std::string &buffer
{
std::istringstream istr{buffer};
std::string cmd = read_word(istr);
std::string cmd{read_word(istr)};
if(cmd.empty())
{
if(!read_clipped_line(f, buffer))
@ -79,8 +79,7 @@ bool load_ambdec_speakers(AmbDecConf *conf, std::istream &f, std::string &buffer
ERR("Unexpected end of file\n");
return false;
}
istr = std::istringstream{buffer};
cmd = read_word(istr);
continue;
}
if(cmd == "add_spkr")
@ -124,9 +123,8 @@ bool load_ambdec_matrix(ALfloat *gains, ALfloat (*matrix)[MAX_AMBI_COEFFS], ALsi
while(cur < maxrow)
{
std::istringstream istr{buffer};
std::string cmd;
istr >> cmd;
std::string cmd{read_word(istr)};
if(cmd.empty())
{
if(!read_clipped_line(f, buffer))
@ -134,8 +132,7 @@ bool load_ambdec_matrix(ALfloat *gains, ALfloat (*matrix)[MAX_AMBI_COEFFS], ALsi
ERR("Unexpected end of file\n");
return false;
}
istr = std::istringstream{buffer};
istr >> cmd;
continue;
}
if(cmd == "order_gain")
@ -219,9 +216,8 @@ int AmbDecConf::load(const char *fname)
while(read_clipped_line(f, buffer))
{
std::istringstream istr{buffer};
std::string command;
istr >> command;
std::string command{read_word(istr)};
if(command.empty())
{
ERR("Malformed line: %s\n", buffer.c_str());
@ -335,13 +331,14 @@ int AmbDecConf::load(const char *fname)
ERR("Unexpected end of file\n");
return 0;
}
istr = std::istringstream{buffer};
std::string endmark = read_word(istr);
std::istringstream istr2{buffer};
std::string endmark{read_word(istr2)};
if(endmark != "/}")
{
ERR("Expected /} after speaker definitions, got %s\n", endmark.c_str());
return 0;
}
istr.swap(istr2);
}
else if(command == "/lfmatrix/{" || command == "/hfmatrix/{" || command == "/matrix/{")
{
@ -387,13 +384,14 @@ int AmbDecConf::load(const char *fname)
ERR("Unexpected end of file\n");
return 0;
}
istr = std::istringstream{buffer};
std::string endmark = read_word(istr);
std::istringstream istr2{buffer};
std::string endmark{read_word(istr2)};
if(endmark != "/}")
{
ERR("Expected /} after matrix definitions, got %s\n", endmark.c_str());
return 0;
}
istr.swap(istr2);
}
else if(command == "/end")
{