#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
#include <dcp/locale_convert.h>
-#include <boost/foreach.hpp>
+#include "lib/warnings.h"
+#if defined(__WXGTK20__) && !defined(__WXGTK3__)
+#define TIMING_PANEL_ALIGNMENT_HACK 1
+DCPOMATIC_DISABLE_WARNINGS
+#include <gtk/gtk.h>
+DCPOMATIC_ENABLE_WARNINGS
+#endif
#include <set>
#include <iostream>
using std::cout;
using std::string;
using std::set;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
using namespace dcpomatic;
/// 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))
{
wxSize size = TimecodeBase::size (this);
//// TRANSLATORS: this is an abbreviation for "hours"
_h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#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
//// TRANSLATORS: this is an abbreviation for "minutes"
_m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifdef TIMING_PANEL_ALIGNMENT_HACK
gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE);
#endif
//// TRANSLATORS: this is an abbreviation for "seconds"
_s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifdef TIMING_PANEL_ALIGNMENT_HACK
gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE);
#endif
//// TRANSLATORS: this is an abbreviation for "frames"
_f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifdef TIMING_PANEL_ALIGNMENT_HACK
gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
#endif
_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);
- _trim_end_to_playhead = new Button (this, _("Trim after current position"));
+ _trim_end_to_playhead = new Button (this, _("Trim from current position to end"));
_play_length_label = create_label (this, _("Play length"), true);
_play_length = new Timecode<DCPTime> (this);
- _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
- */
-
- wxString in = _("<i>Only change this if the content's frame rate has been read incorrectly.</i>");
- wxString out;
- int const width = 20;
- int current = 0;
- for (size_t i = 0; i < in.Length(); ++i) {
- if (in[i] == ' ' && current >= width) {
- out += '\n';
- current = 0;
- } else {
- out += in[i];
- ++current;
- }
- }
-
- _tip = new StaticText (this, wxT (""));
- _tip->SetLabelMarkup (out);
-#ifdef DCPOMATIC_OSX
- /* Hack to stop hidden text on some versions of OS X */
- _tip->SetMinSize (wxSize (-1, 256));
-#endif
-
_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));
_full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this));
_trim_end->Changed.connect (boost::bind (&TimingPanel::trim_end_changed, this));
_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));
- _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));
shared_ptr<FilmViewer> fv = _viewer.lock ();
DCPOMATIC_ASSERT (fv);
void
TimingPanel::add_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
wxSizer* labels = new wxBoxSizer (wxHORIZONTAL);
_grid->Add (_position, wxGBPosition(r, 1));
++r;
- _move_to_start_of_reel->Show (full);
- _full_length_label->Show (full);
- _full_length->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;
- }
+ _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));
_grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
++r;
- if (full) {
- 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));
- }
+ add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
+ _grid->Add (_play_length, wxGBPosition(r, 1));
+ ++r;
/* Completely speculative fix for #891 */
_grid->Layout ();
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()));
}
void
TimingPanel::film_content_changed (int property)
{
+ if (_film_content_changed_suspender.check(property)) {
+ return;
+ }
+
int const film_video_frame_rate = _parent->film()->video_frame_rate ();
/* Here we check to see if we have exactly one different value of various
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 ());
}
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;
}
}
-
- bool const single_frame_image_content = content && dynamic_pointer_cast<const ImageContent> (content) && content->number_of_paths() == 1;
-
- if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) {
- checked_set (_video_frame_rate, locale_convert<string> (content->video_frame_rate().get(), 5));
- _video_frame_rate->Enable (true);
- } else {
- checked_set (_video_frame_rate, wxT (""));
- _video_frame_rate->Enable (false);
- }
}
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;
_full_length->set_editable (have_still);
_play_length->set_editable (!have_still);
- _set_video_frame_rate->Enable (false);
setup_sensitivity ();
}
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);
optional<FrameRateChange> ref_frc;
optional<DCPTime> ref_ph;
-
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ Suspender::Block bl = _film_content_changed_suspender.block ();
+ 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
fv->set_coalesce_player_changes (true);
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ Suspender::Block bl = _film_content_changed_suspender.block ();
+ 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);
}
TimingPanel::play_length_changed ()
{
DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ Suspender::Block bl = _film_content_changed_suspender.block ();
+ 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()
}
}
-void
-TimingPanel::video_frame_rate_changed ()
-{
- bool enable = true;
- if (_video_frame_rate->GetValue() == wxT("")) {
- /* No frame rate has been entered; if the user clicks "set" now it would unset the video
- frame rate in the selected content. This can't be allowed for some content types.
- */
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
- if (
- dynamic_pointer_cast<DCPContent>(i) ||
- dynamic_pointer_cast<FFmpegContent>(i)
- ) {
- enable = false;
- }
- }
- }
-
- _set_video_frame_rate->Enable (enable);
-}
-
-void
-TimingPanel::set_video_frame_rate ()
-{
- optional<double> fr;
- if (_video_frame_rate->GetValue() != wxT("")) {
- fr = locale_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
- }
- BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- if (fr) {
- i->set_video_frame_rate (*fr);
- } else {
- i->unset_video_frame_rate ();
- }
- }
-
- _set_video_frame_rate->Enable (false);
-}
void
TimingPanel::content_selection_changed ()
fv->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));
}
}
+ fv->set_coalesce_player_changes (false);
+
if (new_ph) {
fv->seek (new_ph.get(), true);
}
-
- fv->set_coalesce_player_changes (false);
}
void
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 ()) {
+ 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 - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start());
+ i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph, frc) - i->trim_start());
}
}
}
_trim_start->Enable (e);
_trim_end->Enable (e);
_play_length->Enable (e);
- _video_frame_rate->Enable (e);
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 ()) {
+ 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());
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());
}
}
projects / dcpomatic.git / blobdiff