Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Bug 2351 - Selection toolbar displays incorrect number of samples beyond 2^31 -1

Browse Source
This commit is contained in:
Leland Lucius 2021-02-13 12:42:41 -06:00
parent 8fdb18427e
commit d21b13a8e1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/NumericTextCtrl.cpp
View File

@ -1019,7 +1019,7 @@ void NumericConverter::ValueToControls(double rawValue, bool nearest /* = true *
} }
for(i = 0; i < mFields.size(); i++) { for(i = 0; i < mFields.size(); i++) {
int value = -1; long long value = -1;
if (mFields[i].frac) { if (mFields[i].frac) {
// JKC: This old code looks bogus to me. // JKC: This old code looks bogus to me.
@ -1027,7 +1027,7 @@ void NumericConverter::ValueToControls(double rawValue, bool nearest /* = true *
//value = (int)(t_frac * mFields[i].base + 0.5); // +0.5 as rounding required //value = (int)(t_frac * mFields[i].base + 0.5); // +0.5 as rounding required
// I did the rounding earlier. // I did the rounding earlier.
if (t_frac >= 0) if (t_frac >= 0)
value = (int)(t_frac * mFields[i].base); value = t_frac * mFields[i].base;
// JKC: TODO: Find out what the range is supposed to do. // JKC: TODO: Find out what the range is supposed to do.
// It looks bogus too. // It looks bogus too.
//if (mFields[i].range > 0) //if (mFields[i].range > 0)
@ -1035,9 +1035,7 @@ void NumericConverter::ValueToControls(double rawValue, bool nearest /* = true *
} }
else { else {
if (t_int >= 0) { if (t_int >= 0) {
// UNSAFE_SAMPLE_COUNT_TRUNCATION value = t_int.as_long_long() / mFields[i].base;
// truncation danger!
value = (t_int.as_long_long() / mFields[i].base);
if (mFields[i].range > 0) if (mFields[i].range > 0)
value = value % mFields[i].range; value = value % mFields[i].range;
} }
@ -1049,7 +1047,7 @@ void NumericConverter::ValueToControls(double rawValue, bool nearest /* = true *
field += wxT("-"); field += wxT("-");
} }
else else
field = wxString::Format(mFields[i].formatStr, value); field = wxString::Format(mFields[i].formatStr, (int) value);
mValueString += field; mValueString += field;
mValueString += mFields[i].label; mValueString += mFields[i].label;
} }