summaryrefslogtreecommitdiff
path: root/src/content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-27 14:41:33 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-27 14:41:33 +0000
commit8c2f3517e868078b551bb01d975f2956cb692fbf (patch)
tree81bf98f00b9a267a73494c1939c6e9473559c85e /src/content.h
parente5d368553b47a566a83d4edce0a8f166db9509e6 (diff)
Various tinkerings.
Diffstat (limited to 'src/content.h')
-rw-r--r--src/content.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/content.h b/src/content.h
index 57aaa14c..e7445d47 100644
--- a/src/content.h
+++ b/src/content.h
@@ -53,9 +53,14 @@ class Content : public Asset
public:
Content (boost::filesystem::path file);
Content (Fraction edit_rate);
-
virtual ~Content () {}
+ bool equals (
+ boost::shared_ptr<const Content> other,
+ EqualityOptions opt,
+ boost::function<void (NoteType, std::string)>
+ ) const;
+
Fraction edit_rate () const {
return _edit_rate;
}
@@ -64,8 +69,6 @@ public:
return _intrinsic_duration;
}
- virtual bool equals (boost::shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, std::string)>) const;
-
protected:
friend class MXFWriter;