Remove erroneous empty gettext translations.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index c250e99141939ba960271bfffba0626568fd2914..954d1676d4abfc03c2d52e80bbc6636d50e5d947 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;
        }
@@ -136,14 +135,23 @@ AudioPanel::add_to_grid ()
        ++r;
 
        add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0));
-       _gain->add (_grid, wxGBPosition(r, 1));
-       add_label_to_sizer (_grid, _gain_db_label, false, wxGBPosition(r, 2));
-       _grid->Add (_gain_calculate_button, wxGBPosition(r, 3));
+       {
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+               s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
+               _grid->Add (s, wxGBPosition(r, 1));
+       }
+       _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+
        ++r;
 
        add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
-       _delay->add (_grid, wxGBPosition (r, 1));
-       add_label_to_sizer (_grid, _delay_ms_label, false, wxGBPosition(r, 2));
+       {
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+               s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
+               _grid->Add (s, wxGBPosition(r, 1));
+       }
        ++r;
 }