Tidy and fix logging.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 45fc13fc526c761c24ffcad3bac3883f62b4e27f..38504eacf15e1b6472dcd5be499c17fbcd552567 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -49,7 +49,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
        , _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_note = new wxStaticText (this, wxID_ANY, wxT(""));
        _reference_note->Wrap (200);
        wxFont font = _reference_note->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -107,8 +107,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 ();
 }
@@ -125,8 +124,8 @@ AudioPanel::add_to_grid ()
 
        if (interface == Config::INTERFACE_FULL) {
                wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-               reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
-               reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+               reference_sizer->Add (_reference, 0);
+               reference_sizer->Add (_reference_note, 0);
                _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
                ++r;
        }
@@ -267,7 +266,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 +304,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 +353,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);