X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.h;h=12dd0cadf287dff0859945e12c80afdcd1cdce49;hb=7bebe412366e9156aa908d054d9fa210cc370f92;hp=93c33152aee997e5d73fca8f76e64d234f6888ba;hpb=9f940fe8533526b10eb9cf22a8772e122760c368;p=dcpomatic.git diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 93c33152a..12dd0cadf 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -21,8 +21,10 @@ #include "lib/film.h" #include "lib/audio_analysis.h" #include "lib/playlist.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS #include class AudioPlot; @@ -32,14 +34,14 @@ class Film; class AudioDialog : public wxDialog { public: - AudioDialog (wxWindow* parent, boost::shared_ptr film, boost::weak_ptr viewer, boost::shared_ptr content = boost::shared_ptr()); + AudioDialog (wxWindow* parent, std::shared_ptr film, std::weak_ptr viewer, std::shared_ptr content = std::shared_ptr()); bool Show (bool show = true); void set_cursor (boost::optional time, boost::optional db); private: - void film_change (ChangeType, int); + void film_change (ChangeType, Film::Property); void content_change (ChangeType, int); void channel_clicked (wxCommandEvent &); void type_clicked (wxCommandEvent &); @@ -47,14 +49,15 @@ private: void try_to_load_analysis (); void analysis_finished (); void setup_statistics (); + void show_or_hide_channel_checkboxes (); - boost::shared_ptr _analysis; - boost::weak_ptr _film; - boost::weak_ptr _viewer; + std::shared_ptr _analysis; + std::weak_ptr _film; + std::weak_ptr _viewer; /** content to analyse, or 0 to analyse all the film's content */ - boost::weak_ptr _content; + std::weak_ptr _content; int _channels; - boost::shared_ptr _playlist; + std::shared_ptr _playlist; wxStaticText* _cursor; AudioPlot* _plot; wxStaticText* _sample_peak;