summaryrefslogtreecommitdiff
path: root/src/lib/encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-07-03 22:35:30 +0200
committerCarl Hetherington <cth@carlh.net>2021-07-03 22:35:30 +0200
commit2d4e8c5f69cc694625ad95dcee554499605f823b (patch)
treedb816ca461a0b45d6be27a1ce37b8a03dac16f3f /src/lib/encoder.h
parent16e560c3815b52609de103b45c1d5d2cbf155b97 (diff)
C++11 tidying.
Diffstat (limited to 'src/lib/encoder.h')
-rw-r--r--src/lib/encoder.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 1403e75b2..19c1120b3 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -18,13 +18,16 @@
*/
+
#ifndef DCPOMATIC_ENCODER_H
#define DCPOMATIC_ENCODER_H
-#include "types.h"
+
#include "player_text.h"
+#include "types.h"
#include <boost/signals2.hpp>
+
class Film;
class Encoder;
class Player;
@@ -32,6 +35,7 @@ class Job;
class PlayerVideo;
class AudioBuffers;
+
/** @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 boost::optional<float>();
+ return {};
}
/** @return the number of frames that are done */
@@ -61,4 +65,5 @@ protected:
std::shared_ptr<Player> _player;
};
+
#endif