projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
j2k_encoder.h
diff --git
a/src/lib/j2k_encoder.h
b/src/lib/j2k_encoder.h
index 2180f3f6afd0625c20f436186febed35ec2e1c95..01cf0605e0c1692e113d07fc8fef59c952f840ef 100644
(file)
--- a/
src/lib/j2k_encoder.h
+++ b/
src/lib/j2k_encoder.h
@@
-63,7
+63,7
@@
public:
void begin ();
/** Called to pass a bit of video to be encoded as the next DCP frame */
void begin ();
/** Called to pass a bit of video to be encoded as the next DCP frame */
- void encode (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+ void encode (boost::shared_ptr<PlayerVideo> pv,
dcpomatic::
DCPTime time);
/** Called when a processing run has finished */
void end ();
/** Called when a processing run has finished */
void end ();
@@
-101,7
+101,7
@@
private:
Waker _waker;
boost::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
Waker _waker;
boost::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
- boost::optional<DCPTime> _last_player_video_time;
+ boost::optional<
dcpomatic::
DCPTime> _last_player_video_time;
boost::signals2::scoped_connection _server_found_connection;
};
boost::signals2::scoped_connection _server_found_connection;
};