summaryrefslogtreecommitdiffstats
path: root/src/sound
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2021-05-11 16:37:42 +0200
committerMichele Calgaro <[email protected]>2021-05-12 10:47:32 +0900
commit1ee5b51a2493e7726692ba7b656aef32feca1f04 (patch)
treeb34507028ce7938cd7180b95e8182bfca8db36ef /src/sound
parent5c3d4da56026ebd496905033d10ceddbf819c0f9 (diff)
downloadrosegarden-1ee5b51a2493e7726692ba7b656aef32feca1f04.tar.gz
rosegarden-1ee5b51a2493e7726692ba7b656aef32feca1f04.zip
Fix ftbfs on Fedora 34
error: ISO C++17 does not allow dynamic exception specifications error: static assertion failed: comparison object must be invocable as const Signed-off-by: François Andriot <[email protected]> (cherry picked from commit 0e69dfe375f27c3610f0c5e5d88f423c4bcbfe6a)
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/AudioFileManager.cpp2
-rw-r--r--src/sound/AudioFileManager.h2
-rw-r--r--src/sound/SoundDriver.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 90291d5..0628c92 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -414,7 +414,7 @@ AudioFileManager::setAudioPath(const std::string &path)
}
void
-AudioFileManager::testAudioPath() throw (BadAudioPathException)
+AudioFileManager::testAudioPath()
{
TQFileInfo info(m_audioPath.c_str());
if (!(info.exists() && info.isDir() && !info.isRelative() &&
diff --git a/src/sound/AudioFileManager.h b/src/sound/AudioFileManager.h
index abbf2c0..e260c9f 100644
--- a/src/sound/AudioFileManager.h
+++ b/src/sound/AudioFileManager.h
@@ -165,7 +165,7 @@ public:
// Throw if the current audio path does not exist or is not writable
//
- void testAudioPath() throw(BadAudioPathException);
+ void testAudioPath();
// Get a new audio filename at the audio record path
//
diff --git a/src/sound/SoundDriver.h b/src/sound/SoundDriver.h
index 84df63f..d99076c 100644
--- a/src/sound/SoundDriver.h
+++ b/src/sound/SoundDriver.h
@@ -98,7 +98,7 @@ public:
struct NoteOffEventCmp
{
- bool operator()(NoteOffEvent *nO1, NoteOffEvent *nO2)
+ bool operator()(NoteOffEvent *nO1, NoteOffEvent *nO2) const
{
return nO1->getRealTime() < nO2->getRealTime();
}