Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

[dcpomatic.git] / src / wx / video_panel.h

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 2e394e4fc7af4b68aab25e7d97cad7b1c3894d22..686d1b99b32300e951013f947b08fa20ec1ceee5 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,27 @@
 
 */
 
+
 /** @file  src/lib/video_panel.h
  *  @brief VideoPanel class.
  */
 
+
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
+#include "lib/video_frame_type.h"
 
+
+class CheckBox;
+class wxButton;
 class wxChoice;
-class wxStaticText;
 class wxSpinCtrl;
-class wxButton;
+class wxStaticText;
 class wxToggleButton;
 
+
 /** @class VideoPanel
  *  @brief The video tab of the film editor.
  */
@@ -41,9 +47,10 @@ class VideoPanel : public ContentSubPanel
 public:
        explicit VideoPanel (ContentPanel *);
 
-       void film_changed (Film::Property);
-       void film_content_changed (int);
-       void content_selection_changed ();
+       void create () override;
+       void film_changed(FilmProperty) override;
+       void film_content_changed (int) override;
+       void content_selection_changed () override;
 
 private:
        void reference_clicked ();
@@ -52,7 +59,7 @@ private:
        void range_changed ();
        void fade_in_changed ();
        void fade_out_changed ();
-       void add_to_grid ();
+       void add_to_grid () override;
        void scale_fit_clicked ();
        void scale_custom_clicked ();
        bool scale_custom_edit_clicked ();
@@ -66,7 +73,7 @@ private:
        void setup_description ();
        void setup_sensitivity ();
 
-       wxCheckBox* _reference;
+       CheckBox* _reference;
        wxStaticText* _reference_note;
        wxStaticText* _type_label;
        ContentChoice<VideoContent, VideoFrameType>* _frame_type;