projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion about subtitle codec pointers.
[dcpomatic.git]
/
src
/
lib
/
image_content.h
diff --git
a/src/lib/image_content.h
b/src/lib/image_content.h
index 3da7827252ffde805e8cddbdefb94c4682e08053..a1b1437c811fb391154b222466b7fa22a27b5258 100644
(file)
--- a/
src/lib/image_content.h
+++ b/
src/lib/image_content.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
@@
-31,7
+31,7
@@
class ImageContent : public VideoContent
{
public:
ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
{
public:
ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
- ImageContent (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>
);
+ ImageContent (boost::shared_ptr<const Film>,
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 ());
@@
-41,12
+41,13
@@
public:
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;
- Time full_length () const;
+
DCP
Time full_length () const;
std::string identifier () const;
std::string identifier () const;
- void set_video_length (
VideoContent::Fra
me);
+ void set_video_length (
ContentTi
me);
bool still () const;
bool still () const;
+ void set_video_frame_rate (float);
};
#endif
};
#endif