+2014-12-11 Carl Hetherington <cth@carlh.net>
+
+ * Add a language property to subtitle content and use it
+ for the DCP subtitle's language specification.
+
2014-11-24 Carl Hetherington <cth@carlh.net>
* Version 2.0.22 released.
{
Content::examine (job, calculate_digest);
dcp::SubtitleContent sc (path (0), false);
+ _subtitle_language = sc.language ();
_length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
}
#include <stdint.h>
#include <algorithm>
+#include "i18n.h"
+
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
using std::list;
continue;
}
+ /* XXX: this will break down if we have multiple subtitle content */
+ ps.language = subtitle_content->subtitle_language();
+ if (ps.language.empty ()) {
+ ps.language = _("Unknown");
+ }
+
shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
ContentTime const from = dcp_to_content_subtitle (*j, time);
/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
/** ImageSubtitles, with their rectangles transformed as specified by their content */
std::list<ImageSubtitle> image;
- std::list<dcp::SubtitleString> text;
+ std::list<dcp::SubtitleString> text;
+
+ std::string language;
};
#endif
int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502;
int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503;
int const SubtitleContentProperty::USE_SUBTITLES = 504;
+int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
: Content (f)
} else {
_subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
}
+
+ _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
}
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
_subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_x_scale = ref->subtitle_x_scale ();
_subtitle_y_scale = ref->subtitle_y_scale ();
+ _subtitle_language = ref->subtitle_language ();
}
void
root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
+ root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
}
void
signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
}
+void
+SubtitleContent::set_subtitle_language (string language)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _subtitle_language = language;
+ }
+ signal_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE);
+}
+
string
SubtitleContent::identifier () const
{
<< "_" << raw_convert<string> (subtitle_x_offset())
<< "_" << raw_convert<string> (subtitle_y_offset());
+ /* The language is for metadata only, and doesn't affect
+ how this content looks.
+ */
+
return s.str ();
}
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2014 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
static int const SUBTITLE_X_SCALE;
static int const SUBTITLE_Y_SCALE;
static int const USE_SUBTITLES;
+ static int const SUBTITLE_LANGUAGE;
};
/** @class SubtitleContent
void set_subtitle_y_offset (double);
void set_subtitle_x_scale (double);
void set_subtitle_y_scale (double);
+ void set_subtitle_language (std::string language);
bool use_subtitles () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_y_scale;
}
+ std::string subtitle_language () const {
+ return _subtitle_language;
+ }
+
+protected:
+ /** subtitle language (e.g. "German") or empty if it is not known */
+ std::string _subtitle_language;
+
private:
friend struct ffmpeg_pts_offset_test;
}
if (!_subtitle_content) {
- _subtitle_content.reset (
- new dcp::SubtitleContent (_film->name(), _film->isdcf_metadata().subtitle_language)
- );
+ _subtitle_content.reset (new dcp::SubtitleContent (_film->name(), subs.language));
}
for (list<dcp::SubtitleString>::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) {
void write (boost::shared_ptr<const EncodedData>, int, Eyes);
void fake_write (int, Eyes);
void write (boost::shared_ptr<const AudioBuffers>);
- void write (PlayerSubtitles);
+ void write (PlayerSubtitles subs);
void repeat (int f, Eyes);
void finish ();
add_label_to_sizer (s, this, _("%"), false);
grid->Add (s);
}
+
+ add_label_to_sizer (grid, this, _("Language"), true);
+ _language = new wxTextCtrl (this, wxID_ANY);
+ grid->Add (_language, 1, wxEXPAND);
add_label_to_sizer (grid, this, _("Stream"), true);
_stream = new wxChoice (this, wxID_ANY);
_use->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_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));
- _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this));
+ _x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this));
+ _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this));
+ _language->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&SubtitlePanel::language_changed, this));
_stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this));
_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::view_clicked, this));
}
checked_set (_x_scale, scs ? int (rint (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);
+ } else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) {
+ checked_set (_language, scs ? scs->subtitle_language() : "");
}
}
_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);
_view_button->Enable (subrip_or_dcp_subs == 1);
}
}
}
+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()));
+ }
+}
+
void
SubtitlePanel::content_selection_changed ()
{
film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
film_content_changed (SubtitleContentProperty::SUBTITLE_X_SCALE);
film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
+ film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE);
}
void
void y_offset_changed ();
void x_scale_changed ();
void y_scale_changed ();
+ void language_changed ();
void stream_changed ();
void view_clicked ();
wxSpinCtrl* _y_offset;
wxSpinCtrl* _x_scale;
wxSpinCtrl* _y_scale;
+ wxTextCtrl* _language;
wxChoice* _stream;
wxButton* _view_button;
SubtitleView* _view;