diff options
| author | Chris Robinson <[email protected]> | 2017-04-04 06:58:53 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2017-04-04 06:58:53 -0700 |
| commit | 26144ca9dffd935c3e7499b417ccb9a6ef93eea0 (patch) | |
| tree | cc2cf8d930485be834d9f1d3f78e76825a7c4838 /Alc/ambdec.c | |
| parent | b78ddc7ef7bd145a3468e520e9bc4be5c551a952 (diff) | |
Rename al_string_* functions to alstr_*
Diffstat (limited to 'Alc/ambdec.c')
| -rw-r--r-- | Alc/ambdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Alc/ambdec.c b/Alc/ambdec.c index 719b509c..da114335 100644 --- a/Alc/ambdec.c +++ b/Alc/ambdec.c @@ -164,7 +164,7 @@ static int load_ambdec_speakers(AmbDecConf *conf, FILE *f, char **buffer, size_t const char *conn = my_strtok_r(NULL, " \t", saveptr); if(!name) WARN("Name not specified for speaker %u\n", cur+1); - else al_string_copy_cstr(&conf->Speakers[cur].Name, name); + else alstr_copy_cstr(&conf->Speakers[cur].Name, name); if(!dist) WARN("Distance not specified for speaker %u\n", cur+1); else read_float(&conf->Speakers[cur].Distance, dist); if(!az) WARN("Azimuth not specified for speaker %u\n", cur+1); @@ -172,7 +172,7 @@ static int load_ambdec_speakers(AmbDecConf *conf, FILE *f, char **buffer, size_t if(!elev) WARN("Elevation not specified for speaker %u\n", cur+1); else read_float(&conf->Speakers[cur].Elevation, elev); if(!conn) TRACE("Connection not specified for speaker %u\n", cur+1); - else al_string_copy_cstr(&conf->Speakers[cur].Connection, conn); + else alstr_copy_cstr(&conf->Speakers[cur].Connection, conn); cur++; } @@ -293,11 +293,11 @@ void ambdec_deinit(AmbDecConf *conf) { ALsizei i; - al_string_deinit(&conf->Description); + alstr_reset(&conf->Description); for(i = 0;i < MAX_OUTPUT_CHANNELS;i++) { - al_string_deinit(&conf->Speakers[i].Name); - al_string_deinit(&conf->Speakers[i].Connection); + alstr_reset(&conf->Speakers[i].Name); + alstr_reset(&conf->Speakers[i].Connection); } memset(conf, 0, sizeof(*conf)); } @@ -331,7 +331,7 @@ int ambdec_load(AmbDecConf *conf, const char *fname) if(strcmp(command, "description") == 0) { char *value = my_strtok_r(NULL, "", &saveptr); - al_string_copy_cstr(&conf->Description, lstrip(value)); + alstr_copy_cstr(&conf->Description, lstrip(value)); } else if(strcmp(command, "version") == 0) { |