#include "lib/transcode_job.h"
#include "lib/exceptions.h"
#include "lib/ab_transcode_job.h"
-#include "lib/thumbs_job.h"
#include "lib/job_manager.h"
#include "lib/filter.h"
#include "lib/screen.h"
#include "dcp_range_dialog.h"
#include "gain_calculator_dialog.h"
#include "sound_processor.h"
-
-using namespace std;
-using namespace boost;
+#include "dci_name_dialog.h"
+#include "scaler.h"
+
+using std::string;
+using std::stringstream;
+using std::pair;
+using std::fixed;
+using std::setprecision;
+using std::list;
+using std::vector;
+using boost::shared_ptr;
/** @param f Film to edit */
-FilmEditor::FilmEditor (Film* f, wxWindow* parent)
+FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
: wxPanel (parent)
, _ignore_changes (Film::NONE)
, _film (f)
_name = new wxTextCtrl (this, wxID_ANY);
_sizer->Add (_name, 1, wxEXPAND);
+ add_label_to_sizer (_sizer, this, "DCP Name");
+ _dcp_name = new wxStaticText (this, wxID_ANY, wxT (""));
+ _sizer->Add (_dcp_name, 0, wxALIGN_CENTER_VERTICAL | wxSHRINK);
+
+ _use_dci_name = new wxCheckBox (this, wxID_ANY, wxT ("Use DCI name"));
+ _sizer->Add (_use_dci_name, 1, wxEXPAND);
+ _edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Details..."));
+ _sizer->Add (_edit_dci_button, 0);
+
add_label_to_sizer (_sizer, this, "Content");
_content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
_sizer->Add (_content, 1, wxEXPAND);
_scaler = new wxComboBox (this, wxID_ANY);
_sizer->Add (video_control (_scaler), 1);
+ {
+ video_control (add_label_to_sizer (_sizer, this, "Audio Stream"));
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _audio_stream = new wxComboBox (this, wxID_ANY);
+ s->Add (video_control (_audio_stream), 1);
+ _audio = new wxStaticText (this, wxID_ANY, wxT (""));
+ s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
+ _sizer->Add (s, 1, wxEXPAND);
+ }
+
{
video_control (add_label_to_sizer (_sizer, this, "Audio Gain"));
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_sizer->Add (s);
}
+ _with_subtitles = new wxCheckBox (this, wxID_ANY, wxT("With Subtitles"));
+ video_control (_with_subtitles);
+ _sizer->Add (_with_subtitles, 1);
+
+ _subtitle_stream = new wxComboBox (this, wxID_ANY);
+ _sizer->Add (_subtitle_stream);
+
+ video_control (add_label_to_sizer (_sizer, this, "Subtitle Offset"));
+ _subtitle_offset = new wxSpinCtrl (this);
+ _sizer->Add (video_control (_subtitle_offset), 1);
+
+ {
+ video_control (add_label_to_sizer (_sizer, this, "Subtitle Scale"));
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _subtitle_scale = new wxSpinCtrl (this);
+ s->Add (video_control (_subtitle_scale));
+ video_control (add_label_to_sizer (s, this, "%"));
+ _sizer->Add (s);
+ }
+
video_control (add_label_to_sizer (_sizer, this, "Frames Per Second"));
_frames_per_second = new wxStaticText (this, wxID_ANY, wxT (""));
_sizer->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
_length = new wxStaticText (this, wxID_ANY, wxT (""));
_sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL);
- video_control (add_label_to_sizer (_sizer, this, "Audio"));
- _audio = new wxStaticText (this, wxID_ANY, wxT (""));
- _sizer->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL);
{
video_control (add_label_to_sizer (_sizer, this, "Range"));
_audio_gain->SetRange (-60, 60);
_audio_delay->SetRange (-1000, 1000);
_still_duration->SetRange (0, 60 * 60);
-
- vector<Format const *> fmt = Format::all ();
- for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
- _format->Append (std_to_wx ((*i)->name ()));
- }
+ _subtitle_offset->SetRange (-1024, 1024);
+ _subtitle_scale->SetRange (1, 1000);
vector<DCPContentType const *> const ct = DCPContentType::all ();
for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
_scaler->Append (std_to_wx ((*i)->name()));
}
+ JobManager::instance()->ActiveJobsChanged.connect (
+ bind (&FilmEditor::active_jobs_changed, this, _1)
+ );
+
/* And set their values from the Film */
set_film (f);
/* Now connect to them, since initial values are safely set */
_name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this);
+ _use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
+ _edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
_format->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
_content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
_audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
_still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
_change_dcp_range_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::change_dcp_range_clicked), 0, this);
+ _with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
+ _subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
+ _subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
+ _audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
+ _subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
setup_visibility ();
+ setup_formats ();
}
/** Called when the left crop widget has been changed */
_ignore_changes = Film::NONE;
setup_visibility ();
+ setup_formats ();
+ setup_subtitle_button ();
+ setup_streams ();
}
/** Called when the DCP A/B switch has been toggled */
_ignore_changes = Film::NAME;
_film->set_name (string (_name->GetValue().mb_str()));
_ignore_changes = Film::NONE;
+
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+}
+
+void
+FilmEditor::subtitle_offset_changed (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::SUBTITLE_OFFSET;
+ _film->set_subtitle_offset (_subtitle_offset->GetValue ());
+ _ignore_changes = Film::NONE;
+}
+
+void
+FilmEditor::subtitle_scale_changed (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::SUBTITLE_OFFSET;
+ _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
+ _ignore_changes = Film::NONE;
}
+
/** Called when the metadata stored in the Film object has changed;
* so that we can update the GUI.
* @param p Property of the Film that has changed.
void
FilmEditor::film_changed (Film::Property p)
{
+ ensure_ui_thread ();
+
if (!_film || _ignore_changes == p) {
return;
}
case Film::CONTENT:
_content->SetPath (std_to_wx (_film->content ()));
setup_visibility ();
+ setup_formats ();
+ setup_subtitle_button ();
+ setup_streams ();
+ break;
+ case Film::HAS_SUBTITLES:
+ setup_subtitle_button ();
+ setup_streams ();
+ break;
+ case Film::AUDIO_STREAMS:
+ case Film::SUBTITLE_STREAMS:
+ setup_streams ();
break;
case Film::FORMAT:
- _format->SetSelection (Format::as_index (_film->format ()));
+ {
+ int n = 0;
+ vector<Format const *>::iterator i = _formats.begin ();
+ while (i != _formats.end() && *i != _film->format ()) {
+ ++i;
+ ++n;
+ }
+ _format->SetSelection (n);
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
+ }
case Film::CROP:
_left_crop->SetValue (_film->crop().left);
_right_crop->SetValue (_film->crop().right);
}
case Film::NAME:
_name->ChangeValue (std_to_wx (_film->name ()));
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
case Film::FRAMES_PER_SECOND:
- {
- stringstream s;
s << fixed << setprecision(2) << _film->frames_per_second();
_frames_per_second->SetLabel (std_to_wx (s.str ()));
break;
- }
- case Film::AUDIO_CHANNELS:
case Film::AUDIO_SAMPLE_RATE:
- if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
- _audio->SetLabel (wxT (""));
- } else {
- s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
- _audio->SetLabel (std_to_wx (s.str ()));
- }
+ setup_audio_details ();
break;
case Film::SIZE:
if (_film->size().width == 0 && _film->size().height == 0) {
}
break;
case Film::LENGTH:
- if (_film->frames_per_second() > 0 && _film->length() > 0) {
- s << _film->length() << " frames; " << seconds_to_hms (_film->length() / _film->frames_per_second());
- } else if (_film->length() > 0) {
- s << _film->length() << " frames";
+ if (_film->frames_per_second() > 0 && _film->length()) {
+ s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+ } else if (_film->length()) {
+ s << _film->length().get() << " frames";
}
_length->SetLabel (std_to_wx (s.str ()));
break;
case Film::DCP_CONTENT_TYPE:
_dcp_content_type->SetSelection (DCPContentType::as_index (_film->dcp_content_type ()));
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
case Film::THUMBS:
break;
case Film::STILL_DURATION:
_still_duration->SetValue (_film->still_duration ());
break;
+ case Film::WITH_SUBTITLES:
+ _with_subtitles->SetValue (_film->with_subtitles ());
+ _subtitle_scale->Enable (_film->with_subtitles ());
+ _subtitle_offset->Enable (_film->with_subtitles ());
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+ break;
+ case Film::SUBTITLE_OFFSET:
+ _subtitle_offset->SetValue (_film->subtitle_offset ());
+ break;
+ case Film::SUBTITLE_SCALE:
+ _subtitle_scale->SetValue (_film->subtitle_scale() * 100);
+ break;
+ case Film::USE_DCI_NAME:
+ _use_dci_name->SetValue (_film->use_dci_name ());
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+ break;
+ case Film::DCI_METADATA:
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+ break;
+ case Film::AUDIO_STREAM:
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+ _audio_stream->SetSelection (_film->audio_stream_index ());
+ setup_audio_details ();
+ break;
+ case Film::SUBTITLE_STREAM:
+ _subtitle_stream->SetSelection (_film->subtitle_stream_index ());
+ break;
}
}
_ignore_changes = Film::FORMAT;
int const n = _format->GetSelection ();
if (n >= 0) {
- _film->set_format (Format::from_index (n));
+ assert (n < int (_formats.size()));
+ _film->set_format (_formats[n]);
}
_ignore_changes = Film::NONE;
+
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
}
/** Called when the DCP content type widget has been changed */
_film->set_dcp_content_type (DCPContentType::from_index (n));
}
_ignore_changes = Film::NONE;
+
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
}
/** Sets the Film that we are editing */
void
-FilmEditor::set_film (Film* f)
+FilmEditor::set_film (shared_ptr<Film> f)
{
_film = f;
set_things_sensitive (_film != 0);
if (_film) {
- _film->Changed.connect (sigc::mem_fun (*this, &FilmEditor::film_changed));
+ _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
}
if (_film) {
film_changed (Film::SIZE);
film_changed (Film::LENGTH);
film_changed (Film::FRAMES_PER_SECOND);
- film_changed (Film::AUDIO_CHANNELS);
film_changed (Film::AUDIO_SAMPLE_RATE);
film_changed (Film::SCALER);
film_changed (Film::AUDIO_GAIN);
film_changed (Film::AUDIO_DELAY);
film_changed (Film::STILL_DURATION);
+ film_changed (Film::WITH_SUBTITLES);
+ film_changed (Film::SUBTITLE_OFFSET);
+ film_changed (Film::SUBTITLE_SCALE);
+ film_changed (Film::USE_DCI_NAME);
+ film_changed (Film::DCI_METADATA);
}
/** Updates the sensitivity of lots of widgets to a given value.
FilmEditor::set_things_sensitive (bool s)
{
_name->Enable (s);
- _frames_per_second->Enable (s);
+ _use_dci_name->Enable (s);
+ _edit_dci_button->Enable (s);
_format->Enable (s);
_content->Enable (s);
_left_crop->Enable (s);
_bottom_crop->Enable (s);
_filters_button->Enable (s);
_scaler->Enable (s);
+ _audio_stream->Enable (s);
_dcp_content_type->Enable (s);
_dcp_range->Enable (s);
_change_dcp_range_button->Enable (s);
_audio_gain->Enable (s);
_audio_gain_calculate_button->Enable (s);
_audio_delay->Enable (s);
+ _subtitle_stream->Enable (s);
_still_duration->Enable (s);
+ _with_subtitles->Enable (s);
+ _subtitle_offset->Enable (s);
+ _subtitle_scale->Enable (s);
+ _frames_per_second->Enable (s);
+ _original_size->Enable (s);
}
/** Called when the `Edit filters' button has been clicked */
void
FilmEditor::edit_filters_clicked (wxCommandEvent &)
{
- FilterDialog* d = new FilterDialog (this, _film->filters ());
- d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+ FilterDialog* d = new FilterDialog (this, _film->filters());
+ d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1));
d->ShowModal ();
d->Destroy ();
}
FilmEditor::change_dcp_range_clicked (wxCommandEvent &)
{
DCPRangeDialog* d = new DCPRangeDialog (this, _film);
- d->Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
+ d->Changed.connect (bind (&FilmEditor::dcp_range_changed, this, _1, _2));
d->ShowModal ();
}
d->Destroy ();
}
+
+void
+FilmEditor::setup_formats ()
+{
+ ContentType c = VIDEO;
+
+ if (_film) {
+ c = _film->content_type ();
+ }
+
+ _formats.clear ();
+
+ vector<Format const *> fmt = Format::all ();
+ for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
+ if (c == VIDEO && dynamic_cast<FixedFormat const *> (*i)) {
+ _formats.push_back (*i);
+ } else if (c == STILL && dynamic_cast<VariableFormat const *> (*i)) {
+ _formats.push_back (*i);
+ }
+ }
+
+ _format->Clear ();
+ for (vector<Format const *>::iterator i = _formats.begin(); i != _formats.end(); ++i) {
+ _format->Append (std_to_wx ((*i)->name ()));
+ }
+
+ _sizer->Layout ();
+}
+
+void
+FilmEditor::with_subtitles_toggled (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::WITH_SUBTITLES;
+ _film->set_with_subtitles (_with_subtitles->GetValue ());
+ _ignore_changes = Film::NONE;
+
+ _subtitle_scale->Enable (_film->with_subtitles ());
+ _subtitle_offset->Enable (_film->with_subtitles ());
+}
+
+void
+FilmEditor::setup_subtitle_button ()
+{
+ _with_subtitles->Enable (_film->has_subtitles ());
+ if (!_film->has_subtitles ()) {
+ _with_subtitles->SetValue (false);
+ }
+}
+
+void
+FilmEditor::use_dci_name_toggled (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::USE_DCI_NAME;
+ _film->set_use_dci_name (_use_dci_name->GetValue ());
+ _ignore_changes = Film::NONE;
+
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+}
+
+void
+FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ DCINameDialog* d = new DCINameDialog (this, _film);
+ d->ShowModal ();
+ d->Destroy ();
+}
+
+void
+FilmEditor::setup_streams ()
+{
+ _audio_stream->Clear ();
+ vector<AudioStream> a = _film->audio_streams ();
+ for (vector<AudioStream>::iterator i = a.begin(); i != a.end(); ++i) {
+ _audio_stream->Append (std_to_wx (i->name()));
+ }
+ _audio_stream->SetSelection (_film->audio_stream_index ());
+
+ _subtitle_stream->Clear ();
+ vector<SubtitleStream> s = _film->subtitle_streams ();
+ for (vector<SubtitleStream>::iterator i = s.begin(); i != s.end(); ++i) {
+ _subtitle_stream->Append (std_to_wx (i->name()));
+ }
+ _subtitle_stream->SetSelection (_film->subtitle_stream_index ());
+}
+
+void
+FilmEditor::audio_stream_changed (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::AUDIO_STREAM;
+ _film->set_audio_stream (_audio_stream->GetSelection ());
+ _ignore_changes = Film::NONE;
+
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+ setup_audio_details ();
+}
+
+void
+FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _ignore_changes = Film::SUBTITLE_STREAM;
+ _film->set_subtitle_stream (_subtitle_stream->GetSelection ());
+ _ignore_changes = Film::NONE;
+}
+
+void
+FilmEditor::setup_audio_details ()
+{
+ if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
+ _audio->SetLabel (wxT (""));
+ } else {
+ stringstream s;
+ s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
+ _audio->SetLabel (std_to_wx (s.str ()));
+ }
+}
+
+void
+FilmEditor::active_jobs_changed (bool a)
+{
+ set_things_sensitive (!a);
+}
projects / dcpomatic.git / blobdiff