Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-13 15:17:42 +02:00
Code Issues Releases Wiki Activity

Uniform init in blockfile ctors (prevents implicit narrowings)

Browse Source
This commit is contained in:
Paul Licameli 2016-08-22 18:13:23 -04:00
parent 477d8d9d1d
commit 367ed1dfce
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BlockFile.cpp
View File

@ -542,7 +542,7 @@ AliasBlockFile::AliasBlockFile(wxFileNameWrapper &&existingSummaryFileName,
sampleCount aliasLen, sampleCount aliasLen,
int aliasChannel, int aliasChannel,
float min, float max, float rms): float min, float max, float rms):
BlockFile(std::move(existingSummaryFileName), aliasLen), BlockFile{ std::move(existingSummaryFileName), aliasLen },
mAliasedFileName(std::move(aliasedFileName)), mAliasedFileName(std::move(aliasedFileName)),
mAliasStart(aliasStart), mAliasStart(aliasStart),
mAliasChannel(aliasChannel) mAliasChannel(aliasChannel)

4
src/blockfile/LegacyAliasBlockFile.cpp
View File

@ -27,8 +27,8 @@ LegacyAliasBlockFile::LegacyAliasBlockFile(wxFileNameWrapper &&fileName,
int aliasChannel, int aliasChannel,
sampleCount summaryLen, sampleCount summaryLen,
bool noRMS) bool noRMS)
: PCMAliasBlockFile(std::move(fileName), std::move(aliasedFileName), aliasStart, aliasLen, : PCMAliasBlockFile{ std::move(fileName), std::move(aliasedFileName), aliasStart, aliasLen,
aliasChannel, 0.0, 0.0, 0.0) aliasChannel, 0.0, 0.0, 0.0 }
{ {
sampleFormat format; sampleFormat format;

2
src/blockfile/LegacyBlockFile.cpp
View File

@ -131,7 +131,7 @@ LegacyBlockFile::LegacyBlockFile(wxFileNameWrapper &&existingFile,
sampleCount summaryLen, sampleCount summaryLen,
sampleCount len, sampleCount len,
bool noRMS): bool noRMS):
BlockFile(std::move(existingFile), len), BlockFile{ std::move(existingFile), len },
mFormat(format) mFormat(format)
{ {

7
src/blockfile/ODDecodeBlockFile.cpp
View File

@ -38,8 +38,9 @@ char bheaderTag[bheaderTagLen + 1] = "AudacityBlockFile112";
/// Create a disk file and write summary and sample data to it /// Create a disk file and write summary and sample data to it
ODDecodeBlockFile::ODDecodeBlockFile(wxFileNameWrapper &&baseFileName, wxFileNameWrapper &&audioFileName, sampleCount aliasStart, ODDecodeBlockFile::ODDecodeBlockFile(wxFileNameWrapper &&baseFileName, wxFileNameWrapper &&audioFileName, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel,unsigned int decodeType): sampleCount aliasLen, int aliasChannel,unsigned int decodeType):
SimpleBlockFile(std::move(baseFileName), SimpleBlockFile{ std::move(baseFileName),
NULL,aliasLen,floatSample,true,true), //floatSample has no effect. last two bools - bypass writing of blockfile and cache NULL, aliasLen, floatSample, true, true },
//floatSample has no effect. last two bools - bypass writing of blockfile and cache
mType(decodeType), mType(decodeType),
mAliasStart(aliasStart), mAliasStart(aliasStart),
@ -55,7 +56,7 @@ ODDecodeBlockFile::ODDecodeBlockFile(wxFileNameWrapper &&baseFileName, wxFileNam
ODDecodeBlockFile::ODDecodeBlockFile(wxFileNameWrapper &&existingFile, wxFileNameWrapper &&audioFileName, sampleCount aliasStart, ODDecodeBlockFile::ODDecodeBlockFile(wxFileNameWrapper &&existingFile, wxFileNameWrapper &&audioFileName, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel, unsigned int decodeType, sampleCount aliasLen, int aliasChannel, unsigned int decodeType,
float min, float max, float rms, bool dataAvailable): float min, float max, float rms, bool dataAvailable):
SimpleBlockFile(std::move(existingFile),aliasLen,min,max,rms), SimpleBlockFile{ std::move(existingFile), aliasLen, min, max, rms },
mType(decodeType), mType(decodeType),
mAliasStart(aliasStart), mAliasStart(aliasStart),

4
src/blockfile/ODPCMAliasBlockFile.cpp
View File

@ -49,8 +49,8 @@ ODPCMAliasBlockFile::ODPCMAliasBlockFile(
wxFileNameWrapper &&aliasedFileName, wxFileNameWrapper &&aliasedFileName,
sampleCount aliasStart, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel) sampleCount aliasLen, int aliasChannel)
: PCMAliasBlockFile(std::move(fileName), std::move(aliasedFileName), : PCMAliasBlockFile { std::move(fileName), std::move(aliasedFileName),
aliasStart, aliasLen, aliasChannel,false) aliasStart, aliasLen, aliasChannel, false }
{ {
mSummaryAvailable = mSummaryBeingComputed = mHasBeenSaved = false; mSummaryAvailable = mSummaryBeingComputed = mHasBeenSaved = false;
} }

14
src/blockfile/PCMAliasBlockFile.cpp
View File

@ -32,8 +32,8 @@ PCMAliasBlockFile::PCMAliasBlockFile(
wxFileNameWrapper &&aliasedFileName, wxFileNameWrapper &&aliasedFileName,
sampleCount aliasStart, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel) sampleCount aliasLen, int aliasChannel)
: AliasBlockFile(std::move(fileName), std::move(aliasedFileName), : AliasBlockFile{ std::move(fileName), std::move(aliasedFileName),
aliasStart, aliasLen, aliasChannel) aliasStart, aliasLen, aliasChannel }
{ {
AliasBlockFile::WriteSummary(); AliasBlockFile::WriteSummary();
} }
@ -43,8 +43,8 @@ PCMAliasBlockFile::PCMAliasBlockFile(
wxFileNameWrapper&& aliasedFileName, wxFileNameWrapper&& aliasedFileName,
sampleCount aliasStart, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel,bool writeSummary) sampleCount aliasLen, int aliasChannel,bool writeSummary)
: AliasBlockFile(std::move(fileName), std::move(aliasedFileName), : AliasBlockFile{ std::move(fileName), std::move(aliasedFileName),
aliasStart, aliasLen, aliasChannel) aliasStart, aliasLen, aliasChannel }
{ {
if(writeSummary) if(writeSummary)
AliasBlockFile::WriteSummary(); AliasBlockFile::WriteSummary();
@ -56,9 +56,9 @@ PCMAliasBlockFile::PCMAliasBlockFile(
sampleCount aliasStart, sampleCount aliasStart,
sampleCount aliasLen, int aliasChannel, sampleCount aliasLen, int aliasChannel,
float min, float max, float rms) float min, float max, float rms)
: AliasBlockFile(std::move(existingSummaryFileName), std::move(aliasedFileName), : AliasBlockFile{ std::move(existingSummaryFileName), std::move(aliasedFileName),
aliasStart, aliasLen, aliasStart, aliasLen,
aliasChannel, min, max, rms) aliasChannel, min, max, rms }
{ {
} }

2
src/blockfile/SilentBlockFile.cpp
View File

@ -13,7 +13,7 @@
#include "../FileFormats.h" #include "../FileFormats.h"
SilentBlockFile::SilentBlockFile(sampleCount sampleLen): SilentBlockFile::SilentBlockFile(sampleCount sampleLen):
BlockFile(wxFileNameWrapper{}, sampleLen) BlockFile{ wxFileNameWrapper{}, sampleLen }
{ {
mMin = 0.; mMin = 0.;
mMax = 0.; mMax = 0.;

2
src/blockfile/SimpleBlockFile.cpp
View File

@ -141,7 +141,7 @@ SimpleBlockFile::SimpleBlockFile(wxFileNameWrapper &&baseFileName,
/// @param existingFile The disk file this SimpleBlockFile should use. /// @param existingFile The disk file this SimpleBlockFile should use.
SimpleBlockFile::SimpleBlockFile(wxFileNameWrapper &&existingFile, sampleCount len, SimpleBlockFile::SimpleBlockFile(wxFileNameWrapper &&existingFile, sampleCount len,
float min, float max, float rms): float min, float max, float rms):
BlockFile(std::move(existingFile), len) BlockFile{ std::move(existingFile), len }
{ {
// Set an invalid format to force GetSpaceUsage() to read it from the file. // Set an invalid format to force GetSpaceUsage() to read it from the file.
mFormat = (sampleFormat) 0; mFormat = (sampleFormat) 0;