X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.h;h=75bae9bb3877635f50e02f27aa67fdb48baca83f;hb=964cfede2ccf10f8af2c9dd83f24f790020c6162;hp=bd87d658b62d9ba81eee8c854f95e595ab3ed094;hpb=d0d89009ad0acca0ddfa43dc45d8ac4186c5fc21;p=dcpomatic.git

diff --git a/src/wx/controls.h b/src/wx/controls.h
index bd87d658b..75bae9bb3 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,40 +18,75 @@
 
 */
 
+
+#ifndef DCPOMATIC_CONTROLS_H
+#define DCPOMATIC_CONTROLS_H
+
+
+#include "lib/change_signaller.h"
 #include "lib/dcpomatic_time.h"
-#include "lib/types.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
-class FilmViewer;
-class Film;
+
+class CheckBox;
 class ClosedCaptionsDialog;
 class Content;
+class ContentView;
+class Film;
+class FilmViewer;
+class MarkersPanel;
 class PlayerVideo;
-class wxToggleButton;
+
 class wxListCtrl;
+class wxToggleButton;
+
+
+namespace dcp {
+	class CPL;
+}
+
 
 class Controls : public wxPanel
 {
 public:
 	Controls (
 		wxWindow* parent,
-		boost::shared_ptr<FilmViewer>,
+		FilmViewer &,
 		bool editor_controls = true
 		);
 
-	boost::shared_ptr<Film> film () const;
+	void set_film (std::shared_ptr<Film> film);
+
+	virtual void play () {};
+	virtual void stop () {};
+	void seek (int slider);
+
+	std::shared_ptr<Film> film () const;
 	void back_frame ();
 	void forward_frame ();
 
-	void show_extended_player_controls (bool s);
+protected:
 
-	boost::signals2::signal<void (boost::filesystem::path)> DCPDirectorySelected;
-	boost::signals2::signal<void ()> DCPEjected;
+	virtual void started ();
+	virtual void stopped ();
+	virtual void setup_sensitivity ();
+	virtual void config_changed (int property);
+
+	wxSizer* _v_sizer;
+	wxBoxSizer* _button_sizer;
+	std::shared_ptr<Film> _film;
+	MarkersPanel* _markers;
+	wxSlider* _slider;
+	FilmViewer& _viewer;
+	boost::optional<std::string> _active_job;
 
 private:
+
 	void update_position_label ();
 	void update_position_slider ();
 	void rewind_clicked (wxMouseEvent &);
@@ -59,61 +94,37 @@ 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 ();
-#ifndef DCPOMATIC_PLAYER_SWAROOP
-	void check_play_state ();
-#endif
 	void active_jobs_changed (boost::optional<std::string>);
-	DCPTime nudge_amount (wxKeyboardState& ev);
-	void image_changed (boost::weak_ptr<PlayerVideo>);
-	void film_change (ChangeType type, Film::Property p);
+	dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
+	void image_changed (std::weak_ptr<PlayerVideo>);
 	void outline_content_changed ();
 	void eye_changed ();
-	void position_changed ();
-	void started ();
-	void stopped ();
-	void film_changed ();
-	void update_dcp_directory ();
-	void dcp_directory_changed ();
-	void dcp_directory_selected ();
-	void config_changed (int property);
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	void pause_clicked ();
-	void stop_clicked ();
-#endif
+	void update_position ();
+	void film_change(ChangeType, FilmProperty);
 
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<FilmViewer> _viewer;
+	typedef std::pair<std::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;
-	wxListCtrl* _dcp_directory;
-	std::vector<boost::filesystem::path> _dcp_directories;
-	wxSlider* _slider;
+	bool _slider_being_moved = false;
+
+	CheckBox* _outline_content = nullptr;
+	wxChoice* _eye = nullptr;
+	CheckBox* _jump_to_selected = nullptr;
 	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;
 	wxStaticText* _frame_number;
 	wxStaticText* _timecode;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	wxButton* _play_button;
-	wxButton* _pause_button;
-	wxButton* _stop_button;
-#else
-	wxToggleButton* _play_button;
-#endif
-	boost::optional<std::string> _active_job;
 
 	ClosedCaptionsDialog* _closed_captions_dialog;
 
+	wxTimer _timer;
+
+	boost::signals2::scoped_connection _film_change_connection;
 	boost::signals2::scoped_connection _config_changed_connection;
 };
+
+
+#endif