*/
-#include "timing_panel.h"
-#include "wx_util.h"
-#include "film_viewer.h"
-#include "timecode.h"
+
#include "content_panel.h"
+#include "dcpomatic_button.h"
+#include "film_viewer.h"
#include "move_to_dialog.h"
#include "static_text.h"
-#include "dcpomatic_button.h"
+#include "timecode.h"
+#include "timing_panel.h"
+#include "wx_util.h"
+#include "lib/audio_content.h"
#include "lib/content.h"
-#include "lib/image_content.h"
-#include "lib/text_content.h"
+#include "lib/dcp_content.h"
#include "lib/dcp_subtitle_content.h"
-#include "lib/audio_content.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
#include "lib/video_content.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
#include <dcp/locale_convert.h>
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
#if defined(__WXGTK20__) && !defined(__WXGTK3__)
#define TIMING_PANEL_ALIGNMENT_HACK 1
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <gtk/gtk.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#endif
-#include <boost/foreach.hpp>
#include <set>
-#include <iostream>
-using std::cout;
+
using std::string;
using std::set;
using std::shared_ptr;
using dcp::locale_convert;
using namespace dcpomatic;
-TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
+
+TimingPanel::TimingPanel (ContentPanel* p, 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)
, _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1))
+{
+
+}
+
+
+void
+TimingPanel::create ()
{
wxSize size = TimecodeBase::size (this);
}
//// TRANSLATORS: this is an abbreviation for "hours"
- _h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef TIMING_PANEL_ALIGNMENT_HACK
- /* Hack to work around failure to centre text on GTK */
- gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE);
-#endif
+ _label.push_back(new StaticText(this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL));
//// TRANSLATORS: this is an abbreviation for "minutes"
- _m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef TIMING_PANEL_ALIGNMENT_HACK
- gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE);
-#endif
+ _label.push_back(new StaticText(this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL));
//// TRANSLATORS: this is an abbreviation for "seconds"
- _s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef TIMING_PANEL_ALIGNMENT_HACK
- gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE);
-#endif
+ _label.push_back(new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL));
//// TRANSLATORS: this is an abbreviation for "frames"
- _f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
+ _label.push_back(new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL));
+
+ if (GetLayoutDirection() == wxLayout_RightToLeft) {
+ std::reverse(_label.begin(), _label.end());
+ }
+
#ifdef TIMING_PANEL_ALIGNMENT_HACK
- gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
+ for (auto label: _label) {
+ /* Hack to work around failure to centre text on GTK */
+ gtk_label_set_line_wrap(GTK_LABEL(label->GetHandle()), FALSE);
+ }
#endif
_position_label = create_label (this, _("Position"), true);
_trim_end_to_playhead->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this));
_play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this));
- shared_ptr<FilmViewer> fv = _viewer.lock ();
- DCPOMATIC_ASSERT (fv);
- fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+ _viewer.ImageChanged.connect(boost::bind(&TimingPanel::setup_sensitivity, this));
setup_sensitivity ();
add_to_grid ();
+
+ _sizer->Layout ();
}
void
{
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);
+ auto labels = new wxBoxSizer(wxHORIZONTAL);
+ int index = 0;
+ for (auto label: _label) {
+ labels->Add(label, 1, wxEXPAND);
+ if (index < 3) {
+ add_label_to_sizer(labels, _colon[index++], false);
+ }
+ }
_grid->Add (labels, wxGBPosition(r, 1));
++r;
TimingPanel::update_full_length ()
{
set<DCPTime> check;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
check.insert (i->full_length(_parent->film()));
}
TimingPanel::update_play_length ()
{
set<DCPTime> check;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
check.insert (i->length_after_trim(_parent->film()));
}
if (property == ContentProperty::POSITION) {
set<DCPTime> check;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
check.insert (i->position ());
}
} else if (property == ContentProperty::TRIM_START) {
set<ContentTime> check;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
check.insert (i->trim_start ());
}
} else if (property == ContentProperty::TRIM_END) {
set<ContentTime> check;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
check.insert (i->trim_end ());
}
if (property == ContentProperty::VIDEO_FRAME_RATE) {
set<double> check_vc;
shared_ptr<const Content> content;
- int count_ac = 0;
- int count_sc = 0;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
if (i->video && i->video_frame_rate()) {
check_vc.insert (i->video_frame_rate().get());
content = i;
}
if (i->audio && i->video_frame_rate()) {
- ++count_ac;
content = i;
}
if (!i->text.empty() && i->video_frame_rate()) {
- ++count_sc;
content = i;
}
}
bool have_still = false;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
if (ic && ic->still ()) {
have_still = true;
TimingPanel::position_changed ()
{
DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
i->set_position (_parent->film(), pos);
}
}
{
int const vfr = _parent->film()->video_frame_rate ();
Frame const len = _full_length->get (vfr).frames_round (vfr);
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
if (ic && ic->still ()) {
ic->video->set_length (len);
void
TimingPanel::trim_start_changed ()
{
- shared_ptr<FilmViewer> fv = _viewer.lock ();
- if (!fv) {
- return;
- }
-
- DCPTime const ph = fv->position ();
+ DCPTime const ph = _viewer.position();
- fv->set_coalesce_player_changes (true);
+ _viewer.set_coalesce_player_changes(true);
shared_ptr<Content> ref;
optional<FrameRateChange> ref_frc;
optional<DCPTime> ref_ph;
Suspender::Block bl = _film_content_changed_suspender.block ();
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
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
}
ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
- i->set_trim_start (trim);
+ i->set_trim_start(_parent->film(), trim);
}
if (ref) {
- fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
+ _viewer.seek(max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true);
}
- fv->set_coalesce_player_changes (false);
+ _viewer.set_coalesce_player_changes(false);
}
void
TimingPanel::trim_end_changed ()
{
- shared_ptr<FilmViewer> fv = _viewer.lock ();
- if (!fv) {
- return;
- }
-
- fv->set_coalesce_player_changes (true);
+ _viewer.set_coalesce_player_changes(true);
Suspender::Block bl = _film_content_changed_suspender.block ();
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
i->set_trim_end (trim);
}
/* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
- if (fv->position() >= _parent->film()->length()) {
- fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
+ if (_viewer.position() >= _parent->film()->length()) {
+ _viewer.seek(_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
}
- fv->set_coalesce_player_changes (false);
+ _viewer.set_coalesce_player_changes(false);
}
void
{
DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
Suspender::Block bl = _film_content_changed_suspender.block ();
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
- i->set_trim_end (
- ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
- );
+ auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length);
+ i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start()));
}
}
}
void
-TimingPanel::film_changed (Film::Property p)
+TimingPanel::film_changed(FilmProperty p)
{
- if (p == Film::VIDEO_FRAME_RATE) {
+ if (p == FilmProperty::VIDEO_FRAME_RATE) {
update_full_length ();
update_play_length ();
}
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 = fv->position().floor (film->video_frame_rate ());
+ auto film = _parent->film ();
+ DCPTime const ph = _viewer.position().floor(film->video_frame_rate());
optional<DCPTime> new_ph;
- fv->set_coalesce_player_changes (true);
+ _viewer.set_coalesce_player_changes(true);
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
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));
+ i->set_trim_start(film, i->trim_start() + ContentTime(ph - i->position(), frc));
new_ph = i->position ();
}
}
- fv->set_coalesce_player_changes (false);
+ _viewer.set_coalesce_player_changes(false);
if (new_ph) {
- fv->seek (new_ph.get(), true);
+ _viewer.seek(new_ph.get(), true);
}
}
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 = fv->position().floor (film->video_frame_rate ());
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ auto film = _parent->film ();
+ auto const ph = _viewer.position().floor(film->video_frame_rate());
+ for (auto i: _parent->selected()) {
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(film) - ph, frc) - i->trim_start());
_trim_end->Enable (e);
_play_length->Enable (e);
- shared_ptr<FilmViewer> fv = _viewer.lock ();
- DCPOMATIC_ASSERT (fv);
- DCPTime const ph = fv->position ();
+ auto const ph = _viewer.position();
bool any_over_ph = false;
- BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
if (i->position() <= ph && ph < i->end(_parent->film())) {
any_over_ph = true;
}
/* Find common position of all selected content, if it exists */
optional<DCPTime> position;
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ for (auto i: _parent->selected()) {
if (!position) {
position = i->position();
} else {
}
}
- MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
+ auto d = make_wx<MoveToDialog>(this, position, _parent->film());
if (d->ShowModal() == wxID_OK) {
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+ for (auto i: _parent->selected()) {
i->set_position (_parent->film(), d->position());
}
}
- d->Destroy ();
}
projects / dcpomatic.git / blobdiff