X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.h;h=9edabf8ec70b5cc605bfd932c07fb2b1e9083db0;hb=1905ef29b005f501c91c0537b6a6e723bf87d1ac;hp=989f15edc04546e52f3decbb7e1c2a482d223d6a;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h index 989f15edc..9edabf8ec 100644 --- a/src/wx/audio_plot.h +++ b/src/wx/audio_plot.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include #include @@ -34,9 +33,9 @@ class FilmViewer; class AudioPlot : public wxPanel { public: - explicit AudioPlot (wxWindow *, boost::weak_ptr viewer); + explicit AudioPlot (wxWindow *, std::weak_ptr viewer); - void set_analysis (boost::shared_ptr); + void set_analysis (std::shared_ptr); void set_channel_visible (int c, bool v); void set_type_visible (int t, bool v); void set_smoothing (int); @@ -77,10 +76,9 @@ private: void left_down (); void mouse_moved (wxMouseEvent& ev); void mouse_leave (wxMouseEvent& ev); - void search (std::map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const; - boost::weak_ptr _viewer; - boost::shared_ptr _analysis; + std::weak_ptr _viewer; + std::shared_ptr _analysis; bool _channel_visible[MAX_DCP_AUDIO_CHANNELS]; bool _type_visible[AudioPoint::COUNT]; int _smoothing; @@ -88,7 +86,9 @@ private: wxString _message; float _gain_correction; + /** peak values keyed by channel */ mutable std::map _peak; + /** RMS values keyed by channel */ mutable std::map _rms; boost::optional _cursor;