projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
player_video.h
diff --git
a/src/lib/player_video.h
b/src/lib/player_video.h
index e9d260972824b10e58c3a4a71e2b2388b8bf97a3..610a7526cb26090d582e647fff99ca3518a9d035 100644
(file)
--- a/
src/lib/player_video.h
+++ b/
src/lib/player_video.h
@@
-50,7
+50,7
@@
public:
Scaler const *,
Eyes,
Part,
Scaler const *,
Eyes,
Part,
- ColourConversion
+ boost::optional<ColourConversion>
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
@@
-73,7
+73,7
@@
public:
return _eyes;
}
return _eyes;
}
-
ColourConversion
colour_conversion () const {
+
boost::optional<ColourConversion>
colour_conversion () const {
return _colour_conversion;
}
return _colour_conversion;
}
@@
-97,6
+97,6
@@
private:
Scaler const * _scaler;
Eyes _eyes;
Part _part;
Scaler const * _scaler;
Eyes _eyes;
Part _part;
-
ColourConversion
_colour_conversion;
+
boost::optional<ColourConversion>
_colour_conversion;
PositionImage _subtitle;
};
PositionImage _subtitle;
};