projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.cc
diff --git
a/src/wx/audio_dialog.cc
b/src/wx/audio_dialog.cc
index bfd92f0b65e8db97508cb61ee775e75121086662..22e09cc7a8c1988973c21011a2027f064803ad38 100644
(file)
--- a/
src/wx/audio_dialog.cc
+++ b/
src/wx/audio_dialog.cc
@@
-29,7
+29,7
@@
using boost::bind;
using boost::optional;
AudioDialog::AudioDialog (wxWindow* parent)
using boost::optional;
AudioDialog::AudioDialog (wxWindow* parent)
- : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+ : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
| wxFULL_REPAINT_ON_RESIZE
)
, _plot (0)
{
wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
, _plot (0)
{
wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
@@
-43,7
+43,6
@@
AudioDialog::AudioDialog (wxWindow* parent)
wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
-
for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
@@
-84,39
+83,38
@@
AudioDialog::AudioDialog (wxWindow* parent)
}
void
}
void
-AudioDialog::set_
film (shared_ptr<Film> f
)
+AudioDialog::set_
content (shared_ptr<AudioContent> c
)
{
{
- _film_changed_connection.disconnect ();
- _film_audio_analysis_succeeded_connection.disconnect ();
+ _content_changed_connection.disconnect ();
- _
film = f
;
+ _
content = c
;
try_to_load_analysis ();
try_to_load_analysis ();
- _plot->set_gain (_
film
->audio_gain ());
+ _plot->set_gain (_
content
->audio_gain ());
- _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
- _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
+ _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
- SetTitle (wxString::Format (_("D
VD-o-matic audio - %s"), std_to_wx(_film->name
()).data()));
+ SetTitle (wxString::Format (_("D
CP-o-matic audio - %s"), std_to_wx(_content->file().filename().string
()).data()));
}
}
-
void
AudioDialog::try_to_load_analysis ()
{
shared_ptr<AudioAnalysis> a;
void
AudioDialog::try_to_load_analysis ()
{
shared_ptr<AudioAnalysis> a;
- if (boost::filesystem::exists (_
film
->audio_analysis_path())) {
- a.reset (new AudioAnalysis (_
film
->audio_analysis_path ()));
+ if (boost::filesystem::exists (_
content
->audio_analysis_path())) {
+ a.reset (new AudioAnalysis (_
content
->audio_analysis_path ()));
} else {
if (IsShown ()) {
} else {
if (IsShown ()) {
- _
film->analyse_audio (
);
+ _
content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this)
);
}
}
_plot->set_analysis (a);
}
}
_plot->set_analysis (a);
- _channel_checkbox[0]->SetValue (true);
+ if (_channel_checkbox[0]) {
+ _channel_checkbox[0]->SetValue (true);
+ }
_plot->set_channel_visible (0, true);
for (int i = 0; i < AudioPoint::COUNT; ++i) {
_plot->set_channel_visible (0, true);
for (int i = 0; i < AudioPoint::COUNT; ++i) {
@@
-139,14
+137,10
@@
AudioDialog::channel_clicked (wxCommandEvent& ev)
}
void
}
void
-AudioDialog::
film_changed (Film::Property
p)
+AudioDialog::
content_changed (int
p)
{
{
- switch (p) {
- case Film::AUDIO_GAIN:
- _plot->set_gain (_film->audio_gain ());
- break;
- default:
- break;
+ if (p == AudioContentProperty::AUDIO_GAIN) {
+ _plot->set_gain (_content->audio_gain ());
}
}
}
}