projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use simpler ownership for FilmViewer.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.h
diff --git
a/src/wx/audio_dialog.h
b/src/wx/audio_dialog.h
index a94e98e32f4d5b6161a863aa104e721650cb4495..746b23f40ecbbea95add7a9b57abaeb4e120b9e9 100644
(file)
--- a/
src/wx/audio_dialog.h
+++ b/
src/wx/audio_dialog.h
@@
-18,30
+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
+
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, std::shared_ptr<Film> film, std::weak_ptr<FilmViewer>
viewer, std::shared_ptr<Content> content = std::shared_ptr<Content>());
+ AudioDialog
(wxWindow* parent, std::shared_ptr<Film> film, 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 &);
@@
-53,7
+56,7
@@
private:
std::shared_ptr<AudioAnalysis> _analysis;
std::weak_ptr<Film> _film;
std::shared_ptr<AudioAnalysis> _analysis;
std::weak_ptr<Film> _film;
-
std::weak_ptr<FilmViewer>
_viewer;
+
FilmViewer&
_viewer;
/** content to analyse, or 0 to analyse all the film's content */
std::weak_ptr<Content> _content;
int _channels;
/** content to analyse, or 0 to analyse all the film's content */
std::weak_ptr<Content> _content;
int _channels;