projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bind().
[dcpomatic.git]
/
src
/
wx
/
markers_panel.h
diff --git
a/src/wx/markers_panel.h
b/src/wx/markers_panel.h
index 23cc860c1dbcc74bb6e7144b8e8ecdb9c731a15c..e34008a41fc5c0e4c29c9ef355ef1496e5fd2216 100644
(file)
--- a/
src/wx/markers_panel.h
+++ b/
src/wx/markers_panel.h
@@
-34,7
+34,7
@@
class wxTipWindow;
class MarkersPanel : public wxPanel
{
public:
class MarkersPanel : public wxPanel
{
public:
- MarkersPanel
(wxWindow* parent, std::weak_ptr<FilmViewer>
viewer);
+ MarkersPanel
(wxWindow* parent, FilmViewer&
viewer);
void set_film (std::weak_ptr<Film> film);
void set_film (std::weak_ptr<Film> film);
@@
-69,7
+69,7
@@
private:
std::weak_ptr<Film> _film;
std::map<dcp::Marker, Marker> _markers;
boost::optional<dcp::Marker> _over;
std::weak_ptr<Film> _film;
std::map<dcp::Marker, Marker> _markers;
boost::optional<dcp::Marker> _over;
-
std::weak_ptr<FilmViewer>
_viewer;
+
FilmViewer&
_viewer;
boost::optional<dcp::Marker> _menu_marker;
};
boost::optional<dcp::Marker> _menu_marker;
};