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

Downgrade some ERRs to WARNs or TRACEs

Browse Source
This commit is contained in:
Chris Robinson
2016-03-15 04:02:25 -07:00
parent 066df88a2c
commit 64cb21cb9f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ambdec.c
+9 -8
View File
@@ -154,15 +154,15 @@ static int load_speakers(AmbDecConf *conf, FILE *f, char **buffer, size_t *maxle
const char *elev = my_strtok_r(NULL, " \t", saveptr);
const char *conn = my_strtok_r(NULL, " \t", saveptr);
if(!name) ERR("Name not specified for speaker %u\n", cur+1);
if(!name) WARN("Name not specified for speaker %u\n", cur+1);
else al_string_copy_cstr(&conf->Speakers[cur].Name, name);
if(!dist) ERR("Distance not specified for speaker %u\n", cur+1);
if(!dist) WARN("Distance not specified for speaker %u\n", cur+1);
else read_float(&conf->Speakers[cur].Distance, dist);
if(!az) ERR("Azimuth not specified for speaker %u\n", cur+1);
if(!az) WARN("Azimuth not specified for speaker %u\n", cur+1);
else read_float(&conf->Speakers[cur].Azimuth, az);
if(!elev) ERR("Elevation not specified for speaker %u\n", cur+1);
if(!elev) WARN("Elevation not specified for speaker %u\n", cur+1);
else read_float(&conf->Speakers[cur].Elevation, elev);
if(!conn) ERR("Connection not specified for speaker %u\n", cur+1);
if(!conn) TRACE("Connection not specified for speaker %u\n", cur+1);
else al_string_copy_cstr(&conf->Speakers[cur].Connection, conn);
cur++;
}
@@ -296,6 +296,7 @@ int ambdec_load(AmbDecConf *conf, const char *fname)
{
char *buffer = NULL;
size_t maxlen = 0;
char *line;
FILE *f;
f = al_fopen(fname, "r");
@@ -305,12 +306,12 @@ int ambdec_load(AmbDecConf *conf, const char *fname)
return 0;
}
while(read_clipped_line(f, &buffer, &maxlen))
while((line=read_clipped_line(f, &buffer, &maxlen)) != NULL)
{
char *line, *saveptr;
char *saveptr;
char *command;
command = my_strtok_r(buffer, "/ \t", &saveptr);
command = my_strtok_r(line, "/ \t", &saveptr);
if(!command)
{
ERR("Malformed line: %s\n", line);