projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect subtitle outline rectangle display when subtitles
[dcpomatic.git]
/
src
/
wx
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index aef2f76ad4ac33906bcff4c26d51678a7402980c..e3a29495512b740312094237c977b478b5329f32 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.
@@
-22,6
+22,7
@@
#include "lib/audio_mapping.h"
#include "content_sub_panel.h"
#include "content_widget.h"
#include "lib/audio_mapping.h"
#include "content_sub_panel.h"
#include "content_widget.h"
+#include "timecode.h"
class wxSpinCtrlDouble;
class wxSpinCtrlDouble;
@@
-39,9
+40,10
@@
public:
explicit AudioPanel (ContentPanel *);
~AudioPanel ();
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,11
@@
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 enable_language_clicked ();
- void language_changed ();
+ 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 ();
wxCheckBox* _reference;
wxStaticText* _reference_note;
wxCheckBox* _reference;
wxStaticText* _reference_note;
@@
-69,12
+72,17
@@
private:
wxStaticText* _delay_label;
wxStaticText* _delay_ms_label;
ContentSpinCtrl<AudioContent>* _delay;
wxStaticText* _delay_label;
wxStaticText* _delay_ms_label;
ContentSpinCtrl<AudioContent>* _delay;
- wxCheckBox* _enable_language = nullptr;
- LanguageTagWidget* _language = nullptr;
+ wxStaticText* _fade_in_label;
+ Timecode<dcpomatic::ContentTime>* _fade_in;
+ wxStaticText* _fade_out_label;
+ Timecode<dcpomatic::ContentTime>* _fade_out;
+ wxCheckBox* _use_same_fades_as_video;
AudioMappingView* _mapping;
wxStaticText* _description;
AudioMappingView* _mapping;
wxStaticText* _description;
- AudioDialog* _audio_dialog;
+ AudioDialog* _audio_dialog
= nullptr
;
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;
};
};