summaryrefslogtreecommitdiff
path: root/src/lib/j2k_encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-08 21:32:44 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-08 21:32:44 +0200
commit3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4 (patch)
tree9cac355432ba25cc3d43017382d73e0640f50996 /src/lib/j2k_encoder.h
parent00762c2d9a4240d016150cd7555aee3dad8542ae (diff)
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/j2k_encoder.h')
-rw-r--r--src/lib/j2k_encoder.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 98cca6ba2..06b4d429c 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2016 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_J2K_ENCODER_H
#define DCPOMATIC_J2K_ENCODER_H
+
/** @file src/j2k_encoder.h
* @brief J2KEncoder class.
*/
+
#include "util.h"
#include "cross.h"
#include "event_history.h"
@@ -37,6 +40,7 @@
#include <list>
#include <stdint.h>
+
class Film;
class EncodeServerDescription;
class DCPVideo;
@@ -44,13 +48,13 @@ class Writer;
class Job;
class PlayerVideo;
+
/** @class J2KEncoder
* @brief Class to manage encoding to J2K.
*
* This class keeps a queue of frames to be encoded and distributes
* the work around threads and encoding servers.
*/
-
class J2KEncoder : public boost::noncopyable, public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
{
public:
@@ -89,7 +93,7 @@ private:
std::shared_ptr<boost::thread_group> _threads;
mutable boost::mutex _queue_mutex;
- std::list<std::shared_ptr<DCPVideo> > _queue;
+ std::list<std::shared_ptr<DCPVideo>> _queue;
/** condition to manage thread wakeups when we have nothing to do */
boost::condition _empty_condition;
/** condition to manage thread wakeups when we have too much to do */
@@ -104,4 +108,5 @@ private:
boost::signals2::scoped_connection _server_found_connection;
};
+
#endif