projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move some logic from the caller into MakeChainDialog.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index 93c33152aee997e5d73fca8f76e64d234f6888ba..12dd0cadf287dff0859945e12c80afdcd1cdce49 100644
(file)
--- 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/film.h"
#include "lib/audio_analysis.h"
#include "lib/playlist.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
class AudioPlot;
#include <boost/signals2.hpp>
class AudioPlot;
@@
-32,14
+34,14
@@
class Film;
class AudioDialog : public wxDialog
{
public:
class AudioDialog : public wxDialog
{
public:
- AudioDialog (wxWindow* parent,
boost::shared_ptr<Film> film, boost::weak_ptr<FilmViewer> viewer, boost::shared_ptr<Content> content = boost
::shared_ptr<Content>());
+ AudioDialog (wxWindow* parent,
std::shared_ptr<Film> film, std::weak_ptr<FilmViewer> viewer, std::shared_ptr<Content> content = std
::shared_ptr<Content>());
bool Show (bool show = true);
void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
private:
bool Show (bool show = true);
void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> 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 &);
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 try_to_load_analysis ();
void analysis_finished ();
void setup_statistics ();
+ void show_or_hide_channel_checkboxes ();
-
boost
::shared_ptr<AudioAnalysis> _analysis;
-
boost
::weak_ptr<Film> _film;
-
boost
::weak_ptr<FilmViewer> _viewer;
+
std
::shared_ptr<AudioAnalysis> _analysis;
+
std
::weak_ptr<Film> _film;
+
std
::weak_ptr<FilmViewer> _viewer;
/** content to analyse, or 0 to analyse all the film's content */
/** content to analyse, or 0 to analyse all the film's content */
-
boost
::weak_ptr<Content> _content;
+
std
::weak_ptr<Content> _content;
int _channels;
int _channels;
-
boost
::shared_ptr<const Playlist> _playlist;
+
std
::shared_ptr<const Playlist> _playlist;
wxStaticText* _cursor;
AudioPlot* _plot;
wxStaticText* _sample_peak;
wxStaticText* _cursor;
AudioPlot* _plot;
wxStaticText* _sample_peak;