Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / audio_dialog.cc

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 938ecd1d3396223a8d3066d4b470821c5e448bfb..e1f7c15a621f913959feb2fa1e83e073f43022aa 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -74,6 +74,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
        wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
 
+       _cursor = new wxStaticText (this, wxID_ANY, wxT("Cursor: none"));
+       left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
        _plot = new AudioPlot (this);
        left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
        _sample_peak = new wxStaticText (this, wxID_ANY, wxT (""));
@@ -148,8 +150,9 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
 
-       _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2));
-       SetTitle (_("DCP-o-matic audio"));
+       _film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+       DCPOMATIC_ASSERT (film->directory());
+       SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
 
        if (content) {
                _playlist.reset (new Playlist ());
@@ -157,6 +160,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        } else {
                _playlist = film->playlist ();
        }
+
+       _plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2));
 }
 
 void
@@ -277,8 +282,12 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 }
 
 void
-AudioDialog::content_changed (int p)
+AudioDialog::content_change (ChangeType type, int p)
 {
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
        if (p == AudioContentProperty::STREAMS) {
                try_to_load_analysis ();
        } else if (p == AudioContentProperty::GAIN) {
@@ -383,3 +392,16 @@ AudioDialog::Show (bool show)
        try_to_load_analysis ();
        return r;
 }
+
+void
+AudioDialog::set_cursor (optional<DCPTime> time, optional<float> db)
+{
+       if (!time || !db) {
+               _cursor->SetLabel (_("Cursor: none"));
+               return;
+       }
+
+       shared_ptr<Film> film = _film.lock();
+       DCPOMATIC_ASSERT (film);
+       _cursor->SetLabel (wxString::Format (_("Cursor: %.1fdB at %s"), *db, time->timecode(film->video_frame_rate())));
+}