Build fixes for Boost >= 1.73

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 4472a14bf6599871ea9828e631c04a213676aec2..5046c51048ddfac577b977e70655609a6477e36d 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -59,6 +59,9 @@ using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
 DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
@@ -111,8 +114,6 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
        _standard_label = create_label (_panel, _("Standard"), true);
        _standard = new wxChoice (_panel, wxID_ANY);
 
-       _upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made"));
-
        _markers = new Button (_panel, _("Markers..."));
        _metadata = new Button (_panel, _("Metadata..."));
 
@@ -131,7 +132,6 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
        _reel_type->Bind             (wxEVT_CHOICE,   boost::bind (&DCPPanel::reel_type_changed, this));
        _reel_length->Bind           (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this));
        _standard->Bind              (wxEVT_CHOICE,   boost::bind (&DCPPanel::standard_changed, this));
-       _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this));
        _markers->Bind               (wxEVT_BUTTON,   boost::bind (&DCPPanel::markers_clicked, this));
        _metadata->Bind              (wxEVT_BUTTON,   boost::bind (&DCPPanel::metadata_clicked, this));
 
@@ -205,7 +205,6 @@ DCPPanel::add_to_grid ()
        _reel_length_gb_label->Show (full);
        _standard_label->Show (full);
        _standard->Show (full);
-       _upload_after_make_dcp->Show (full);
        _markers->Show (full);
        _metadata->Show (full);
        _reencode_j2k->Show (full);
@@ -229,9 +228,6 @@ DCPPanel::add_to_grid ()
                _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
                ++r;
 
-               _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2));
-               ++r;
-
                wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL);
                extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
                extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
@@ -327,16 +323,6 @@ DCPPanel::standard_changed ()
        _film->set_interop (_standard->GetSelection() == 1);
 }
 
-void
-DCPPanel::upload_after_make_dcp_changed ()
-{
-       if (!_film) {
-               return;
-       }
-
-       _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ());
-}
-
 void
 DCPPanel::markers_clicked ()
 {
@@ -466,11 +452,9 @@ DCPPanel::film_changed (int p)
        case Film::REEL_LENGTH:
                checked_set (_reel_length, _film->reel_length() / 1000000000LL);
                break;
-       case Film::UPLOAD_AFTER_MAKE_DCP:
-               checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ());
-               break;
        case Film::CONTENT:
                setup_dcp_name ();
+               setup_sensitivity ();
                break;
        default:
                break;
@@ -589,7 +573,6 @@ DCPPanel::set_film (shared_ptr<Film> film)
        film_changed (Film::AUDIO_PROCESSOR);
        film_changed (Film::REEL_TYPE);
        film_changed (Film::REEL_LENGTH);
-       film_changed (Film::UPLOAD_AFTER_MAKE_DCP);
        film_changed (Film::REENCODE_J2K);
 
        set_general_sensitivity(static_cast<bool>(_film));
@@ -613,19 +596,32 @@ DCPPanel::setup_sensitivity ()
        _encrypted->Enable              (_generally_sensitive);
        _reel_type->Enable              (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
        _reel_length->Enable            (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH);
-       _upload_after_make_dcp->Enable  (_generally_sensitive);
        _markers->Enable                (_generally_sensitive && _film && !_film->interop());
        _metadata->Enable               (_generally_sensitive);
-       _frame_rate_choice->Enable      (_generally_sensitive && _film && !_film->references_dcp_video());
-       _frame_rate_spin->Enable        (_generally_sensitive && _film && !_film->references_dcp_video());
-       _audio_channels->Enable         (_generally_sensitive && _film && !_film->references_dcp_audio());
+       _frame_rate_choice->Enable      (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
+       _frame_rate_spin->Enable        (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
+       _audio_channels->Enable         (_generally_sensitive && _film && !_film->references_dcp_audio() && !_film->contains_atmos_content());
        _audio_processor->Enable        (_generally_sensitive && _film && !_film->references_dcp_audio());
        _j2k_bandwidth->Enable          (_generally_sensitive && _film && !_film->references_dcp_video());
        _container->Enable              (_generally_sensitive && _film && !_film->references_dcp_video());
-       _best_frame_rate->Enable        (_generally_sensitive && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
+       _best_frame_rate->Enable (
+               _generally_sensitive &&
+               _film &&
+               _film->best_video_frame_rate () != _film->video_frame_rate() &&
+               !_film->references_dcp_video() &&
+               !_film->contains_atmos_content()
+               );
        _resolution->Enable             (_generally_sensitive && _film && !_film->references_dcp_video());
        _three_d->Enable                (_generally_sensitive && _film && !_film->references_dcp_video());
-       _standard->Enable               (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
+
+       _standard->Enable (
+               _generally_sensitive &&
+               _film &&
+               !_film->references_dcp_video() &&
+               !_film->references_dcp_audio() &&
+               !_film->contains_atmos_content()
+               );
+
        _reencode_j2k->Enable           (_generally_sensitive && _film);
        _show_audio->Enable             (_generally_sensitive && _film);
 }
@@ -728,8 +724,6 @@ DCPPanel::setup_frame_rate_widget ()
                _frame_rate_choice->Show ();
                _frame_rate_spin->Hide ();
        }
-
-       _frame_rate_sizer->Layout ();
 }
 
 wxPanel *
@@ -750,13 +744,9 @@ DCPPanel::make_video_panel ()
 
        _frame_rate_label = create_label (panel, _("Frame Rate"), true);
        _frame_rate_choice = new wxChoice (panel, wxID_ANY);
-       _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
-       _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
        _frame_rate_spin = new wxSpinCtrl (panel, wxID_ANY);
-       _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
        setup_frame_rate_widget ();
        _best_frame_rate = new Button (panel, _("Use best"));
-       _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
 
        _three_d = new CheckBox (panel, _("3D"));
 
@@ -821,7 +811,7 @@ DCPPanel::add_video_panel_to_grid ()
                _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
                _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
                _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
-               _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
+               _frame_rate_sizer->Add (_best_frame_rate, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
                _video_grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
                ++r;
        }