#include "lib/filter.h"
#include "lib/screen.h"
#include "lib/config.h"
-//#include "filter_dialog.h"
+#include "filter_dialog.h"
#include "wx_util.h"
#include "film_editor.h"
-//#include "dcp_range_dialog.h"
+#include "dcp_range_dialog.h"
+#include "gain_calculator_dialog.h"
+#include "sound_processor.h"
using namespace std;
using namespace boost;
/** @param f Film to edit */
FilmEditor::FilmEditor (Film* f, wxWindow* parent)
: wxPanel (parent)
- , _ignore_changes (false)
+ , _ignore_changes (Film::NONE)
, _film (f)
{
- wxSizer* sizer = new wxFlexGridSizer (2, 6, 6);
- SetSizer (sizer);
+ _sizer = new wxFlexGridSizer (2, 4, 4);
+ SetSizer (_sizer);
- add_label_to_sizer (sizer, this, "Name");
+ add_label_to_sizer (_sizer, this, "Name");
_name = new wxTextCtrl (this, wxID_ANY);
- sizer->Add (_name, 1, wxEXPAND);
+ _sizer->Add (_name, 1, wxEXPAND);
- add_label_to_sizer (sizer, this, "Content");
+ add_label_to_sizer (_sizer, this, "Content");
_content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
- sizer->Add (_content, 1, wxEXPAND);
+ _sizer->Add (_content, 1, wxEXPAND);
- add_label_to_sizer (sizer, this, "Content Type");
+ add_label_to_sizer (_sizer, this, "Content Type");
_dcp_content_type = new wxComboBox (this, wxID_ANY);
- sizer->Add (_dcp_content_type);
+ _sizer->Add (_dcp_content_type);
- add_label_to_sizer (sizer, this, "Frames Per Second");
- _frames_per_second = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
- sizer->Add (video_control (_frames_per_second));
-
- add_label_to_sizer (sizer, this, "Format");
+ add_label_to_sizer (_sizer, this, "Format");
_format = new wxComboBox (this, wxID_ANY);
- sizer->Add (_format);
+ _sizer->Add (_format);
{
- add_label_to_sizer (sizer, this, "Crop");
+ add_label_to_sizer (_sizer, this, "Crop");
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
add_label_to_sizer (s, this, "L");
_bottom_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
s->Add (_bottom_crop, 0);
- sizer->Add (s);
+ _sizer->Add (s);
}
/* VIDEO-only stuff */
{
- video_control (add_label_to_sizer (sizer, this, "Filters"));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _filters = new wxStaticText (this, wxID_ANY, wxT (""));
- s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+ video_control (add_label_to_sizer (_sizer, this, "Filters"));
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _filters = new wxStaticText (this, wxID_ANY, wxT ("None"));
+ video_control (_filters);
+ s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
_filters_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
+ video_control (_filters_button);
s->Add (_filters_button, 0);
- sizer->Add (s, 1);
+ _sizer->Add (s, 1);
}
- video_control (add_label_to_sizer (sizer, this, "Scaler"));
+ video_control (add_label_to_sizer (_sizer, this, "Scaler"));
_scaler = new wxComboBox (this, wxID_ANY);
- sizer->Add (video_control (_scaler), 1);
+ _sizer->Add (video_control (_scaler), 1);
{
- video_control (add_label_to_sizer (sizer, this, "Audio Gain"));
+ video_control (add_label_to_sizer (_sizer, this, "Audio Gain"));
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_audio_gain = new wxSpinCtrl (this);
s->Add (video_control (_audio_gain), 1);
video_control (add_label_to_sizer (s, this, "dB"));
- sizer->Add (s);
+ _audio_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
+ video_control (_audio_gain_calculate_button);
+ s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
+ _sizer->Add (s);
}
{
- video_control (add_label_to_sizer (sizer, this, "Audio Delay"));
+ video_control (add_label_to_sizer (_sizer, this, "Audio Delay"));
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_audio_delay = new wxSpinCtrl (this);
s->Add (video_control (_audio_delay), 1);
video_control (add_label_to_sizer (s, this, "ms"));
- sizer->Add (s);
+ _sizer->Add (s);
}
- video_control (add_label_to_sizer (sizer, this, "Original Size"));
+ 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);
+
+ video_control (add_label_to_sizer (_sizer, this, "Original Size"));
_original_size = new wxStaticText (this, wxID_ANY, wxT (""));
- sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL);
+ _sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL);
- video_control (add_label_to_sizer (sizer, this, "Length"));
+ video_control (add_label_to_sizer (_sizer, this, "Length"));
_length = new wxStaticText (this, wxID_ANY, wxT (""));
- sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL);
+ _sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL);
- video_control (add_label_to_sizer (sizer, this, "Audio"));
+ 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);
+ _sizer->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL);
{
- video_control (add_label_to_sizer (sizer, this, "Range"));
+ video_control (add_label_to_sizer (_sizer, this, "Range"));
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_dcp_range = new wxStaticText (this, wxID_ANY, wxT (""));
- s->Add (video_control (_dcp_range), 1, wxALIGN_CENTER_VERTICAL);
+ 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));
- sizer->Add (s);
+ s->Add (video_control (_change_dcp_range_button), 0, 0, 6);
+ _sizer->Add (s);
}
_dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B"));
- sizer->Add (_dcp_ab, 1);
- sizer->AddSpacer (0);
+ video_control (_dcp_ab);
+ _sizer->Add (_dcp_ab, 1);
+ _sizer->AddSpacer (0);
/* STILL-only stuff */
- still_control (add_label_to_sizer (sizer, this, "Duration"));
- _still_duration = new wxSpinCtrl (this);
- sizer->Add (still_control (_still_duration));
- still_control (add_label_to_sizer (sizer, this, "s"));
+ {
+ still_control (add_label_to_sizer (_sizer, this, "Duration"));
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _still_duration = new wxSpinCtrl (this);
+ still_control (_still_duration);
+ s->Add (_still_duration, 1, wxEXPAND);
+ still_control (add_label_to_sizer (s, this, "s"));
+ _sizer->Add (s);
+ }
/* Set up our editing widgets */
_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 ()));
- }
-
vector<DCPContentType const *> const ct = DCPContentType::all ();
for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
/* Now connect to them, since initial values are safely set */
_name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this);
- _frames_per_second->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::frames_per_second_changed), 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);
_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
_dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
_audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
+ _audio_gain_calculate_button->Connect (
+ wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 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);
setup_visibility ();
+ setup_formats ();
}
/** Called when the left crop widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::CROP;
_film->set_left_crop (_left_crop->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the right crop widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::CROP;
_film->set_right_crop (_right_crop->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the top crop widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::CROP;
_film->set_top_crop (_top_crop->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the bottom crop value has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::CROP;
_film->set_bottom_crop (_bottom_crop->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the content filename has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::CONTENT;
try {
_film->set_content (wx_to_std (_content->GetPath ()));
} catch (std::exception& e) {
_content->SetPath (std_to_wx (_film->directory ()));
- stringstream m;
- m << "Could not set content: " << e.what() << ".";
- error_dialog (this, m.str ());
+ error_dialog (this, String::compose ("Could not set content: %1", e.what ()));
}
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
+
+ setup_visibility ();
+ setup_formats ();
}
/** Called when the DCP A/B switch has been toggled */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::DCP_AB;
_film->set_dcp_ab (_dcp_ab->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the name widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::NAME;
_film->set_name (string (_name->GetValue().mb_str()));
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the metadata stored in the Film object has changed;
void
FilmEditor::film_changed (Film::Property p)
{
- if (!_film || _ignore_changes) {
+ if (!_film || _ignore_changes == p) {
return;
}
stringstream s;
switch (p) {
+ case Film::NONE:
+ break;
case Film::CONTENT:
_content->SetPath (std_to_wx (_film->content ()));
setup_visibility ();
+ setup_formats ();
break;
case Film::FORMAT:
- _format->SetSelection (Format::as_index (_film->format ()));
- break;
- case Film::LEFT_CROP:
- _left_crop->SetValue (_film->left_crop ());
- break;
- case Film::RIGHT_CROP:
- _right_crop->SetValue (_film->right_crop ());
- break;
- case Film::TOP_CROP:
- _top_crop->SetValue (_film->top_crop ());
+ {
+ int n = 0;
+ vector<Format const *>::iterator i = _formats.begin ();
+ while (i != _formats.end() && *i != _film->format ()) {
+ ++i;
+ ++n;
+ }
+ _format->SetSelection (n);
break;
- case Film::BOTTOM_CROP:
- _bottom_crop->SetValue (_film->bottom_crop ());
+ }
+ case Film::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);
break;
case Film::FILTERS:
{
pair<string, string> p = Filter::ffmpeg_strings (_film->filters ());
- string const b = p.first + " " + p.second;
- _filters->SetLabel (std_to_wx (b));
+ if (p.first.empty () && p.second.empty ()) {
+ _filters->SetLabel (_("None"));
+ } else {
+ string const b = p.first + " " + p.second;
+ _filters->SetLabel (std_to_wx (b));
+ }
+ _sizer->Layout ();
break;
}
case Film::NAME:
{
stringstream s;
s << fixed << setprecision(2) << _film->frames_per_second();
- _frames_per_second->ChangeValue (std_to_wx (s.str ()));
+ _frames_per_second->SetLabel (std_to_wx (s.str ()));
break;
}
case Film::AUDIO_CHANNELS:
s << "First " << _film->dcp_frames() << " frames";
_dcp_range->SetLabel (std_to_wx (s.str ()));
}
+ _sizer->Layout ();
break;
case Film::DCP_TRIM_ACTION:
break;
return;
}
- _ignore_changes = true;
+ _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 = false;
+ _ignore_changes = Film::NONE;
}
/** Called when the DCP content type widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::DCP_CONTENT_TYPE;
int const n = _dcp_content_type->GetSelection ();
if (n >= 0) {
_film->set_dcp_content_type (DCPContentType::from_index (n));
}
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
/** Sets the Film that we are editing */
film_changed (Film::CONTENT);
film_changed (Film::DCP_CONTENT_TYPE);
film_changed (Film::FORMAT);
- film_changed (Film::LEFT_CROP);
- film_changed (Film::RIGHT_CROP);
- film_changed (Film::TOP_CROP);
- film_changed (Film::BOTTOM_CROP);
+ film_changed (Film::CROP);
film_changed (Film::FILTERS);
film_changed (Film::DCP_FRAMES);
film_changed (Film::DCP_TRIM_ACTION);
_change_dcp_range_button->Enable (s);
_dcp_ab->Enable (s);
_audio_gain->Enable (s);
+ _audio_gain_calculate_button->Enable (s);
_audio_delay->Enable (s);
_still_duration->Enable (s);
}
void
FilmEditor::edit_filters_clicked (wxCommandEvent &)
{
-// FilterDialog d (_film->filters ());
-// d.ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
-// d.run ();
+ FilterDialog* d = new FilterDialog (this, _film->filters ());
+ d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+ d->ShowModal ();
+ d->Destroy ();
}
/** Called when the scaler widget has been changed */
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::SCALER;
int const n = _scaler->GetSelection ();
if (n >= 0) {
_film->set_scaler (Scaler::from_index (n));
}
- _ignore_changes = false;
-}
-
-/** Called when the frames per second widget has been changed */
-void
-FilmEditor::frames_per_second_changed (wxCommandEvent &)
-{
- if (!_film) {
- return;
- }
-
- _ignore_changes = true;
- _film->set_frames_per_second (boost::lexical_cast<float> (wx_to_std (_frames_per_second->GetValue ())));
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
void
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::AUDIO_GAIN;
_film->set_audio_gain (_audio_gain->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
void
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::AUDIO_DELAY;
_film->set_audio_delay (_audio_delay->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
wxControl *
for (list<wxControl*>::iterator i = _still_controls.begin(); i != _still_controls.end(); ++i) {
(*i)->Show (c == STILL);
}
+
+ _sizer->Layout ();
}
void
return;
}
- _ignore_changes = true;
+ _ignore_changes = Film::STILL_DURATION;
_film->set_still_duration (_still_duration->GetValue ());
- _ignore_changes = false;
+ _ignore_changes = Film::NONE;
}
void
FilmEditor::change_dcp_range_clicked (wxCommandEvent &)
{
-//XXX DCPRangeDialog d (_film);
-//XXX d.Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
-//XXX d.run ();
+ DCPRangeDialog* d = new DCPRangeDialog (this, _film);
+ d->Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
+ d->ShowModal ();
}
void
FilmEditor::dcp_range_changed (int frames, TrimAction action)
{
- _ignore_changes = true;
_film->set_dcp_frames (frames);
_film->set_dcp_trim_action (action);
- _ignore_changes = false;
+}
+
+void
+FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
+{
+ GainCalculatorDialog* d = new GainCalculatorDialog (this);
+ d->ShowModal ();
+
+ if (d->wanted_fader() == 0 || d->actual_fader() == 0) {
+ d->Destroy ();
+ return;
+ }
+
+ _audio_gain->SetValue (
+ Config::instance()->sound_processor()->db_for_fader_change (
+ d->wanted_fader (),
+ d->actual_fader ()
+ )
+ );
+
+ /* This appears to be necessary, as the change is not signalled,
+ I think.
+ */
+ wxCommandEvent dummy;
+ audio_gain_changed (dummy);
+
+ 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 ();
}
projects / dcpomatic.git / blobdiff