summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/dcp_video.h2
-rw-r--r--src/lib/player_video.h20
2 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 5d8b9b720..8efd680a2 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -42,7 +42,7 @@ class PlayerVideo;
class DCPVideo : public boost::noncopyable
{
public:
- DCPVideo (std::shared_ptr<const PlayerVideo>, int, int, int, Resolution);
+ DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
dcp::ArrayData encode_locally ();
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index faf5d6832..569789c8c 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -45,17 +45,17 @@ class PlayerVideo : public boost::noncopyable
{
public:
PlayerVideo (
- std::shared_ptr<const ImageProxy>,
- Crop,
- boost::optional<double>,
- dcp::Size,
- dcp::Size,
- Eyes,
- Part,
- boost::optional<ColourConversion>,
+ std::shared_ptr<const ImageProxy> image,
+ Crop crop,
+ boost::optional<double> fade,
+ dcp::Size inter_size,
+ dcp::Size out_size,
+ Eyes eyes,
+ Part part,
+ boost::optional<ColourConversion> colour_conversion,
VideoRange video_range,
- std::weak_ptr<Content>,
- boost::optional<Frame>,
+ std::weak_ptr<Content> content,
+ boost::optional<Frame> video_frame,
bool error
);