Hand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow even

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index d68edefc897c0d6e9d3031a59dfe87b0d7e2d904..e029d3cc9c8fd200a60ca50e0b7b6eaab971f443 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -58,11 +58,6 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
        grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
        ++r;
        
-       add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
-       _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
-       grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
-       ++r;
-
        int flags = wxALIGN_CENTER_VERTICAL;
 #ifdef __WXOSX__
        flags |= wxALIGN_RIGHT;
@@ -70,8 +65,20 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
 
        _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name"));
        grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
-       _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
-       grid->Add (_edit_isdcf_button, wxGBPosition (r, 1));
+
+       {
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
+               s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+               _copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name"));
+               s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
+               grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
+               ++r;
+       }
+
+       add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
+       _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+       grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
        ++r;
 
        add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
@@ -98,13 +105,14 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
        grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        ++r;
 
-       _name->Bind             (wxEVT_COMMAND_TEXT_UPDATED,          boost::bind (&DCPPanel::name_changed, this));
-       _use_isdcf_name->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
-       _edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
-       _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&DCPPanel::dcp_content_type_changed, this));
-       _signed->Bind           (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::signed_toggled, this));
-       _encrypted->Bind        (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::encrypted_toggled, this));
-       _standard->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&DCPPanel::standard_changed, this));
+       _name->Bind              (wxEVT_COMMAND_TEXT_UPDATED,         boost::bind (&DCPPanel::name_changed, this));
+       _use_isdcf_name->Bind    (wxEVT_COMMAND_CHECKBOX_CLICKED,     boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
+       _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
+       _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this));
+       _dcp_content_type->Bind  (wxEVT_COMMAND_CHOICE_SELECTED,      boost::bind (&DCPPanel::dcp_content_type_changed, this));
+       _signed->Bind            (wxEVT_COMMAND_CHECKBOX_CLICKED,     boost::bind (&DCPPanel::signed_toggled, this));
+       _encrypted->Bind         (wxEVT_COMMAND_CHECKBOX_CLICKED,     boost::bind (&DCPPanel::encrypted_toggled, this));
+       _standard->Bind          (wxEVT_COMMAND_CHOICE_SELECTED,      boost::bind (&DCPPanel::standard_changed, this));
 
        vector<DCPContentType const *> const ct = DCPContentType::all ();
        for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
@@ -200,7 +208,7 @@ DCPPanel::audio_channels_changed ()
                return;
        }
 
-       _film->set_audio_channels (_audio_channels->GetValue ());
+       _film->set_audio_channels ((_audio_channels->GetSelection () + 1) * 2);
 }
 
 void
@@ -266,9 +274,12 @@ DCPPanel::film_changed (int p)
                checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
                break;
        case Film::USE_ISDCF_NAME:
+       {
                checked_set (_use_isdcf_name, _film->use_isdcf_name ());
                setup_dcp_name ();
+               _edit_isdcf_button->Enable (_film->use_isdcf_name ());
                break;
+       }
        case Film::ISDCF_METADATA:
                setup_dcp_name ();
                break;
@@ -293,7 +304,7 @@ DCPPanel::film_changed (int p)
                break;
        }
        case Film::AUDIO_CHANNELS:
-               checked_set (_audio_channels, _film->audio_channels ());
+               checked_set (_audio_channels, (_film->audio_channels () / 2) - 1);
                setup_dcp_name ();
                break;
        case Film::THREE_D:
@@ -350,7 +361,7 @@ DCPPanel::container_changed ()
        int const n = _container->GetSelection ();
        if (n >= 0) {
                vector<Ratio const *> ratios = Ratio::all ();
-               assert (n < int (ratios.size()));
+               DCPOMATIC_ASSERT (n < int (ratios.size()));
                _film->set_container (ratios[n]);
        }
 }
@@ -400,6 +411,7 @@ DCPPanel::set_general_sensitivity (bool s)
        _use_isdcf_name->Enable (s);
        _edit_isdcf_button->Enable (s);
        _dcp_content_type->Enable (s);
+       _copy_isdcf_name_button->Enable (s);
 
        bool si = s;
        if (_film && _film->encrypted ()) {
@@ -536,7 +548,7 @@ DCPPanel::make_video_panel ()
                _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
                setup_frame_rate_widget ();
                _best_frame_rate = new wxButton (panel, wxID_ANY, _("Use best"));
-               _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+               _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
                grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
        }
        ++r;
@@ -614,13 +626,21 @@ DCPPanel::make_audio_panel ()
 
        int r = 0;
        add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
-       _audio_channels = new wxSpinCtrl (panel, wxID_ANY);
+       _audio_channels = new wxChoice (panel, wxID_ANY);
+       for (int i = 2; i <= 16; i += 2) {
+               _audio_channels->Append (wxString::Format ("%d", i));
+       }
        grid->Add (_audio_channels, wxGBPosition (r, 1));
        ++r;
 
-       _audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::audio_channels_changed, this));
-
-       _audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS);
+       _audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this));
 
        return panel;
 }
+
+void
+DCPPanel::copy_isdcf_name_button_clicked ()
+{
+       _film->set_name (_film->isdcf_name (false));
+       _film->set_use_isdcf_name (false);
+}