Rename control_film_viewer file.

5 files changed, 4 insertions, 72 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d7862a803..27113eeab 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -22,7 +22,7 @@
  *  @brief The main DCP-o-matic GUI.
  */
 
-#include "wx/control_film_viewer.h"
+#include "wx/controls.h"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index a8895e8e8..d8c3c59fe 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -28,7 +28,7 @@
 #include "wx/update_dialog.h"
 #include "wx/player_config_dialog.h"
 #include "wx/verify_dcp_dialog.h"
-#include "wx/control_film_viewer.h"
+#include "wx/controls.h"
 #include "lib/cross.h"
 #include "lib/config.h"
 #include "lib/util.h"
diff --git a/src/wx/control_film_viewer.h b/src/wx/control_film_viewer.h
deleted file mode 100644
index 1795612af..000000000
--- a/src/wx/control_film_viewer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "lib/dcpomatic_time.h"
-#include "lib/types.h"
-#include "lib/film.h"
-#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-
-class FilmViewer;
-class Film;
-class ClosedCaptionsDialog;
-class Content;
-class PlayerVideo;
-class wxToggleButton;
-
-class Controls : public wxPanel
-{
-public:
-	Controls (wxWindow* parent, boost::shared_ptr<FilmViewer>, bool outline_content = true, bool jump_to_selected = true);
-
-	boost::shared_ptr<Film> film () const;
-	void back_frame ();
-	void forward_frame ();
-
-private:
-	void update_position_label ();
-	void update_position_slider ();
-	void rewind_clicked (wxMouseEvent &);
-	void back_clicked (wxKeyboardState& s);
-	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);
-	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 ();
-
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<FilmViewer> _viewer;
-
-	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;
-};
diff --git a/src/wx/control_film_viewer.cc b/src/wx/controls.cc
index c0dc53d89..1bb3c4136 100644
--- a/src/wx/control_film_viewer.cc
+++ b/src/wx/controls.cc
@@ -1,4 +1,4 @@
-#include "control_film_viewer.h"
+#include "controls.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "playhead_to_timecode_dialog.h"
diff --git a/src/wx/wscript b/src/wx/wscript
index 4877a4106..ad0292a47 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -47,7 +47,7 @@ sources = """
           content_panel.cc
           content_properties_dialog.cc
           content_sub_panel.cc
-          control_film_viewer.cc
+          controls.cc
           closed_captions_dialog.cc
           dcp_panel.cc
           email_dialog.cc