From 795e5d916707da498acc7079ae1fb10aa6af6973 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Jun 2016 15:02:15 +0100 Subject: Encoder shutdown fixes. Two fixes here; prevent the servers-list-changed callback being called when Encoder is being destroyed, and stop ~Encoder throwing exceptions. I'm not sure if the catch (...) in ~Encoder will hide problems that we should be handling, but I think by the time ~Encoder is happening we'll already have seen any exceptions that we need to report. --- src/lib/encoder.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib/encoder.h') diff --git a/src/lib/encoder.h b/src/lib/encoder.h index b188e3be3..5816fe12f 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -51,7 +52,7 @@ class PlayerVideo; * the work around threads and encoding servers. */ -class Encoder : public boost::noncopyable, public ExceptionStore +class Encoder : public boost::noncopyable, public ExceptionStore, public boost::enable_shared_from_this { public: Encoder (boost::shared_ptr, boost::shared_ptr); @@ -69,13 +70,16 @@ public: float current_encoding_rate () const; int video_frames_enqueued () const; + void servers_list_changed (); + private: + static void call_servers_list_changed (boost::weak_ptr encoder); + void frame_done (); void encoder_thread (boost::optional); void terminate_threads (); - void servers_list_changed (); /** Film that we are encoding */ boost::shared_ptr _film; -- cgit v1.2.3