projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix windows build
[dcpomatic.git]
/
src
/
lib
/
image_content.h
diff --git
a/src/lib/image_content.h
b/src/lib/image_content.h
index 6db24767d5af5850a418444f204f69b896bb6f5b..67ea466dfb146f79537d58d5c64aeccdc90b2444 100644
(file)
--- a/
src/lib/image_content.h
+++ b/
src/lib/image_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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
@@
-20,18
+20,13
@@
#ifndef DCPOMATIC_IMAGE_CONTENT_H
#define DCPOMATIC_IMAGE_CONTENT_H
#ifndef DCPOMATIC_IMAGE_CONTENT_H
#define DCPOMATIC_IMAGE_CONTENT_H
-#include <boost/enable_shared_from_this.hpp>
#include "video_content.h"
#include "video_content.h"
-namespace cxml {
- class Node;
-}
-
class ImageContent : public VideoContent
{
public:
ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
class ImageContent : public VideoContent
{
public:
ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
- ImageContent (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>
, int);
+ 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 ());
@@
-44,8
+39,11
@@
public:
DCPTime full_length () const;
std::string identifier () const;
DCPTime full_length () const;
std::string identifier () const;
-
- void set_video_length (ContentTime);
+
+ /* VideoContent */
+ void set_default_colour_conversion ();
+
+ void set_video_length (Frame);
bool still () const;
void set_video_frame_rate (float);
};
bool still () const;
void set_video_frame_rate (float);
};