projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 1403e75b2d4f7691d6da67c69d7472b24e96d94a..19c1120b360f789fd8af1ef76ccf85a97e494337 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,13
+18,16
@@
*/
*/
+
#ifndef DCPOMATIC_ENCODER_H
#define DCPOMATIC_ENCODER_H
#ifndef DCPOMATIC_ENCODER_H
#define DCPOMATIC_ENCODER_H
-#include "types.h"
+
#include "player_text.h"
#include "player_text.h"
+#include "types.h"
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class Film;
class Encoder;
class Player;
class Film;
class Encoder;
class Player;
@@
-32,6
+35,7
@@
class Job;
class PlayerVideo;
class AudioBuffers;
class PlayerVideo;
class AudioBuffers;
+
/** @class Encoder
* @brief Parent class for something that can encode a film into some format
*/
/** @class Encoder
* @brief Parent class for something that can encode a film into some format
*/
@@
-48,7
+52,7
@@
public:
/** @return the current frame rate over the last short while */
virtual boost::optional<float> current_rate () const {
/** @return the current frame rate over the last short while */
virtual boost::optional<float> current_rate () const {
- return
boost::optional<float>()
;
+ return
{}
;
}
/** @return the number of frames that are done */
}
/** @return the number of frames that are done */
@@
-61,4
+65,5
@@
protected:
std::shared_ptr<Player> _player;
};
std::shared_ptr<Player> _player;
};
+
#endif
#endif