diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
| commit | 2e93ca3670e5581b5523f60130b38594de10d6c3 (patch) | |
| tree | 6ed18ed07bccf77b2d172ef7681fce981956815f /src/asset.h | |
| parent | 9ed550de7b98ca2f8467dd134a9c0ad7f1868f23 (diff) | |
| parent | 447cc7ddec5ace7bb47df35192ef02e7c19bf9b3 (diff) | |
Merge master; MXF subtitle stuff not included.
Diffstat (limited to 'src/asset.h')
| -rw-r--r-- | src/asset.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/asset.h b/src/asset.h index 57143310..bad982f1 100644 --- a/src/asset.h +++ b/src/asset.h @@ -62,8 +62,9 @@ public: /** Write details of the asset to a PKL AssetList node. * @param node Parent node. + * @param standard Standard to use. */ - void write_to_pkl (xmlpp::Node* node) const; + void write_to_pkl (xmlpp::Node* node, Standard standard) const; boost::filesystem::path file () const { return _file; @@ -75,7 +76,7 @@ public: std::string hash (boost::function<void (float)> progress = 0) const; protected: - virtual std::string pkl_type () const = 0; + virtual std::string pkl_type (Standard standard) const = 0; /** The disk file that represents this asset, if one exists */ mutable boost::filesystem::path _file; |