summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-07-05 15:21:45 +0200
committerCarl Hetherington <cth@carlh.net>2021-07-05 15:22:56 +0200
commitbe436f229587905e89ac768b3c57b0e983cfe7fa (patch)
tree52e8b7c6aec084d599f0cd141c8ad4f7f154f33a /src/lib
parent34e5ddc254c0a12224cb985e440a2ab7075b532a (diff)
C++11 tidying.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 8fc02d9c6..daade1d7b 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -18,26 +18,30 @@
*/
+
#ifndef DCPOMATIC_PLAYER_H
#define DCPOMATIC_PLAYER_H
-#include "atmos_metadata.h"
-#include "player_text.h"
+
#include "active_text.h"
-#include "content_text.h"
-#include "film.h"
+#include "atmos_metadata.h"
+#include "audio_merger.h"
+#include "audio_stream.h"
#include "content.h"
#include "content_atmos.h"
-#include "position_image.h"
-#include "piece.h"
-#include "content_video.h"
#include "content_audio.h"
-#include "audio_stream.h"
-#include "audio_merger.h"
+#include "content_text.h"
+#include "content_video.h"
#include "empty.h"
+#include "film.h"
+#include "piece.h"
+#include "player_text.h"
+#include "position_image.h"
+#include "shuffler.h"
#include <boost/atomic.hpp>
#include <list>
+
namespace dcp {
class ReelAsset;
}
@@ -53,6 +57,7 @@ class AudioBuffers;
class ReferencedReelAsset;
class Shuffler;
+
class PlayerProperty
{
public:
@@ -64,6 +69,7 @@ public:
static int const PLAYBACK_LENGTH;
};
+
/** @class Player
* @brief A class which can play a Playlist.
*/