oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

CrossFade: use nullptr instead of NULL

This commit is contained in:
Max Kellermann 2013-10-26 13:16:10 +02:00
parent 3ac7de7a22
commit e898400fbd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CrossFade.cxx
View File

@ -45,7 +45,7 @@ strtok_r(char *str, const char *delim, gcc_unused char **saveptr)
static float mixramp_interpolate(char *ramp_list, float required_db) static float mixramp_interpolate(char *ramp_list, float required_db)
{ {
float db, secs, last_db = nan(""), last_secs = 0; float db, secs, last_db = nan(""), last_secs = 0;
char *ramp_str, *save_str = NULL; char *ramp_str, *save_str = nullptr;
/* ramp_list is a string of pairs of dBs and seconds that describe the /* ramp_list is a string of pairs of dBs and seconds that describe the
* volume profile. Delimiters are semi-colons between pairs and spaces * volume profile. Delimiters are semi-colons between pairs and spaces
@ -57,19 +57,19 @@ static float mixramp_interpolate(char *ramp_list, float required_db)
ramp_str = strtok_r(ramp_list, " ", &save_str); ramp_str = strtok_r(ramp_list, " ", &save_str);
/* Tell strtok to continue next time round. */ /* Tell strtok to continue next time round. */
ramp_list = NULL; ramp_list = nullptr;
/* Parse the dB value. */ /* Parse the dB value. */
if (NULL == ramp_str) { if (nullptr == ramp_str)
return nan(""); return nan("");
}
db = (float)atof(ramp_str); db = (float)atof(ramp_str);
/* Parse the time. */ /* Parse the time. */
ramp_str = strtok_r(NULL, ";", &save_str); ramp_str = strtok_r(nullptr, ";", &save_str);
if (NULL == ramp_str) { if (nullptr == ramp_str)
return nan(""); return nan("");
}
secs = (float)atof(ramp_str); secs = (float)atof(ramp_str);
/* Check for exact match. */ /* Check for exact match. */