Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 23:33:49 +01:00
Code Issues Releases Wiki Activity

Convert sampleCount <-> floating or -> long long explicitly ...

Browse Source 
... A non-narrowing conversion out to long long is a necessity, but the
conversions to float and double are simply conveniences.

Conversion from floating is explicit, to avoid unintended consequences with
arithmetic operators, when later sampleCount ceases to be an alias for an
integral type.

Some conversions are not made explicit, where I expect to change the type of
the variable later to have mere size_t width.
This commit is contained in:
Paul Licameli
2016-08-25 08:53:59 -04:00
parent 99dca62cff
commit 78be459fa1
53 changed files with 329 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/CrossFade.cpp
View File

@@ -60,7 +60,9 @@ bool CrossFader::GetSamples(samplePtr buffer, sampleFormat format,
bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount start, sampleCount len)
{
std::cout << "Crossfading from " << start << " to " << len+start << std::endl;
std::cout << "Crossfading from " << start.as_long_long()
<< " to " << ( len + start ).as_long_long()
<< std::endl;
// start refers to the position in the wave.
@@ -103,13 +105,23 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount
//it will be no longer than the clip itself.
clipLength[i] = tmpclip->GetNumSamples()-clipStart[i];
std::cout << "X:" << " " << clipLength[i] << " " << tmpclip->GetStartSample() << " ";
std::cout << "X:" << " "
<< clipLength[i].as_long_long()
<< " "
<< tmpclip->GetStartSample().as_long_long()
<< " ";
//if the buffer ends before the clip does, adjust the length
if(clipStart[i] + len < clipLength[i])
{
clipLength[i] = len + clipStart[i];
}
std::cout << clipStart[i] << " " << clipLength[i] << " " << clipLength[i] - clipStart[i] << std::endl;
std::cout
<< clipStart[i].as_long_long()
<< " "
<< clipLength[i].as_long_long()
<< " "
<< ( clipLength[i] - clipStart[i] ).as_long_long()
<< std::endl;
}
std::cout << "-------------\n";
@@ -143,7 +155,7 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount
{
// UNSAFE_SAMPLE_COUNT_TRUNCATION
// -- but class CrossFader is not used as of this writing
f += shortSeq[i][j+ clipStart[i]];
f += shortSeq[ i ][ j+ clipStart[i].as_long_long() ];
clips++;
}
@@ -193,7 +205,7 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount
{
// UNSAFE_SAMPLE_COUNT_TRUNCATION
// -- but class CrossFader is not used as of this writing
f+= intSeq[i][j+clipStart[i]];
f+= intSeq[ i ][ j + clipStart[ i ].as_long_long() ];
clips++;
}
@@ -242,10 +254,11 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount
// -- hey wait, you never even tried to initialize floatSeq,
// not even with bad casts!!!
// Subscripts out of bounds, bombs away!!!
f += floatSeq[i][j + clipStart[i]];
f += floatSeq[ i ][ ( j + clipStart[ i ] ).as_long_long() ];
clips++;
}
cout << f << " "<< i << " "<< floatSeq[i][j+clipStart[i]] << "|";
cout << f << " "<< i << " "
<< floatSeq[ i ][ j + clipStart[ i ].as_long_long() ] << "|";
}
if(clips == 0)
*dest = 0.0f;