Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-31 14:13:50 +01:00
Code Issues Releases Wiki Activity

lib-src/portsmf: extra parens around intentional if/while assignments

Browse Source
This commit is contained in:
Paul Licameli
2018-07-23 15:44:59 -04:00
parent 263fbff02c
commit a4f9de784a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib-src/portsmf/allegrord.cpp
View File

@@ -116,19 +116,19 @@ Alg_parameters_ptr Alg_reader::process_attributes(
if (attributes) { if (attributes) {
Alg_parameters_ptr a; Alg_parameters_ptr a;
bool in_seconds = seq->get_units_are_seconds(); bool in_seconds = seq->get_units_are_seconds();
if (a = Alg_parameters::remove_key(&attributes, "tempor")) { if ((a = Alg_parameters::remove_key(&attributes, "tempor"))) {
double tempo = a->parm.r; double tempo = a->parm.r;
seq->insert_tempo(tempo, seq->get_time_map()->time_to_beat(time)); seq->insert_tempo(tempo, seq->get_time_map()->time_to_beat(time));
} }
if (a = Alg_parameters::remove_key(&attributes, "beatr")) { if ((a = Alg_parameters::remove_key(&attributes, "beatr"))) {
double beat = a->parm.r; double beat = a->parm.r;
seq->insert_beat(time, beat); seq->insert_beat(time, beat);
} }
if (a = Alg_parameters::remove_key(&attributes, "timesig_numr")) { if ((a = Alg_parameters::remove_key(&attributes, "timesig_numr"))) {
tsnum = a->parm.r; tsnum = a->parm.r;
ts_flag = true; ts_flag = true;
} }
if (a = Alg_parameters::remove_key(&attributes, "timesig_denr")) { if ((a = Alg_parameters::remove_key(&attributes, "timesig_denr"))) {
tsden = a->parm.r; tsden = a->parm.r;
ts_flag = true; ts_flag = true;
} }
@@ -426,7 +426,7 @@ long Alg_reader::parse_chan(string &field)
const char *p = int_string; const char *p = int_string;
char c; char c;
// check that all chars in int_string are digits or '-': // check that all chars in int_string are digits or '-':
while (c = *p++) { while ((c = *p++)) {
if (!isdigit(c) && c != '-') { if (!isdigit(c) && c != '-') {
parse_error(field, p - field.c_str() - 1, msg); parse_error(field, p - field.c_str() - 1, msg);
return 0; return 0;
@@ -453,7 +453,7 @@ long Alg_reader::parse_int(string &field)
const char *p = int_string; const char *p = int_string;
char c; char c;
// check that all chars in int_string are digits: // check that all chars in int_string are digits:
while (c = *p++) { while ((c = *p++)) {
if (!isdigit(c)) { if (!isdigit(c)) {
parse_error(field, p - field.c_str() - 1, msg); parse_error(field, p - field.c_str() - 1, msg);
return 0; return 0;
@@ -535,7 +535,7 @@ double Alg_reader::parse_dur(string &field, double base)
// convert dur from seconds to beats // convert dur from seconds to beats
dur = seq->get_time_map()->time_to_beat(base + dur) - dur = seq->get_time_map()->time_to_beat(base + dur) -
seq->get_time_map()->time_to_beat(base); seq->get_time_map()->time_to_beat(base);
} else if (p = strchr(durs, toupper(field[1]))) { } else if ((p = strchr(durs, toupper(field[1])))) {
dur = duration_lookup[p - durs]; dur = duration_lookup[p - durs];
last = 2; last = 2;
} else { } else {
@@ -620,7 +620,7 @@ long Alg_reader::parse_key(string &field)
// This routine would not have been called if field = "P<number>" // This routine would not have been called if field = "P<number>"
// so it must be "K<number>" so <number> must be an integer. // so it must be "K<number>" so <number> must be an integer.
return parse_int(field); return parse_int(field);
} else if (p = strchr(pitches, toupper(field[1]))) { } else if ((p = strchr(pitches, toupper(field[1])))) {
long key = key_lookup[p - pitches]; long key = key_lookup[p - pitches];
key = parse_after_key(key, field, 2); key = parse_after_key(key, field, 2);
return key; return key;