Probably-better approach to dual-screen; reparent the viewer into its own Frame.

3 files changed, 0 insertions, 86 deletions

diff --git a/src/wx/cinema_player_dialog.cc b/src/wx/cinema_player_dialog.cc
deleted file mode 100644
index 2df4cb9a5..000000000
--- a/src/wx/cinema_player_dialog.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    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/>.
-
-*/
-
-#include "cinema_player_dialog.h"
-#include "controls.h"
-#include "player_information.h"
-#include <boost/shared_ptr.hpp>
-
-using boost::shared_ptr;
-
-CinemaPlayerDialog::CinemaPlayerDialog (wxWindow* parent, shared_ptr<FilmViewer> viewer)
-	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Player"))
-{
-	_controls = new Controls (this, viewer, false, false, false);
-	_info = new PlayerInformation (this, viewer);
-
-	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-	s->Add (_controls, 0, wxEXPAND | wxALL, 6);
-	s->Add (_info, 0, wxEXPAND | wxALL, 6);
-
-	SetSize (640, -1);
-
-	SetSizer (s);
-}
-
-void
-CinemaPlayerDialog::triggered_update ()
-{
-	_info->triggered_update ();
-}
diff --git a/src/wx/cinema_player_dialog.h b/src/wx/cinema_player_dialog.h
deleted file mode 100644
index 1af8308ff..000000000
--- a/src/wx/cinema_player_dialog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    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/>.
-
-*/
-
-#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-
-class Controls;
-class PlayerInformation;
-class FilmViewer;
-
-class CinemaPlayerDialog : public wxDialog
-{
-public:
-	CinemaPlayerDialog (wxWindow* parent, boost::shared_ptr<FilmViewer> viewer);
-
-	void triggered_update ();
-
-private:
-	Controls* _controls;
-	PlayerInformation* _info;
-};
diff --git a/src/wx/wscript b/src/wx/wscript
index 0c9f0c731..ad0292a47 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -38,7 +38,6 @@ sources = """
           text_view.cc
           christie_certificate_panel.cc
           cinema_dialog.cc
-          cinema_player_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
           config_move_dialog.cc