diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-10 22:02:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-11 11:58:15 +0100 |
| commit | 23583dfb56181c76126e652042e9d1940367aa27 (patch) | |
| tree | e4e0711ea1b132aacee524e54014497ece5e9916 /src/tools | |
| parent | 2a0ad7979b208f84916b13f7a37998aa3701e371 (diff) | |
Partial split of film viewer.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 6 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 330935ba2..7392c830c 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -22,7 +22,7 @@ * @brief The main DCP-o-matic GUI. */ -#include "wx/film_viewer.h" +#include "wx/control_film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" #include "wx/full_config_dialog.h" @@ -317,7 +317,7 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _film_viewer = new FilmViewer (overall_panel); + _film_viewer = new ControlFilmViewer (overall_panel); _film_editor = new FilmEditor (overall_panel, _film_viewer); JobManagerView* job_manager_view = new JobManagerView (overall_panel, false); @@ -1307,7 +1307,7 @@ private: } FilmEditor* _film_editor; - FilmViewer* _film_viewer; + ControlFilmViewer* _film_viewer; VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 513a5c4e7..03ace74c9 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -26,6 +26,7 @@ #include "lib/dcp_content.h" #include "lib/job_manager.h" #include "lib/job.h" +#include "lib/film.h" #include "lib/video_content.h" #include "lib/text_content.h" #include "lib/ratio.h" @@ -38,7 +39,7 @@ #include "wx/wx_util.h" #include "wx/about_dialog.h" #include "wx/report_problem_dialog.h" -#include "wx/film_viewer.h" +#include "wx/control_film_viewer.h" #include "wx/player_information.h" #include "wx/update_dialog.h" #include "wx/player_config_dialog.h" @@ -150,7 +151,7 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _viewer = new FilmViewer (overall_panel, false, false); + _viewer = new ControlFilmViewer (overall_panel, false, false); _viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ()); _info = new PlayerInformation (overall_panel, _viewer); wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); @@ -648,7 +649,7 @@ private: int _history_items; int _history_position; wxMenuItem* _history_separator; - FilmViewer* _viewer; + ControlFilmViewer* _viewer; boost::shared_ptr<Film> _film; boost::signals2::scoped_connection _config_changed_connection; wxMenuItem* _file_add_ov; |