X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontrols.h;h=dfa11e6d74ecc67e8526d9f4c8f43760bfe7d4c6;hp=1c8474e54e067f763fd62db51f55a5844029ec9b;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hpb=45dcdd17c7f860e92d7b1d75598afea64c5fbc50

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 1c8474e54..dfa11e6d7 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -1,6 +1,30 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef DCPOMATIC_CONTROLS_H
+#define DCPOMATIC_CONTROLS_H
+
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
 #include "lib/film.h"
+#include "lib/spl.h"
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -11,17 +35,43 @@ class ClosedCaptionsDialog;
 class Content;
 class PlayerVideo;
 class wxToggleButton;
+class wxListCtrl;
+class ContentView;
+
+namespace dcp {
+	class CPL;
+}
 
 class Controls : public wxPanel
 {
 public:
-	Controls (wxWindow* parent, boost::shared_ptr<FilmViewer>, bool outline_content = true, bool jump_to_selected = true, bool eyes = true);
+	Controls (
+		wxWindow* parent,
+		boost::shared_ptr<FilmViewer>,
+		bool editor_controls = true
+		);
 
+	virtual void log (wxString) {}
+	virtual void set_film (boost::shared_ptr<Film> film);
 	boost::shared_ptr<Film> film () const;
 	void back_frame ();
 	void forward_frame ();
 
+protected:
+	virtual void started ();
+	virtual void stopped ();
+	virtual void setup_sensitivity ();
+	virtual void config_changed (int property);
+
+	wxSizer* _v_sizer;
+	wxBoxSizer* _button_sizer;
+	boost::shared_ptr<Film> _film;
+	wxSlider* _slider;
+	boost::shared_ptr<FilmViewer> _viewer;
+	boost::optional<std::string> _active_job;
+
 private:
+
 	void update_position_label ();
 	void update_position_slider ();
 	void rewind_clicked (wxMouseEvent &);
@@ -29,40 +79,34 @@ private:
 	void forward_clicked (wxKeyboardState &);
 	void slider_moved (bool page);
 	void slider_released ();
-	void play_clicked ();
 	void frame_number_clicked ();
 	void jump_to_selected_clicked ();
-	void setup_sensitivity ();
 	void timecode_clicked ();
-	void check_play_state ();
 	void active_jobs_changed (boost::optional<std::string>);
-	DCPTime nudge_amount (wxKeyboardState& ev);
+	dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
 	void image_changed (boost::weak_ptr<PlayerVideo>);
-	void film_change (ChangeType type, Film::Property p);
 	void outline_content_changed ();
 	void eye_changed ();
 	void position_changed ();
-	void started ();
-	void stopped ();
-	void film_changed ();
+	void film_change (ChangeType, Film::Property);
 
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<FilmViewer> _viewer;
+	typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
-	wxSizer* _v_sizer;
 	bool _slider_being_moved;
-	bool _was_running_before_slider;
 
 	wxCheckBox* _outline_content;
 	wxChoice* _eye;
 	wxCheckBox* _jump_to_selected;
-	wxSlider* _slider;
 	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;
 	wxStaticText* _frame_number;
 	wxStaticText* _timecode;
-	wxToggleButton* _play_button;
 
 	ClosedCaptionsDialog* _closed_captions_dialog;
+
+	boost::signals2::scoped_connection _film_change_connection;
+	boost::signals2::scoped_connection _config_changed_connection;
 };
+
+#endif