More of Encoder can be private.

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 52ccfc166833f60a2e0e9a6efe4583092f15ad54..bd38dc6bdab58b0738bdb7141bfa9d437b5c95c7 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -85,11 +85,18 @@ public:
        bool skipping () const;
        SourceFrame video_frame () const;
 
-protected:
+private:
        
        void frame_done ();
        void frame_skipped ();
        
+       void close_sound_files ();
+       void write_audio (boost::shared_ptr<const AudioBuffers> audio);
+
+       void encoder_thread (ServerDescription *);
+       void terminate_worker_threads ();
+       void link (std::string, std::string) const;
+
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
        /** Options */
@@ -111,14 +118,6 @@ protected:
        /** Number of audio frames received so far */
        int64_t _audio_frame;
 
-private:
-       void close_sound_files ();
-       void write_audio (boost::shared_ptr<const AudioBuffers> audio);
-
-       void encoder_thread (ServerDescription *);
-       void terminate_worker_threads ();
-       void link (std::string, std::string) const;
-
 #if HAVE_SWRESAMPLE    
        SwrContext* _swr_context;
 #endif