diff --git a/include/CacheBase.h b/include/CacheBase.h index af24b153..12108680 100644 --- a/include/CacheBase.h +++ b/include/CacheBase.h @@ -114,6 +114,7 @@ namespace openshot { virtual void SetJson(string value) = 0; ///< Load JSON string into this object virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object + virtual ~CacheBase() = default; }; diff --git a/include/ClipBase.h b/include/ClipBase.h index adbf11ef..05f2747e 100644 --- a/include/ClipBase.h +++ b/include/ClipBase.h @@ -105,6 +105,7 @@ namespace openshot { /// of all properties at any time) virtual string PropertiesJSON(int64_t requested_frame) = 0; + virtual ~ClipBase() = default; }; diff --git a/include/EffectBase.h b/include/EffectBase.h index cd39c272..430c66bd 100644 --- a/include/EffectBase.h +++ b/include/EffectBase.h @@ -108,6 +108,7 @@ namespace openshot /// Set the order that this effect should be executed. void Order(int new_order) { order = new_order; } + virtual ~EffectBase() = default; }; } diff --git a/include/PlayerBase.h b/include/PlayerBase.h index ecc8f5f2..f017c3f2 100644 --- a/include/PlayerBase.h +++ b/include/PlayerBase.h @@ -107,6 +107,7 @@ namespace openshot /// Set the Volume (1.0 = normal volume, <1.0 = quieter, >1.0 louder) virtual void Volume(float new_volume) = 0; + virtual ~PlayerBase() = default; }; } diff --git a/include/ReaderBase.h b/include/ReaderBase.h index 4579ebb6..b2e8f19e 100644 --- a/include/ReaderBase.h +++ b/include/ReaderBase.h @@ -152,6 +152,8 @@ namespace openshot /// Open the reader (and start consuming resources, such as images or video files) virtual void Open() = 0; + + virtual ~ReaderBase() = default; }; } diff --git a/include/WriterBase.h b/include/WriterBase.h index e03263ed..7620da64 100644 --- a/include/WriterBase.h +++ b/include/WriterBase.h @@ -119,6 +119,8 @@ namespace openshot /// Open the writer (and start initializing streams) virtual void Open() = 0; + + virtual ~WriterBase() = default; }; } diff --git a/src/AudioResampler.cpp b/src/AudioResampler.cpp index 3aafb75d..d9c5a609 100644 --- a/src/AudioResampler.cpp +++ b/src/AudioResampler.cpp @@ -77,9 +77,9 @@ AudioResampler::~AudioResampler() void AudioResampler::SetBuffer(AudioSampleBuffer *new_buffer, double sample_rate, double new_sample_rate) { if (sample_rate <= 0) - sample_rate == 44100; + sample_rate = 44100; if (new_sample_rate <= 0) - new_sample_rate == 44100; + new_sample_rate = 44100; // Set the sample ratio (the ratio of sample rate change) source_ratio = sample_rate / new_sample_rate; diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp index 71b785fa..31393d17 100644 --- a/src/KeyFrame.cpp +++ b/src/KeyFrame.cpp @@ -786,7 +786,7 @@ void Keyframe::ProcessSegment(int Segment, Point p1, Point p2) { // Add new value to the vector Coordinate new_coord(current_frame, current_value); - if (Segment == 0 || Segment > 0 && current_frame > p1.co.X) + if (Segment == 0 || (Segment > 0 && current_frame > p1.co.X)) // Add to "values" vector Values.push_back(new_coord); diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index 4ed258a0..833664c8 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -220,7 +220,7 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame) } // Scale image smaller (or use a previous scaled image) - if (!cached_image || (cached_image && max_size.width() != max_width || max_size.height() != max_height)) { + if (!cached_image || (max_size.width() != max_width || max_size.height() != max_height)) { #if USE_RESVG == 1 // If defined and found in CMake, utilize the libresvg for parsing // SVG files and rasterizing them to QImages.