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

Fixes for clang build with 64 bit unsigned long

Browse Source
This commit is contained in:
Paul Licameli 2017-03-30 10:46:44 -04:00
parent 82f909fe31
commit 1a86819b4b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/audacity/Types.h
View File

@ -70,7 +70,9 @@ public:
sampleCount ( int v ) : value { v } {} sampleCount ( int v ) : value { v } {}
sampleCount ( unsigned v ) : value { v } {} sampleCount ( unsigned v ) : value { v } {}
sampleCount ( long v ) : value { v } {} sampleCount ( long v ) : value { v } {}
sampleCount ( unsigned long v ) : value { v } {}
// unsigned long is 64 bit on some platforms. Let it narrow.
sampleCount ( unsigned long v ) : value ( v ) {}
// Beware implicit conversions from floating point values! // Beware implicit conversions from floating point values!
// Otherwise the meaning of binary operators with sampleCount change // Otherwise the meaning of binary operators with sampleCount change

2
src/Mix.cpp
View File

@ -255,7 +255,7 @@ Mixer::Mixer(const WaveTrackConstArray &inputTracks,
, mQueueMaxLen{ 65536 } , mQueueMaxLen{ 65536 }
, mSampleQueue{ mNumInputTracks, mQueueMaxLen } , mSampleQueue{ mNumInputTracks, mQueueMaxLen }
, mNumChannels{ static_cast<size_t>(numOutChannels) } , mNumChannels{ numOutChannels }
, mGains{ mNumChannels } , mGains{ mNumChannels }
, mMayThrow{ mayThrow } , mMayThrow{ mayThrow }