Formatting, variable name tidying and some const correctness.

[dcpomatic.git] / src / lib / j2k_encoder.h

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index a3ea9f3e8684bd52c46a65c5b39024b74b206fca..1d31274b3f545741f323ada3c37152a7fa4af951 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -70,8 +70,8 @@ public:
        /** Called to pass a bit of video to be encoded as the next DCP frame */
        void encode (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
-       void pause(void);
-       void resume(void);
+       void pause();
+       void resume();
 
        /** Called when a processing run has finished */
        void end (bool isFinal);
@@ -111,8 +111,8 @@ private:
 
        boost::signals2::scoped_connection _server_found_connection;
 
-       grk_plugin::DcpomaticContext dcpomaticContext_;
-       grk_plugin::GrokContext *context_;
+       grk_plugin::DcpomaticContext _dcpomatic_context;
+       grk_plugin::GrokContext *_context;
 };