From 3e777653620a9261c35319fae64b3aa0eb83cdd4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 20 Feb 2020 11:25:25 +0100 Subject: Audaspace: Various fixes - Fixed uninitialized result used in DynamicMusic::seek(). The comment to this function says false is returned if the handle is invalid, while in practice non-initialized value will be returned. - Spelling typos in comment. - Silence -Wdelete-non-abstract-non-virtual-dtor warning. Differential Revision: https://developer.blender.org/D6896 --- extern/audaspace/include/devices/IDevice.h | 6 +++--- extern/audaspace/include/devices/IDeviceFactory.h | 2 ++ extern/audaspace/include/file/IFileInput.h | 2 ++ extern/audaspace/src/fx/DynamicMusic.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'extern/audaspace') diff --git a/extern/audaspace/include/devices/IDevice.h b/extern/audaspace/include/devices/IDevice.h index 92a85d900e2..b9414e7d187 100644 --- a/extern/audaspace/include/devices/IDevice.h +++ b/extern/audaspace/include/devices/IDevice.h @@ -37,10 +37,10 @@ class ISynchronizer; /** * @interface IDevice * The IDevice interface represents an output device for sound sources. - * Output devices may be several backends such as plattform independand like - * SDL or OpenAL or plattform specific like ALSA, but they may also be + * Output devices may be several backends such as platform independand like + * SDL or OpenAL or platform specific like ALSA, but they may also be * files, RAM buffers or other types of streams. - * \warning Thread safety must be insured so that no reader is beeing called + * \warning Thread safety must be insured so that no reader is being called * twice at the same time. */ class IDevice : public ILockable diff --git a/extern/audaspace/include/devices/IDeviceFactory.h b/extern/audaspace/include/devices/IDeviceFactory.h index 6a0f4537b13..7023cc058c5 100644 --- a/extern/audaspace/include/devices/IDeviceFactory.h +++ b/extern/audaspace/include/devices/IDeviceFactory.h @@ -35,6 +35,8 @@ AUD_NAMESPACE_BEGIN class AUD_API IDeviceFactory { public: + virtual ~IDeviceFactory() {} + /** * Opens an audio device for playback. * \exception Exception Thrown if the audio device cannot be opened. diff --git a/extern/audaspace/include/file/IFileInput.h b/extern/audaspace/include/file/IFileInput.h index bb016a88602..aec929e7639 100644 --- a/extern/audaspace/include/file/IFileInput.h +++ b/extern/audaspace/include/file/IFileInput.h @@ -40,6 +40,8 @@ class Buffer; class AUD_API IFileInput { public: + virtual ~IFileInput() {}; + /** * Creates a reader for a file to be read. * \param filename Path to the file to be read. diff --git a/extern/audaspace/src/fx/DynamicMusic.cpp b/extern/audaspace/src/fx/DynamicMusic.cpp index c682108378f..b8f5c975b3f 100644 --- a/extern/audaspace/src/fx/DynamicMusic.cpp +++ b/extern/audaspace/src/fx/DynamicMusic.cpp @@ -171,7 +171,7 @@ bool DynamicMusic::pause() bool DynamicMusic::seek(float position) { - bool result; + bool result = false; if(m_currentHandle != nullptr) { -- cgit v1.2.3