Merge pull request #259 from OpenShot/virtual-destructor-break

Removing duplicate destructor definitions and implementations
This commit is contained in:
Jonathan Thomas
2019-06-21 16:09:54 -05:00
committed by GitHub
6 changed files with 0 additions and 14 deletions

View File

@@ -63,8 +63,6 @@ namespace openshot {
/// @param max_bytes The maximum bytes to allow in the cache. Once exceeded, the cache will purge the oldest frames.
CacheBase(int64_t max_bytes);
virtual ~CacheBase();
/// @brief Add a Frame to the cache
/// @param frame The openshot::Frame object needing to be cached.
virtual void Add(std::shared_ptr<Frame> frame) = 0;

View File

@@ -72,7 +72,6 @@ namespace openshot {
/// Constructor for the base clip
ClipBase() { };
virtual ~ClipBase();
// Compare a clip using the Position() property
bool operator< ( ClipBase& a) { return (Position() < a.Position()); }

View File

@@ -110,8 +110,6 @@ namespace openshot
/// Constructor for the base reader, where many things are initialized.
ReaderBase();
virtual ~ReaderBase();
/// Information about the current media file
ReaderInfo info;

View File

@@ -45,9 +45,6 @@ CacheBase::CacheBase(int64_t max_bytes) : max_bytes(max_bytes) {
cacheCriticalSection = new CriticalSection();
};
CacheBase::~CacheBase() {
};
// Set maximum bytes to a different amount based on a ReaderInfo struct
void CacheBase::SetMaxBytesFromInfo(int64_t number_of_frames, int width, int height, int sample_rate, int channels)
{

View File

@@ -32,9 +32,6 @@
using namespace openshot;
ClipBase::~ClipBase() {
}
// Generate Json::JsonValue for this object
Json::Value ClipBase::JsonValue() {

View File

@@ -66,9 +66,6 @@ ReaderBase::ReaderBase()
parent = NULL;
}
ReaderBase::~ReaderBase() {
}
// Display file information
void ReaderBase::DisplayInfo() {
cout << fixed << setprecision(2) << boolalpha;