projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index 0ae9da88efa9a077d786d61db1409d861b377dec..5f03de42404811a37b210e685632abf0e044ffac 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-202
1
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-202
2
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-19,29
+19,31
@@
*/
*/
-#include "lib/audio_mapping.h"
#include "content_sub_panel.h"
#include "content_widget.h"
#include "content_sub_panel.h"
#include "content_widget.h"
+#include "timecode.h"
+#include "lib/audio_mapping.h"
-class wxSpinCtrlDouble;
+class AudioDialog;
+class AudioMappingView;
+class CheckBox;
+class LanguageTagWidget;
class wxButton;
class wxChoice;
class wxButton;
class wxChoice;
+class wxSpinCtrlDouble;
class wxStaticText;
class wxStaticText;
-class AudioMappingView;
-class AudioDialog;
-class LanguageTagWidget;
class AudioPanel : public ContentSubPanel
{
public:
explicit AudioPanel (ContentPanel *);
class AudioPanel : public ContentSubPanel
{
public:
explicit AudioPanel (ContentPanel *);
- ~AudioPanel ();
- void film_changed (Film::Property);
- void film_content_changed (int);
- void content_selection_changed ();
+ void create () override;
+ void film_changed (Film::Property) override;
+ void film_content_changed (int) override;
+ void content_selection_changed () override;
void set_film (std::shared_ptr<Film>);
private:
void set_film (std::shared_ptr<Film>);
private:
@@
-53,10
+55,13
@@
private:
void active_jobs_changed (boost::optional<std::string>, boost::optional<std::string>);
void setup_sensitivity ();
void reference_clicked ();
void active_jobs_changed (boost::optional<std::string>, boost::optional<std::string>);
void setup_sensitivity ();
void reference_clicked ();
- void add_to_grid ();
+ void add_to_grid ()
override
;
boost::optional<float> peak () const;
boost::optional<float> peak () const;
+ void fade_in_changed ();
+ void fade_out_changed ();
+ void use_same_fades_as_video_changed ();
-
wx
CheckBox* _reference;
+ CheckBox* _reference;
wxStaticText* _reference_note;
wxButton* _show;
wxStaticText* _gain_label;
wxStaticText* _reference_note;
wxButton* _show;
wxStaticText* _gain_label;
@@
-67,10
+72,17
@@
private:
wxStaticText* _delay_label;
wxStaticText* _delay_ms_label;
ContentSpinCtrl<AudioContent>* _delay;
wxStaticText* _delay_label;
wxStaticText* _delay_ms_label;
ContentSpinCtrl<AudioContent>* _delay;
+ wxStaticText* _fade_in_label;
+ Timecode<dcpomatic::ContentTime>* _fade_in;
+ wxStaticText* _fade_out_label;
+ Timecode<dcpomatic::ContentTime>* _fade_out;
+ CheckBox* _use_same_fades_as_video;
AudioMappingView* _mapping;
wxStaticText* _description;
AudioMappingView* _mapping;
wxStaticText* _description;
-
AudioDialog*
_audio_dialog;
+
wx_ptr<AudioDialog>
_audio_dialog;
boost::signals2::scoped_connection _mapping_connection;
boost::signals2::scoped_connection _active_jobs_connection;
boost::signals2::scoped_connection _mapping_connection;
boost::signals2::scoped_connection _active_jobs_connection;
+
+ static std::map<boost::filesystem::path, float> _peak_cache;
};
};