/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "timecode.h"
#include "content_panel.h"
#include "move_to_dialog.h"
+#include "static_text.h"
+#include "dcpomatic_button.h"
#include "lib/content.h"
#include "lib/image_content.h"
#include "lib/text_content.h"
using std::string;
using std::set;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using dcp::locale_convert;
-TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
+TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
/* horrid hack for apparent lack of context support with wxWidgets i18n code */
/// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
: ContentSubPanel (p, S_("Timing|Timing"))
, _viewer (viewer)
{
- wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
- _sizer->Add (grid, 0, wxALL, 8);
-
wxSize size = TimecodeBase::size (this);
- wxSizer* labels = new wxBoxSizer (wxHORIZONTAL);
+ for (int i = 0; i < 3; ++i) {
+ _colon[i] = create_label (this, wxT(":"), false);
+ }
+
//// TRANSLATORS: this is an abbreviation for "hours"
- wxStaticText* t = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+ _h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
#ifdef DCPOMATIC_LINUX
/* Hack to work around failure to centre text on GTK */
- gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE);
+ gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE);
#endif
- labels->Add (t, 1, wxEXPAND);
- add_label_to_sizer (labels, this, wxT (":"), false);
//// TRANSLATORS: this is an abbreviation for "minutes"
- t = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+ _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
#ifdef DCPOMATIC_LINUX
- gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE);
+ gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE);
#endif
- labels->Add (t, 1, wxEXPAND);
- add_label_to_sizer (labels, this, wxT (":"), false);
//// TRANSLATORS: this is an abbreviation for "seconds"
- t = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+ _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
#ifdef DCPOMATIC_LINUX
- gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE);
+ gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE);
#endif
- labels->Add (t, 1, wxEXPAND);
- add_label_to_sizer (labels, this, wxT (":"), false);
//// TRANSLATORS: this is an abbreviation for "frames"
- t = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+ _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
#ifdef DCPOMATIC_LINUX
- gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE);
+ gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
#endif
- labels->Add (t, 1, wxEXPAND);
- grid->Add (new wxStaticText (this, wxID_ANY, wxT ("")));
- grid->Add (labels);
- add_label_to_sizer (grid, this, _("Position"), true);
+ _position_label = create_label (this, _("Position"), true);
_position = new Timecode<DCPTime> (this);
- grid->Add (_position);
- _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel"));
- grid->AddSpacer (0);
- grid->Add (_move_to_start_of_reel);
- add_label_to_sizer (grid, this, _("Full length"), true);
+ _move_to_start_of_reel = new Button (this, _("Move to start of reel"));
+ _full_length_label = create_label (this, _("Full length"), true);
_full_length = new Timecode<DCPTime> (this);
- grid->Add (_full_length);
- add_label_to_sizer (grid, this, _("Trim from start"), true);
+ _trim_start_label = create_label (this, _("Trim from start"), true);
_trim_start = new Timecode<ContentTime> (this);
- grid->Add (_trim_start);
- _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position"));
- grid->AddSpacer (0);
- grid->Add (_trim_start_to_playhead);
- add_label_to_sizer (grid, this, _("Trim from end"), true);
+ _trim_start_to_playhead = new Button (this, _("Trim up to current position"));
+ _trim_end_label = create_label (this, _("Trim from end"), true);
_trim_end = new Timecode<ContentTime> (this);
- grid->Add (_trim_end);
- _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position"));
- grid->AddSpacer (0);
- grid->Add (_trim_end_to_playhead);
- add_label_to_sizer (grid, this, _("Play length"), true);
+ _trim_end_to_playhead = new Button (this, _("Trim after current position"));
+ _play_length_label = create_label (this, _("Play length"), true);
_play_length = new Timecode<DCPTime> (this);
- grid->Add (_play_length);
-
- {
- add_label_to_sizer (grid, this, _("Video frame rate"), true);
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _video_frame_rate = new wxTextCtrl (this, wxID_ANY);
- s->Add (_video_frame_rate, 1, wxEXPAND);
- _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set"));
- _set_video_frame_rate->Enable (false);
- s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8);
- grid->Add (s, 1, wxEXPAND);
- }
- grid->AddSpacer (0);
+ _video_frame_rate_label = create_label (this, _("Video frame rate"), true);
+ _video_frame_rate = new wxTextCtrl (this, wxID_ANY);
+ _set_video_frame_rate = new Button (this, _("Set"));
+ _set_video_frame_rate->Enable (false);
/* We can't use Wrap() here as it doesn't work with markup:
* http://trac.wxwidgets.org/ticket/13389
}
}
- t = new wxStaticText (this, wxID_ANY, wxT (""));
- t->SetLabelMarkup (out);
+ _tip = new StaticText (this, wxT (""));
+ _tip->SetLabelMarkup (out);
#ifdef DCPOMATIC_OSX
/* Hack to stop hidden text on some versions of OS X */
- t->SetMinSize (wxSize (-1, 256));
+ _tip->SetMinSize (wxSize (-1, 256));
#endif
- grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6);
-
- /* Completely speculative fix for #891 */
- grid->Layout ();
_position->Changed.connect (boost::bind (&TimingPanel::position_changed, this));
_move_to_start_of_reel->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this));
_video_frame_rate->Bind (wxEVT_TEXT, boost::bind (&TimingPanel::video_frame_rate_changed, this));
_set_video_frame_rate->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::set_video_frame_rate, this));
- _viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ DCPOMATIC_ASSERT (fv);
+ fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
setup_sensitivity ();
+ add_to_grid ();
}
void
TimingPanel::add_to_grid ()
{
+ bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
+
+ int r = 0;
+
+ wxSizer* labels = new wxBoxSizer (wxHORIZONTAL);
+ labels->Add (_h_label, 1, wxEXPAND);
+ add_label_to_sizer (labels, _colon[0], false);
+ labels->Add (_m_label, 1, wxEXPAND);
+ add_label_to_sizer (labels, _colon[1], false);
+ labels->Add (_s_label, 1, wxEXPAND);
+ add_label_to_sizer (labels, _colon[2], false);
+ labels->Add (_f_label, 1, wxEXPAND);
+ _grid->Add (labels, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _position_label, true, wxGBPosition(r, 0));
+ _grid->Add (_position, wxGBPosition(r, 1));
+ ++r;
+
+ _move_to_start_of_reel->Show (full);
+ _full_length_label->Show (full);
+ _full_length->Show (full);
+ _trim_start_label->Show (full);
+ _trim_start->Show (full);
+ _trim_start_to_playhead->Show (full);
+ _trim_end_label->Show (full);
+ _trim_end->Show (full);
+ _trim_end_to_playhead->Show (full);
+ _play_length_label->Show (full);
+ _play_length->Show (full);
+ _video_frame_rate_label->Show (full);
+ _video_frame_rate->Show (full);
+ _set_video_frame_rate->Show (full);
+ _tip->Show (full);
+
+ if (full) {
+ _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
+ _grid->Add (_full_length, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
+ _grid->Add (_trim_start, wxGBPosition(r, 1));
+ ++r;
+
+ _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0));
+ _grid->Add (_trim_end, wxGBPosition(r, 1));
+ ++r;
+
+ _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
+ _grid->Add (_play_length, wxGBPosition(r, 1));
+ ++r;
+
+ {
+ add_label_to_sizer (_grid, _video_frame_rate_label, true, wxGBPosition(r, 0));
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_video_frame_rate, 1, wxEXPAND);
+ s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8);
+ _grid->Add (s, wxGBPosition(r, 1), wxGBSpan(1, 2));
+ }
+ ++r;
+ _grid->Add (_tip, wxGBPosition(r, 1), wxGBSpan(1, 2));
+ }
+
+ /* Completely speculative fix for #891 */
+ _grid->Layout ();
}
void
{
set<DCPTime> check;
BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
- check.insert (i->full_length ());
+ check.insert (i->full_length(_parent->film()));
}
if (check.size() == 1) {
- _full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ());
+ _full_length->set (_parent->selected().front()->full_length(_parent->film()), _parent->film()->video_frame_rate());
} else {
_full_length->clear ();
}
{
set<DCPTime> check;
BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
- check.insert (i->length_after_trim ());
+ check.insert (i->length_after_trim(_parent->film()));
}
if (check.size() == 1) {
- _play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ());
+ _play_length->set (_parent->selected().front()->length_after_trim(_parent->film()), _parent->film()->video_frame_rate());
} else {
_play_length->clear ();
}
{
DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- i->set_position (pos);
+ i->set_position (_parent->film(), pos);
}
}
void
TimingPanel::trim_start_changed ()
{
- DCPTime const ph = _viewer->position ();
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ if (!fv) {
+ return;
+ }
+
+ DCPTime const ph = fv->position ();
- _viewer->set_coalesce_player_changes (true);
+ fv->set_coalesce_player_changes (true);
shared_ptr<Content> ref;
optional<FrameRateChange> ref_frc;
ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- if (i->position() <= ph && ph < i->end()) {
+ if (i->position() <= ph && ph < i->end(_parent->film())) {
/* The playhead is in i. Use it as a reference to work out
where to put the playhead post-trim; we're trying to keep the playhead
at the same frame of content that we're looking at pre-trim.
}
if (ref) {
- _viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get())));
+ fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
}
- _viewer->set_coalesce_player_changes (false);
+ fv->set_coalesce_player_changes (false);
}
void
TimingPanel::trim_end_changed ()
{
- _viewer->set_coalesce_player_changes (true);
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ if (!fv) {
+ return;
+ }
+
+ fv->set_coalesce_player_changes (true);
ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
}
/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
- if (_viewer->position() >= _parent->film()->length()) {
- _viewer->set_position (_parent->film()->length() - DCPTime::from_frames (1, _parent->film()->video_frame_rate()));
+ if (fv->position() >= _parent->film()->length()) {
+ fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
}
- _viewer->set_coalesce_player_changes (true);
+ fv->set_coalesce_player_changes (true);
}
void
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
i->set_trim_end (
- ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
+ ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
);
}
}
void
TimingPanel::trim_start_to_playhead_clicked ()
{
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ if (!fv) {
+ return;
+ }
+
shared_ptr<const Film> film = _parent->film ();
- DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
+ DCPTime const ph = fv->position().floor (film->video_frame_rate ());
optional<DCPTime> new_ph;
- _viewer->set_coalesce_player_changes (true);
+ fv->set_coalesce_player_changes (true);
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- if (i->position() < ph && ph < i->end ()) {
- FrameRateChange const frc = film->active_frame_rate_change (i->position ());
- i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
+ if (i->position() < ph && ph < i->end(film)) {
+ FrameRateChange const frc = film->active_frame_rate_change (i->position());
+ i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc));
new_ph = i->position ();
}
}
if (new_ph) {
- _viewer->set_position (new_ph.get());
+ fv->seek (new_ph.get(), true);
}
- _viewer->set_coalesce_player_changes (false);
+ fv->set_coalesce_player_changes (false);
}
void
TimingPanel::trim_end_to_playhead_clicked ()
{
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ if (!fv) {
+ return;
+ }
+
shared_ptr<const Film> film = _parent->film ();
- DCPTime const ph = _viewer->position().floor (film->video_frame_rate ());
+ DCPTime const ph = fv->position().floor (film->video_frame_rate ());
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- if (i->position() < ph && ph < i->end ()) {
+ if (i->position() < ph && ph < i->end(film)) {
FrameRateChange const frc = film->active_frame_rate_change (i->position ());
- i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
+ i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start());
}
}
}
_play_length->Enable (e);
_video_frame_rate->Enable (e);
- DCPTime const ph = _viewer->position ();
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ DCPOMATIC_ASSERT (fv);
+ DCPTime const ph = fv->position ();
bool any_over_ph = false;
BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
- if (i->position() <= ph && ph < i->end()) {
+ if (i->position() <= ph && ph < i->end(_parent->film())) {
any_over_ph = true;
}
}
MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
if (d->ShowModal() == wxID_OK) {
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- i->set_position (d->position ());
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+ i->set_position (_parent->film(), d->position());
}
}
d->Destroy ();