projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide the upmixers unless an "advanced" configuration option is ticked.
[dcpomatic.git]
/
src
/
lib
/
image_content.h
diff --git
a/src/lib/image_content.h
b/src/lib/image_content.h
index a4968ea8b753937f11260c29c2a0c3edccf3065f..970a68d661271be3b567d714ec880cc55111527a 100644
(file)
--- a/
src/lib/image_content.h
+++ b/
src/lib/image_content.h
@@
-1,50
+1,59
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
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/>.
*/
#ifndef DCPOMATIC_IMAGE_CONTENT_H
#define DCPOMATIC_IMAGE_CONTENT_H
*/
#ifndef DCPOMATIC_IMAGE_CONTENT_H
#define DCPOMATIC_IMAGE_CONTENT_H
-#include "
video_
content.h"
+#include "content.h"
-class ImageContent : public
Video
Content
+class ImageContent : public Content
{
public:
{
public:
- ImageContent (boost::
shared_ptr<const Film>, boost::
filesystem::path);
- ImageContent (
boost::shared_ptr<const Film>,
cxml::ConstNodePtr, int);
+ ImageContent (boost::filesystem::path);
+ ImageContent (cxml::ConstNodePtr, int);
boost::shared_ptr<ImageContent> shared_from_this () {
return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
};
boost::shared_ptr<ImageContent> shared_from_this () {
return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
};
- void examine (boost::shared_ptr<Job>);
+ boost::shared_ptr<const ImageContent> shared_from_this () const {
+ return boost::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
+ };
+
+ void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
std::string summary () const;
std::string technical_summary () const;
- void as_xml (xmlpp::Node *) const;
- DCPTime full_length () const;
+ void as_xml (xmlpp::Node *, bool with_paths) const;
+ dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+ dcpomatic::DCPTime approximate_length () const;
std::string identifier () const;
std::string identifier () const;
- /* VideoContent */
void set_default_colour_conversion ();
void set_default_colour_conversion ();
- void set_video_length (Frame);
bool still () const;
bool still () const;
+
+private:
+ void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+
+ boost::optional<boost::filesystem::path> _path_to_scan;
};
#endif
};
#endif