projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[dcpomatic.git]
/
src
/
lib
/
dcp_encoder.h
diff --git
a/src/lib/dcp_encoder.h
b/src/lib/dcp_encoder.h
index 65782d968c2580c2bde0d2a7e4b6b4cca227dad2..3d00e6e9fc2e284ac25413a0817753c9780dfd28 100644
(file)
--- a/
src/lib/dcp_encoder.h
+++ b/
src/lib/dcp_encoder.h
@@
-18,20
+18,23
@@
*/
*/
+
#include "atmos_metadata.h"
#include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
#include "dcp_text_track.h"
#include "encoder.h"
#include "dcp_text_track.h"
#include "encoder.h"
+#include "player_text.h"
+#include "types.h"
#include <dcp/atmos_frame.h>
#include <dcp/atmos_frame.h>
+
+class AudioBuffers;
class Film;
class J2KEncoder;
class Film;
class J2KEncoder;
-class Player;
-class Writer;
class Job;
class Job;
+class Player;
class PlayerVideo;
class PlayerVideo;
-class AudioBuffers;
+class Writer;
+
/** @class DCPEncoder */
class DCPEncoder : public Encoder
/** @class DCPEncoder */
class DCPEncoder : public Encoder
@@
-40,13
+43,13
@@
public:
DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
~DCPEncoder ();
DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
~DCPEncoder ();
- void go ();
+ void go ()
override
;
- boost::optional<float> current_rate () const;
- Frame frames_done () const;
+ boost::optional<float> current_rate () const
override
;
+ Frame frames_done () const
override
;
/** @return true if we are in the process of calling Encoder::process_end */
/** @return true if we are in the process of calling Encoder::process_end */
- bool finishing () const {
+ bool finishing () const
override
{
return _finishing;
}
return _finishing;
}