Support buttons.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ae4ae2f0246d44a9985a780aa113edcbfb852178..1c6ed1583d5ea1aef0b611628d229933459f1c60 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,9 @@
 #include "gain_calculator_dialog.h"
 #include "content_panel.h"
 #include "audio_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/config.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/ffmpeg_content.h"
@@ -48,16 +51,16 @@ AudioPanel::AudioPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Audio"))
        , _audio_dialog (0)
 {
-       _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF"));
-       _reference_note = new wxStaticText (this, wxID_ANY, _(""));
+       _reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF"));
+       _reference_note = new StaticText (this, wxT(""));
        _reference_note->Wrap (200);
        wxFont font = _reference_note->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
        font.SetPointSize(font.GetPointSize() - 1);
        _reference_note->SetFont(font);
 
-       _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
-       _peak = new wxStaticText (this, wxID_ANY, wxT (""));
+       _show = new Button (this, _("Show graph of audio levels..."));
+       _peak = new StaticText (this, wxT (""));
 
        _gain_label = create_label (this, _("Gain"), true);
        _gain = new ContentSpinCtrlDouble<AudioContent> (
@@ -70,7 +73,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
                );
 
        _gain_db_label = create_label (this, _("dB"), false);
-       _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
+       _gain_calculate_button = new Button (this, _("Calculate..."));
 
        _delay_label = create_label (this, _("Delay"), true);
        _delay = new ContentSpinCtrl<AudioContent> (
@@ -88,7 +91,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
        _mapping = new AudioMappingView (this);
        _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 
-       _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
+       _description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize);
        _sizer->Add (_description, 0, wxALL, 12);
        _description->SetFont (font);
 
@@ -107,8 +110,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
        _gain_calculate_button->Bind (wxEVT_BUTTON,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
 
        _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
-
-       JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
+       _active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
 
        add_to_grid ();
 }
@@ -267,7 +269,7 @@ AudioPanel::setup_description ()
                return;
        }
 
-       checked_set (_description, ac.front()->audio->processing_description ());
+       checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
 }
 
 void
@@ -305,7 +307,7 @@ AudioPanel::setup_sensitivity ()
        }
 
        string why_not;
-       bool const can_reference = dcp && dcp->can_reference_audio (why_not);
+       bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), why_not);
        setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
        if (_reference->GetValue ()) {
@@ -354,7 +356,7 @@ AudioPanel::setup_peak ()
                _peak->SetLabel (wxT (""));
        } else {
                shared_ptr<Playlist> playlist (new Playlist);
-               playlist->add (sel.front ());
+               playlist->add (_parent->film(), sel.front());
                try {
                        shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
                        peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);