projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted tidying.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index 242f69477826a499d915505cd0b9486808aba68d..067a247208f31b05f7c7cc4f1f6722b1deed09ba 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-1,46
+1,47
@@
/*
/*
- Copyright (C) 2012-20
13
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "video_decoder.h"
-namespace Magick {
- class Image;
-}
+#include "decoder.h"
+
class ImageContent;
class ImageContent;
+class Log;
+class ImageProxy;
+
-class ImageDecoder : public
Video
Decoder
+class ImageDecoder : public Decoder
{
public:
{
public:
- ImageDecoder (
boost
::shared_ptr<const ImageContent> c);
+ ImageDecoder (
std::shared_ptr<const Film> film, std
::shared_ptr<const ImageContent> c);
-
boost
::shared_ptr<const ImageContent> content () {
+
std
::shared_ptr<const ImageContent> content () {
return _image_content;
}
return _image_content;
}
- void seek (ContentTime, bool);
+ bool pass () override;
+ void seek (dcpomatic::ContentTime, bool) override;
private:
private:
- bool pass ();
-
- boost::shared_ptr<const ImageContent> _image_content;
- boost::shared_ptr<ImageProxy> _image;
- VideoFrame _video_position;
-};
+ std::shared_ptr<const ImageContent> _image_content;
+ std::shared_ptr<ImageProxy> _image;
+ Frame _frame_video_position = 0;
+};