#include "lib/ab_transcode_job.h"
#include "lib/job_manager.h"
#include "lib/filter.h"
-#include "lib/screen.h"
#include "lib/config.h"
#include "filter_dialog.h"
#include "wx_util.h"
#include "film_editor.h"
-#include "dcp_range_dialog.h"
#include "gain_calculator_dialog.h"
#include "sound_processor.h"
#include "dci_name_dialog.h"
+#include "scaler.h"
-using namespace std;
-using namespace boost;
+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 (FilmState::NONE)
, _film (f)
+ , _generally_sensitive (true)
{
_sizer = new wxFlexGridSizer (2, 4, 4);
SetSizer (_sizer);
{
- video_control (add_label_to_sizer (_sizer, this, "Range"));
+ video_control (add_label_to_sizer (_sizer, this, "Trim frames"));
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _dcp_range = new wxStaticText (this, wxID_ANY, wxT (""));
- s->Add (video_control (_dcp_range), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- _change_dcp_range_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
- s->Add (video_control (_change_dcp_range_button), 0, 0, 6);
+ add_label_to_sizer (s, this, "Start");
+ _dcp_trim_start = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+ s->Add (_dcp_trim_start);
+ add_label_to_sizer (s, this, "End");
+ _dcp_trim_end = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+ s->Add (_dcp_trim_end);
+
_sizer->Add (s);
}
_still_duration->SetRange (0, 60 * 60);
_subtitle_offset->SetRange (-1024, 1024);
_subtitle_scale->SetRange (1, 1000);
+ _dcp_trim_start->SetRange (0, 100);
+ _dcp_trim_end->SetRange (0, 100);
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);
);
_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);
+ _dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this);
+ _dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 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);
return;
}
- _ignore_changes = FilmState::CROP;
_film->set_left_crop (_left_crop->GetValue ());
- _ignore_changes = FilmState::NONE;
}
/** Called when the right crop widget has been changed */
return;
}
- _ignore_changes = FilmState::CROP;
_film->set_right_crop (_right_crop->GetValue ());
- _ignore_changes = FilmState::NONE;
}
/** Called when the top crop widget has been changed */
return;
}
- _ignore_changes = FilmState::CROP;
_film->set_top_crop (_top_crop->GetValue ());
- _ignore_changes = FilmState::NONE;
}
/** Called when the bottom crop value has been changed */
return;
}
- _ignore_changes = FilmState::CROP;
_film->set_bottom_crop (_bottom_crop->GetValue ());
- _ignore_changes = FilmState::NONE;
}
/** Called when the content filename has been changed */
return;
}
- _ignore_changes = FilmState::CONTENT;
-
try {
_film->set_content (wx_to_std (_content->GetPath ()));
} catch (std::exception& e) {
_content->SetPath (std_to_wx (_film->directory ()));
error_dialog (this, String::compose ("Could not set content: %1", e.what ()));
}
-
- _ignore_changes = FilmState::NONE;
-
- setup_visibility ();
- setup_formats ();
- setup_subtitle_button ();
- setup_streams ();
}
/** Called when the DCP A/B switch has been toggled */
return;
}
- _ignore_changes = FilmState::DCP_AB;
_film->set_dcp_ab (_dcp_ab->GetValue ());
- _ignore_changes = FilmState::NONE;
}
/** Called when the name widget has been changed */
return;
}
- _ignore_changes = FilmState::NAME;
_film->set_name (string (_name->GetValue().mb_str()));
- _ignore_changes = FilmState::NONE;
-
- _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
}
void
return;
}
- _ignore_changes = FilmState::SUBTITLE_OFFSET;
_film->set_subtitle_offset (_subtitle_offset->GetValue ());
- _ignore_changes = FilmState::NONE;
}
void
return;
}
- _ignore_changes = FilmState::SUBTITLE_OFFSET;
_film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
- _ignore_changes = FilmState::NONE;
}
* @param p Property of the Film that has changed.
*/
void
-FilmEditor::film_changed (FilmState::Property p)
+FilmEditor::film_changed (Film::Property p)
{
- if (!_film || _ignore_changes == p) {
+ ensure_ui_thread ();
+
+ if (!_film) {
return;
}
stringstream s;
switch (p) {
- case FilmState::NONE:
+ case Film::NONE:
break;
- case FilmState::CONTENT:
- _content->SetPath (std_to_wx (_film->content ()));
+ case Film::CONTENT:
+ checked_set (_content, _film->content ());
setup_visibility ();
setup_formats ();
- setup_subtitle_button ();
+ setup_subtitle_control_sensitivity ();
setup_streams ();
break;
- case FilmState::HAS_SUBTITLES:
- setup_subtitle_button ();
+ case Film::HAS_SUBTITLES:
+ setup_subtitle_control_sensitivity ();
setup_streams ();
break;
- case FilmState::AUDIO_STREAMS:
- case FilmState::SUBTITLE_STREAMS:
+ case Film::AUDIO_STREAMS:
+ case Film::SUBTITLE_STREAMS:
setup_streams ();
break;
- case FilmState::FORMAT:
+ case Film::FORMAT:
{
int n = 0;
vector<Format const *>::iterator i = _formats.begin ();
++i;
++n;
}
- _format->SetSelection (n);
+ checked_set (_format, n);
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
}
- case FilmState::CROP:
- _left_crop->SetValue (_film->crop().left);
- _right_crop->SetValue (_film->crop().right);
- _top_crop->SetValue (_film->crop().top);
- _bottom_crop->SetValue (_film->crop().bottom);
+ case Film::CROP:
+ checked_set (_left_crop, _film->crop().left);
+ checked_set (_right_crop, _film->crop().right);
+ checked_set (_top_crop, _film->crop().top);
+ checked_set (_bottom_crop, _film->crop().bottom);
break;
- case FilmState::FILTERS:
+ case Film::FILTERS:
{
pair<string, string> p = Filter::ffmpeg_strings (_film->filters ());
if (p.first.empty () && p.second.empty ()) {
_sizer->Layout ();
break;
}
- case FilmState::NAME:
- _name->ChangeValue (std_to_wx (_film->name ()));
+ case Film::NAME:
+ checked_set (_name, _film->name());
+ _film->set_dci_date_today ();
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
- case FilmState::FRAMES_PER_SECOND:
+ case Film::FRAMES_PER_SECOND:
s << fixed << setprecision(2) << _film->frames_per_second();
_frames_per_second->SetLabel (std_to_wx (s.str ()));
break;
- case FilmState::AUDIO_SAMPLE_RATE:
+ case Film::AUDIO_SAMPLE_RATE:
setup_audio_details ();
break;
- case FilmState::SIZE:
+ case Film::SIZE:
if (_film->size().width == 0 && _film->size().height == 0) {
_original_size->SetLabel (wxT (""));
} else {
_original_size->SetLabel (std_to_wx (s.str ()));
}
break;
- case FilmState::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";
+ case Film::LENGTH:
+ 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 ()));
+ if (_film->length()) {
+ _dcp_trim_start->SetRange (0, _film->length().get());
+ _dcp_trim_end->SetRange (0, _film->length().get());
+ }
break;
- case FilmState::DCP_CONTENT_TYPE:
- _dcp_content_type->SetSelection (DCPContentType::as_index (_film->dcp_content_type ()));
+ case Film::DCP_CONTENT_TYPE:
+ checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
- case FilmState::THUMBS:
+ case Film::THUMBS:
break;
- case FilmState::DCP_FRAMES:
- if (_film->dcp_frames() == 0) {
- _dcp_range->SetLabel (wxT ("Whole film"));
- } else {
- stringstream s;
- s << "First " << _film->dcp_frames() << " frames";
- _dcp_range->SetLabel (std_to_wx (s.str ()));
- }
- _sizer->Layout ();
+ case Film::DCP_AB:
+ checked_set (_dcp_ab, _film->dcp_ab ());
break;
- case FilmState::DCP_TRIM_ACTION:
+ case Film::SCALER:
+ checked_set (_scaler, Scaler::as_index (_film->scaler ()));
break;
- case FilmState::DCP_AB:
- _dcp_ab->SetValue (_film->dcp_ab ());
+ case Film::DCP_TRIM_START:
+ checked_set (_dcp_trim_start, _film->dcp_trim_start());
break;
- case FilmState::SCALER:
- _scaler->SetSelection (Scaler::as_index (_film->scaler ()));
+ case Film::DCP_TRIM_END:
+ checked_set (_dcp_trim_end, _film->dcp_trim_end());
break;
- case FilmState::AUDIO_GAIN:
- _audio_gain->SetValue (_film->audio_gain ());
+ case Film::AUDIO_GAIN:
+ checked_set (_audio_gain, _film->audio_gain ());
break;
- case FilmState::AUDIO_DELAY:
- _audio_delay->SetValue (_film->audio_delay ());
+ case Film::AUDIO_DELAY:
+ checked_set (_audio_delay, _film->audio_delay ());
break;
- case FilmState::STILL_DURATION:
- _still_duration->SetValue (_film->still_duration ());
+ case Film::STILL_DURATION:
+ checked_set (_still_duration, _film->still_duration ());
break;
- case FilmState::WITH_SUBTITLES:
- _with_subtitles->SetValue (_film->with_subtitles ());
+ case Film::WITH_SUBTITLES:
+ checked_set (_with_subtitles, _film->with_subtitles ());
+ _subtitle_stream->Enable (_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 FilmState::SUBTITLE_OFFSET:
- _subtitle_offset->SetValue (_film->subtitle_offset ());
+ case Film::SUBTITLE_OFFSET:
+ checked_set (_subtitle_offset, _film->subtitle_offset ());
break;
- case FilmState::SUBTITLE_SCALE:
- _subtitle_scale->SetValue (_film->subtitle_scale() * 100);
+ case Film::SUBTITLE_SCALE:
+ checked_set (_subtitle_scale, _film->subtitle_scale() * 100);
break;
- case FilmState::USE_DCI_NAME:
- _use_dci_name->SetValue (_film->use_dci_name ());
+ case Film::USE_DCI_NAME:
+ checked_set (_use_dci_name, _film->use_dci_name ());
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
- case FilmState::DCI_METADATA:
+ case Film::DCI_METADATA:
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
break;
- case FilmState::AUDIO_STREAM:
+ case Film::AUDIO_STREAM:
+ checked_set (_audio_stream, _film->audio_stream_index ());
_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
- _audio_stream->SetSelection (_film->audio_stream_index ());
setup_audio_details ();
break;
- case FilmState::SUBTITLE_STREAM:
- _subtitle_stream->SetSelection (_film->subtitle_stream_index ());
+ case Film::SUBTITLE_STREAM:
+ checked_set (_subtitle_stream, _film->subtitle_stream_index ());
break;
}
}
return;
}
- _ignore_changes = FilmState::FORMAT;
int const n = _format->GetSelection ();
if (n >= 0) {
assert (n < int (_formats.size()));
_film->set_format (_formats[n]);
}
- _ignore_changes = FilmState::NONE;
-
- _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
}
/** Called when the DCP content type widget has been changed */
return;
}
- _ignore_changes = FilmState::DCP_CONTENT_TYPE;
int const n = _dcp_content_type->GetSelection ();
if (n >= 0) {
_film->set_dcp_content_type (DCPContentType::from_index (n));
}
- _ignore_changes = FilmState::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) {
FileChanged ("");
}
- film_changed (FilmState::NAME);
- film_changed (FilmState::CONTENT);
- film_changed (FilmState::DCP_CONTENT_TYPE);
- film_changed (FilmState::FORMAT);
- film_changed (FilmState::CROP);
- film_changed (FilmState::FILTERS);
- film_changed (FilmState::DCP_FRAMES);
- film_changed (FilmState::DCP_TRIM_ACTION);
- film_changed (FilmState::DCP_AB);
- film_changed (FilmState::SIZE);
- film_changed (FilmState::LENGTH);
- film_changed (FilmState::FRAMES_PER_SECOND);
- film_changed (FilmState::AUDIO_SAMPLE_RATE);
- film_changed (FilmState::SCALER);
- film_changed (FilmState::AUDIO_GAIN);
- film_changed (FilmState::AUDIO_DELAY);
- film_changed (FilmState::STILL_DURATION);
- film_changed (FilmState::WITH_SUBTITLES);
- film_changed (FilmState::SUBTITLE_OFFSET);
- film_changed (FilmState::SUBTITLE_SCALE);
- film_changed (FilmState::USE_DCI_NAME);
- film_changed (FilmState::DCI_METADATA);
+ film_changed (Film::NAME);
+ film_changed (Film::CONTENT);
+ film_changed (Film::DCP_CONTENT_TYPE);
+ film_changed (Film::FORMAT);
+ film_changed (Film::CROP);
+ film_changed (Film::FILTERS);
+ film_changed (Film::DCP_TRIM_START);
+ film_changed (Film::DCP_TRIM_END);
+ film_changed (Film::DCP_AB);
+ film_changed (Film::SIZE);
+ film_changed (Film::LENGTH);
+ film_changed (Film::FRAMES_PER_SECOND);
+ 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::HAS_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.
void
FilmEditor::set_things_sensitive (bool s)
{
+ _generally_sensitive = s;
+
_name->Enable (s);
_use_dci_name->Enable (s);
_edit_dci_button->Enable (s);
- _frames_per_second->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);
+ _dcp_trim_start->Enable (s);
+ _dcp_trim_end->Enable (s);
_dcp_ab->Enable (s);
_audio_gain->Enable (s);
_audio_gain_calculate_button->Enable (s);
_audio_delay->Enable (s);
_still_duration->Enable (s);
- _with_subtitles->Enable (s);
- _subtitle_offset->Enable (s);
- _subtitle_scale->Enable (s);
+
+ setup_subtitle_control_sensitivity ();
}
/** Called when the `Edit filters' button has been clicked */
FilmEditor::edit_filters_clicked (wxCommandEvent &)
{
FilterDialog* d = new FilterDialog (this, _film->filters());
- d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+ d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1));
d->ShowModal ();
d->Destroy ();
}
return;
}
- _ignore_changes = Film::SCALER;
int const n = _scaler->GetSelection ();
if (n >= 0) {
_film->set_scaler (Scaler::from_index (n));
}
- _ignore_changes = Film::NONE;
}
void
return;
}
- _ignore_changes = Film::AUDIO_GAIN;
_film->set_audio_gain (_audio_gain->GetValue ());
- _ignore_changes = Film::NONE;
}
void
return;
}
- _ignore_changes = Film::AUDIO_DELAY;
_film->set_audio_delay (_audio_delay->GetValue ());
- _ignore_changes = Film::NONE;
}
wxControl *
return;
}
- _ignore_changes = Film::STILL_DURATION;
_film->set_still_duration (_still_duration->GetValue ());
- _ignore_changes = Film::NONE;
}
void
-FilmEditor::change_dcp_range_clicked (wxCommandEvent &)
+FilmEditor::dcp_trim_start_changed (wxCommandEvent &)
{
- DCPRangeDialog* d = new DCPRangeDialog (this, _film);
- d->Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
- d->ShowModal ();
+ if (!_film) {
+ return;
+ }
+
+ _film->set_dcp_trim_start (_dcp_trim_start->GetValue ());
}
void
-FilmEditor::dcp_range_changed (int frames, TrimAction action)
+FilmEditor::dcp_trim_end_changed (wxCommandEvent &)
{
- _film->set_dcp_frames (frames);
- _film->set_dcp_trim_action (action);
+ if (!_film) {
+ return;
+ }
+
+ _film->set_dcp_trim_end (_dcp_trim_end->GetValue ());
}
void
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 ()
+FilmEditor::setup_subtitle_control_sensitivity ()
{
- _with_subtitles->Enable (_film->has_subtitles ());
- if (!_film->has_subtitles ()) {
- _with_subtitles->SetValue (false);
+ bool h = false;
+ if (_generally_sensitive && _film) {
+ h = _film->has_subtitles();
}
+
+ _with_subtitles->Enable (h);
+ _subtitle_stream->Enable (h);
+ _subtitle_offset->Enable (h);
+ _subtitle_scale->Enable (h);
}
void
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
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
return;
}
- _ignore_changes = Film::SUBTITLE_STREAM;
_film->set_subtitle_stream (_subtitle_stream->GetSelection ());
- _ignore_changes = Film::NONE;
}
void
_audio->SetLabel (std_to_wx (s.str ()));
}
}
+
+void
+FilmEditor::active_jobs_changed (bool a)
+{
+ set_things_sensitive (!a);
+}
projects / dcpomatic.git / blobdiff