Skip to content

Commit f2b98e8

Browse files
authored
Merge pull request #259 from OpenShot/virtual-destructor-break
Removing duplicate destructor definitions and implementations
2 parents ffb5439 + ac8876f commit f2b98e8

File tree

6 files changed

+0
-14
lines changed

6 files changed

+0
-14
lines changed

include/CacheBase.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ namespace openshot {
6363
/// @param max_bytes The maximum bytes to allow in the cache. Once exceeded, the cache will purge the oldest frames.
6464
CacheBase(int64_t max_bytes);
6565

66-
virtual ~CacheBase();
67-
6866
/// @brief Add a Frame to the cache
6967
/// @param frame The openshot::Frame object needing to be cached.
7068
virtual void Add(std::shared_ptr<Frame> frame) = 0;

include/ClipBase.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ namespace openshot {
7272

7373
/// Constructor for the base clip
7474
ClipBase() { };
75-
virtual ~ClipBase();
7675

7776
// Compare a clip using the Position() property
7877
bool operator< ( ClipBase& a) { return (Position() < a.Position()); }

include/ReaderBase.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ namespace openshot
110110
/// Constructor for the base reader, where many things are initialized.
111111
ReaderBase();
112112

113-
virtual ~ReaderBase();
114-
115113
/// Information about the current media file
116114
ReaderInfo info;
117115

src/CacheBase.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ CacheBase::CacheBase(int64_t max_bytes) : max_bytes(max_bytes) {
4545
cacheCriticalSection = new CriticalSection();
4646
};
4747

48-
CacheBase::~CacheBase() {
49-
};
50-
5148
// Set maximum bytes to a different amount based on a ReaderInfo struct
5249
void CacheBase::SetMaxBytesFromInfo(int64_t number_of_frames, int width, int height, int sample_rate, int channels)
5350
{

src/ClipBase.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232

3333
using namespace openshot;
3434

35-
ClipBase::~ClipBase() {
36-
}
37-
3835
// Generate Json::JsonValue for this object
3936
Json::Value ClipBase::JsonValue() {
4037

src/ReaderBase.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ ReaderBase::ReaderBase()
6666
parent = NULL;
6767
}
6868

69-
ReaderBase::~ReaderBase() {
70-
}
71-
7269
// Display file information
7370
void ReaderBase::DisplayInfo() {
7471
cout << fixed << setprecision(2) << boolalpha;

0 commit comments

Comments
 (0)