sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #632 from paulfd/noexcept-compile-error

Browse source 
Corrected a compile error on gcc 9.3
This commit is contained in:
Paul Ferrand 2021-02-12 10:03:37 +01:00 • committed by GitHub
commit da41ed5076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sfizz/Logger.cpp
View file

@ -102,7 +102,11 @@ void sfz::Logger::logCallbackTime(const CallbackBreakdown& breakdown, int numVoi
if (!loggingEnabled) if (!loggingEnabled)
return; return;
callbackTimeQueue.try_push<CallbackTime>({ breakdown, numVoices, numSamples }); CallbackTime callbackTime;
callbackTime.breakdown = breakdown;
callbackTime.numVoices = numVoices;
callbackTime.numSamples = numSamples;
callbackTimeQueue.try_push(callbackTime);
} }
void sfz::Logger::logFileTime(std::chrono::duration<double> waitDuration, std::chrono::duration<double> loadDuration, uint32_t fileSize, absl::string_view filename) void sfz::Logger::logFileTime(std::chrono::duration<double> waitDuration, std::chrono::duration<double> loadDuration, uint32_t fileSize, absl::string_view filename)
@ -110,7 +114,12 @@ void sfz::Logger::logFileTime(std::chrono::duration<double> waitDuration, std::c
if (!loggingEnabled) if (!loggingEnabled)
return; return;
fileTimeQueue.try_push<FileTime>({ waitDuration, loadDuration, fileSize, filename }); FileTime fileTime;
fileTime.waitDuration = waitDuration;
fileTime.loadDuration = loadDuration;
fileTime.fileSize = fileSize;
fileTime.filename = filename;
fileTimeQueue.try_push(fileTime);
} }
void sfz::Logger::setPrefix(absl::string_view prefix) void sfz::Logger::setPrefix(absl::string_view prefix)

14
src/sfizz/Logger.h
View file

@ -48,13 +48,6 @@ struct ScopedTiming
struct FileTime struct FileTime
{ {
FileTime() = default;
FileTime(Duration waitDuration, Duration loadDuration, uint32_t fileSize, absl::string_view filename)
: waitDuration(waitDuration), loadDuration(loadDuration), fileSize(fileSize), filename(filename) { }
FileTime(const FileTime&) = default;
FileTime& operator=(const FileTime&) = default;
FileTime(FileTime&&) = default;
FileTime& operator=(FileTime&&) = default;
Duration waitDuration { 0 }; Duration waitDuration { 0 };
Duration loadDuration { 0 }; Duration loadDuration { 0 };
uint32_t fileSize { 0 }; uint32_t fileSize { 0 };
@ -76,13 +69,6 @@ struct CallbackBreakdown
struct CallbackTime struct CallbackTime
{ {
CallbackTime() = default;
CallbackTime(const CallbackBreakdown& breakdown, int numVoices, size_t numSamples)
: breakdown(breakdown), numVoices(numVoices), numSamples(numSamples) { }
CallbackTime(const CallbackTime&) = default;
CallbackTime& operator=(const CallbackTime&) = default;
CallbackTime(CallbackTime&&) = default;
CallbackTime& operator=(CallbackTime&&) = default;
CallbackBreakdown breakdown {}; CallbackBreakdown breakdown {};
int numVoices { 0 }; int numVoices { 0 };
size_t numSamples { 0 }; size_t numSamples { 0 };

8
tests/SynthT.cpp
View file

@ -515,10 +515,10 @@ TEST_CASE("[Synth] veltrack")
}; };
const VeltrackData veltrackdata[] = { const VeltrackData veltrackdata[] = {
{ 25, veldata25 }, { 25, absl::MakeConstSpan(veldata25) },
{ 50, veldata50 }, { 50, absl::MakeConstSpan(veldata50) },
{ 75, veldata75 }, { 75, absl::MakeConstSpan(veldata75) },
{ 100, veldata100 }, { 100, absl::MakeConstSpan(veldata100) },
}; };
for (const VeltrackData& vt : veltrackdata) { for (const VeltrackData& vt : veltrackdata) {