summaryrefslogtreecommitdiff
path: root/src/wx/screens_panel.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-08 23:56:32 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:55 +0100
commitf41818f14369f170475b7f2bde1a2dd856517b14 (patch)
tree2fd7d07fb63e46e8ad2964917cff5704d1893f85 /src/wx/screens_panel.h
parentc4403784febdbdd42e9c32e67fadb147f11fe566 (diff)
Put Font and Screen into dcpomatic namespace.
Diffstat (limited to 'src/wx/screens_panel.h')
-rw-r--r--src/wx/screens_panel.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 3e9accde5..510297efb 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -26,8 +26,11 @@
#include <list>
#include <map>
+namespace dcpomatic {
+ class Screen;
+}
+
class Cinema;
-class Screen;
class ScreensPanel : public wxPanel
{
@@ -35,7 +38,7 @@ public:
explicit ScreensPanel (wxWindow* parent);
~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;
@@ -43,7 +46,7 @@ public:
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 ();
@@ -65,7 +68,7 @@ private:
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;