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 b7c244c9c51341d8c3625004e4f9ac6df45b1d89..1bce22811c6b7c48e6543445e1ad53414da6509e 100644
(file)
--- a/
src/wx/audio_dialog.cc
+++ b/
src/wx/audio_dialog.cc
@@
-87,7
+87,7
@@
void
AudioDialog::set_content (shared_ptr<AudioContent> c)
{
_content_changed_connection.disconnect ();
AudioDialog::set_content (shared_ptr<AudioContent> c)
{
_content_changed_connection.disconnect ();
-
+
_content = c;
try_to_load_analysis ();
_content = c;
try_to_load_analysis ();
@@
-95,7
+95,7
@@
AudioDialog::set_content (shared_ptr<AudioContent> c)
_content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
_content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
- SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path
().filename().string
()).data()));
+ SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path
_summary
()).data()));
}
void
}
void
@@
-104,9
+104,9
@@
AudioDialog::try_to_load_analysis ()
if (!IsShown ()) {
return;
}
if (!IsShown ()) {
return;
}
-
+
if (!boost::filesystem::exists (_content->audio_analysis_path())) {
if (!boost::filesystem::exists (_content->audio_analysis_path())) {
- _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+ _
analysis_finished_connection = _
content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
return;
}
return;
}