Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index a7774ed2083aa2c8415d828bd00754bb14dcd942..bd5c5f636c039626d46515d8f48f63e6ad6a974d 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -29,6 +29,7 @@
 #include "lib/dcp_subtitle_content.h"
 #include "lib/subrip_decoder.h"
 #include "lib/dcp_subtitle_decoder.h"
+#include "lib/dcp_content.h"
 #include <wx/spinctrl.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
@@ -47,11 +48,15 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (grid, 0, wxALL, 8);
 
+       _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
+       grid->Add (_reference);
+       grid->AddSpacer (0);
+
        _use = new wxCheckBox (this, wxID_ANY, _("Use subtitles"));
        grid->Add (_use);
        grid->AddSpacer (0);
 
-       _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles"));
+       _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
        grid->Add (_burn);
        grid->AddSpacer (0);
 
@@ -112,6 +117,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        _x_scale->SetRange (10, 1000);
        _y_scale->SetRange (10, 1000);
 
+       _reference->Bind            (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::reference_clicked, this));
        _use->Bind                  (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this));
        _burn->Bind                 (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::burn_toggled, this));
        _x_offset->Bind             (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
@@ -173,29 +179,36 @@ SubtitlePanel::film_content_changed (int property)
        } else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
                checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
        } else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) {
-               checked_set (_x_scale, scs ? int (rint (scs->subtitle_x_scale() * 100)) : 100);
+               checked_set (_x_scale, scs ? lrint (scs->subtitle_x_scale() * 100) : 100);
        } else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {
-               checked_set (_y_scale, scs ? int (rint (scs->subtitle_y_scale() * 100)) : 100);
+               checked_set (_y_scale, scs ? lrint (scs->subtitle_y_scale() * 100) : 100);
        } else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) {
                checked_set (_language, scs ? scs->subtitle_language() : "");
+       } else if (property == DCPContentProperty::REFERENCE_SUBTITLE) {
+               if (scs) {
+                       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (scs);
+                       checked_set (_reference, dcp ? dcp->reference_subtitle () : false);
+               } else {
+                       checked_set (_reference, false);
+               }
+
+               setup_sensitivity ();
        }
 }
 
 void
 SubtitlePanel::use_toggled ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_use_subtitles (_use->GetValue());
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_use_subtitles (_use->GetValue());
        }
 }
 
 void
 SubtitlePanel::burn_toggled ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_burn_subtitles (_burn->GetValue());
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_burn_subtitles (_burn->GetValue());
        }
 }
 
@@ -229,17 +242,22 @@ SubtitlePanel::setup_sensitivity ()
                }
        }
 
-       _use->Enable (any_subs > 0);
+       bool const reference = _reference->GetValue ();
+
+       _use->Enable (!reference && any_subs > 0);
        bool const use = _use->GetValue ();
-       _burn->Enable (any_subs > 0 && use && image_subs == 0);
-       _x_offset->Enable (any_subs > 0 && use);
-       _y_offset->Enable (any_subs > 0 && use);
-       _x_scale->Enable (any_subs > 0 && use);
-       _y_scale->Enable (any_subs > 0 && use);
-       _language->Enable (any_subs > 0 && use);
-       _stream->Enable (ffmpeg_subs == 1);
-       _subtitle_view_button->Enable (subrip_or_dcp_subs == 1);
-       _fonts_dialog_button->Enable (subrip_or_dcp_subs == 1);
+       _burn->Enable (!reference && any_subs > 0 && use && image_subs == 0);
+       _x_offset->Enable (!reference && any_subs > 0 && use);
+       _y_offset->Enable (!reference && any_subs > 0 && use);
+       _x_scale->Enable (!reference && any_subs > 0 && use);
+       _y_scale->Enable (!reference && any_subs > 0 && use);
+       _language->Enable (!reference && any_subs > 0 && use);
+       _stream->Enable (!reference && ffmpeg_subs == 1);
+       _subtitle_view_button->Enable (!reference && subrip_or_dcp_subs == 1);
+       _fonts_dialog_button->Enable (!reference && subrip_or_dcp_subs == 1);
+
+       ContentList sel = _parent->selected ();
+       _reference->Enable (sel.size() == 1 && dynamic_pointer_cast<DCPContent> (sel.front ()));
 }
 
 void
@@ -267,18 +285,16 @@ SubtitlePanel::stream_changed ()
 void
 SubtitlePanel::x_offset_changed ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
        }
 }
 
 void
 SubtitlePanel::y_offset_changed ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
        }
 }
 
@@ -294,18 +310,16 @@ SubtitlePanel::x_scale_changed ()
 void
 SubtitlePanel::y_scale_changed ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_subtitle_y_scale (_y_scale->GetValue() / 100.0);
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_subtitle_y_scale (_y_scale->GetValue() / 100.0);
        }
 }
 
 void
 SubtitlePanel::language_changed ()
 {
-       SubtitleContentList c = _parent->selected_subtitle ();
-       for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_subtitle_language (wx_to_std (_language->GetValue()));
+       BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+               i->set_subtitle_language (wx_to_std (_language->GetValue()));
        }
 }
 
@@ -366,3 +380,19 @@ SubtitlePanel::fonts_dialog_clicked ()
        _fonts_dialog = new FontsDialog (this, c.front ());
        _fonts_dialog->Show ();
 }
+
+void
+SubtitlePanel::reference_clicked ()
+{
+       ContentList c = _parent->selected ();
+       if (c.size() != 1) {
+               return;
+       }
+
+       shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (c.front ());
+       if (!d) {
+               return;
+       }
+
+       d->set_reference_subtitle (_reference->GetValue ());
+}