summaryrefslogtreecommitdiff
path: root/src/picture_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 13:48:22 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 13:48:22 +0100
commit034abb6bb0f1d0382620bdcc43501ce0ba30b03a (patch)
tree862347349d48e3afae6190e60fbc2d0cfa88f23c /src/picture_asset.h
parent6322c72a13d7be2e991a8e0421414c0af8187b88 (diff)
Try to give basic progress indication on dcpdiff.
Diffstat (limited to 'src/picture_asset.h')
-rw-r--r--src/picture_asset.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/picture_asset.h b/src/picture_asset.h
index f4d4d7a4..c9226b1f 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -63,7 +63,7 @@ public:
*/
void write_to_cpl (std::ostream& s) const;
- bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (std::string)> note) const;
+ bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
Size size () const {
return _size;
@@ -72,7 +72,7 @@ public:
protected:
bool frame_buffer_equals (
- int frame, EqualityOptions opt, boost::function<void (std::string)> note,
+ int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
) const;
@@ -210,7 +210,7 @@ public:
boost::shared_ptr<MonoPictureAssetWriter> start_write (bool);
boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
- bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (std::string)> note) const;
+ bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
private:
std::string path_from_list (int f, std::vector<std::string> const & files) const;
@@ -224,7 +224,7 @@ public:
StereoPictureAsset (std::string directory, std::string mxf_name, int fps, int intrinsic_duration);
boost::shared_ptr<const StereoPictureFrame> get_frame (int n) const;
- bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (std::string)> note) const;
+ bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
};