/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
-#include "lib/ffmpeg_content.h"
-#include "lib/subrip_content.h"
-#include "lib/ffmpeg_subtitle_stream.h"
-#include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_decoder.h"
-#include "lib/dcp_subtitle_decoder.h"
#include "subtitle_panel.h"
#include "film_editor.h"
#include "wx_util.h"
#include "subtitle_view.h"
#include "content_panel.h"
#include "fonts_dialog.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/subrip_content.h"
+#include "lib/ffmpeg_subtitle_stream.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/subrip_decoder.h"
+#include "lib/dcp_subtitle_decoder.h"
+#include <wx/spinctrl.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
using std::vector;
using std::string;
grid->Add (_use);
grid->AddSpacer (0);
+ _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
+ grid->Add (_burn);
+ grid->AddSpacer (0);
+
{
add_label_to_sizer (grid, this, _("X Offset"), true);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_y_scale->SetRange (10, 1000);
_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));
_y_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
_x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this));
} else if (property == SubtitleContentProperty::USE_SUBTITLES) {
checked_set (_use, scs ? scs->use_subtitles() : false);
setup_sensitivity ();
+ } else if (property == SubtitleContentProperty::BURN_SUBTITLES) {
+ checked_set (_burn, scs ? scs->burn_subtitles() : false);
} else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
} else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
}
}
+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());
+ }
+}
+
void
SubtitlePanel::setup_sensitivity ()
{
int any_subs = 0;
int ffmpeg_subs = 0;
int subrip_or_dcp_subs = 0;
- SubtitleContentList c = _parent->selected_subtitle ();
- for (SubtitleContentList::const_iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (*i);
- shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (*i);
- shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (*i);
+ int image_subs = 0;
+ BOOST_FOREACH (shared_ptr<SubtitleContent> i, _parent->selected_subtitle ()) {
+ shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
+ shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (i);
+ shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
if (fc) {
if (fc->has_subtitles ()) {
++ffmpeg_subs;
} else {
++any_subs;
}
+
+ if (i->has_image_subtitles ()) {
+ ++image_subs;
+ /* We must burn image subtitles at the moment */
+ i->set_burn_subtitles (true);
+ }
}
_use->Enable (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);
{
film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
film_content_changed (SubtitleContentProperty::USE_SUBTITLES);
+ film_content_changed (SubtitleContentProperty::BURN_SUBTITLES);
film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
film_content_changed (SubtitleContentProperty::SUBTITLE_X_SCALE);