projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
[dcpomatic.git]
/
src
/
lib
/
image_examiner.h
diff --git
a/src/lib/image_examiner.h
b/src/lib/image_examiner.h
index f5d5150749971c6f874880802e1da1ff09b96555..1917a23f399da90a47763d56b174c0008abf5586 100644
(file)
--- a/
src/lib/image_examiner.h
+++ b/
src/lib/image_examiner.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-30,15
+30,15
@@
class ImageExaminer : public VideoExaminer
public:
ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
public:
ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
-
float
video_frame_rate () const;
-
lib
dcp::Size video_size () const;
-
VideoFra
me video_length () const {
+
boost::optional<float>
video_frame_rate () const;
+ dcp::Size video_size () const;
+
ContentTi
me video_length () const {
return _video_length;
}
private:
boost::weak_ptr<const Film> _film;
boost::shared_ptr<const ImageContent> _image_content;
return _video_length;
}
private:
boost::weak_ptr<const Film> _film;
boost::shared_ptr<const ImageContent> _image_content;
- boost::optional<
lib
dcp::Size> _video_size;
-
VideoFra
me _video_length;
+ boost::optional<dcp::Size> _video_size;
+
ContentTi
me _video_length;
};
};