projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "escape" from dual screen mode, on Linux at least (#2183).
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index 8f7151b1bab196fd41dd4ac4b8de26278046362e..a202ad65b1d6be3ef0bf9c81be3cd51730b13caf 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-18,31
+18,33
@@
*/
*/
-#include "lib/film.h"
+
#include "lib/audio_analysis.h"
#include "lib/audio_analysis.h"
+#include "lib/film.h"
#include "lib/playlist.h"
#include "lib/playlist.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class AudioPlot;
class FilmViewer;
class Film;
class AudioPlot;
class FilmViewer;
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);
+ bool Show (bool show = true)
override
;
void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
private:
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 &);
@@
-52,13
+54,13
@@
private:
void setup_statistics ();
void show_or_hide_channel_checkboxes ();
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;