projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix system information on vsync.
[dcpomatic.git]
/
src
/
wx
/
screens_panel.h
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index a982b8a2d4ff32bb02efed656c828150958f2939..510297efb67a285e2bc06b722042b3e90519182d 100644
(file)
--- a/
src/wx/screens_panel.h
+++ b/
src/wx/screens_panel.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ 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.
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.
-
This program
is distributed in the hope that it will be useful,
+
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
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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,19
+22,23
@@
#include <wx/srchctrl.h>
#include <wx/treectrl.h>
#include <boost/shared_ptr.hpp>
#include <wx/srchctrl.h>
#include <wx/treectrl.h>
#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
#include <list>
#include <map>
#include <list>
#include <map>
+namespace dcpomatic {
+ class Screen;
+}
+
class Cinema;
class Cinema;
-class Screen;
class ScreensPanel : public wxPanel
{
public:
class ScreensPanel : public wxPanel
{
public:
- ScreensPanel (wxWindow* parent);
+
explicit
ScreensPanel (wxWindow* parent);
~ScreensPanel ();
~ScreensPanel ();
- std::list<boost::shared_ptr<Screen> > screens () const;
+ std::list<boost::shared_ptr<
dcpomatic::
Screen> > screens () const;
void setup_sensitivity ();
boost::signals2::signal<void ()> ScreensChanged;
void setup_sensitivity ();
boost::signals2::signal<void ()> ScreensChanged;
@@
-41,7
+46,7
@@
public:
private:
void add_cinemas ();
void add_cinema (boost::shared_ptr<Cinema>);
private:
void add_cinemas ();
void add_cinema (boost::shared_ptr<Cinema>);
- boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
+ boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<
dcpomatic::
Screen>);
void add_cinema_clicked ();
void edit_cinema_clicked ();
void remove_cinema_clicked ();
void add_cinema_clicked ();
void edit_cinema_clicked ();
void remove_cinema_clicked ();
@@
-63,7
+68,7
@@
private:
wxTreeItemId _root;
typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
wxTreeItemId _root;
typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
- typedef std::map<wxTreeItemId, boost::shared_ptr<Screen> > ScreenMap;
+ typedef std::map<wxTreeItemId, boost::shared_ptr<
dcpomatic::
Screen> > ScreenMap;
CinemaMap _cinemas;
ScreenMap _screens;
CinemaMap _cinemas;
ScreenMap _screens;