From d87ea0504297c0bb6bd3bd192588d0f3e927fee9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jan 2013 23:41:52 +0000 Subject: More of Encoder can be private. --- src/lib/encoder.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/lib/encoder.h') diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 52ccfc166..bd38dc6bd 100644 --- 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 audio); + + void encoder_thread (ServerDescription *); + void terminate_worker_threads (); + void link (std::string, std::string) const; + /** Film that we are encoding */ boost::shared_ptr _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 audio); - - void encoder_thread (ServerDescription *); - void terminate_worker_threads (); - void link (std::string, std::string) const; - #if HAVE_SWRESAMPLE SwrContext* _swr_context; #endif -- cgit v1.2.3