projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
video_waveform_dialog.h
diff --git
a/src/wx/video_waveform_dialog.h
b/src/wx/video_waveform_dialog.h
index aa134f7a5f9ad236cd7a48697914dd895dcd98a0..25bd462aee991422e89647215eea69e9fb358b45 100644
(file)
--- a/
src/wx/video_waveform_dialog.h
+++ b/
src/wx/video_waveform_dialog.h
@@
-18,8
+18,13
@@
*/
*/
+
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-#include <boost/weak_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#include <memory>
+
class VideoWaveformPlot;
class FilmViewer;
class VideoWaveformPlot;
class FilmViewer;
@@
-28,7
+33,7
@@
class Film;
class VideoWaveformDialog : public wxDialog
{
public:
class VideoWaveformDialog : public wxDialog
{
public:
- VideoWaveformDialog (wxWindow* parent,
boost::weak_ptr<const Film> film, FilmViewer*
viewer);
+ VideoWaveformDialog (wxWindow* parent,
std::weak_ptr<const Film> film, std::weak_ptr<FilmViewer>
viewer);
private:
void shown (wxShowEvent &);
private:
void shown (wxShowEvent &);
@@
-36,7
+41,7
@@
private:
void contrast_changed ();
void mouse_moved (int x1, int x2, int y1, int y2);
void contrast_changed ();
void mouse_moved (int x1, int x2, int y1, int y2);
-
FilmViewer*
_viewer;
+
std::weak_ptr<FilmViewer>
_viewer;
VideoWaveformPlot* _plot;
wxChoice* _component;
wxSlider* _contrast;
VideoWaveformPlot* _plot;
wxChoice* _component;
wxSlider* _contrast;