projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix code and tests so that SubtitleString::v_position is between 0 and 1 (not a perce...
[libdcp.git]
/
src
/
reel_asset.h
diff --git
a/src/reel_asset.h
b/src/reel_asset.h
index 93f6fe91d810ee4c45b060760a8ebfaa5d51d116..6db621ccf0b90c073dbfb6a6423eae2f49dfec2d 100644
(file)
--- a/
src/reel_asset.h
+++ b/
src/reel_asset.h
@@
-52,15
+52,7
@@
public:
ReelAsset (boost::shared_ptr<const cxml::Node>);
virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const;
ReelAsset (boost::shared_ptr<const cxml::Node>);
virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const;
-
- virtual bool equals (
- boost::shared_ptr<const ReelAsset>,
- EqualityOptions,
- boost::function<void (NoteType, std::string)>)
- const {
-
- return false;
- }
+ virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
/** @return a Ref to our actual content */
Ref<Content>& content () {
/** @return a Ref to our actual content */
Ref<Content>& content () {
@@
-84,7
+76,7
@@
protected:
/** @return Any attribute that should be used on the asset's node in the
* CPL.
*/
/** @return Any attribute that should be used on the asset's node in the
* CPL.
*/
- virtual std::pair<std::string, std::string> cpl_node_attribute () const;
+ virtual std::pair<std::string, std::string> cpl_node_attribute (
Standard
) const;
/** Reference to the content (MXF or XML file) that this reel entry
* applies to.
/** Reference to the content (MXF or XML file) that this reel entry
* applies to.