#include "lib/audio_content.h"
#include "lib/string_text_file_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"
+#if defined(__WXGTK20__) && !defined(__WXGTK3__)
+#define TIMING_PANEL_ALIGNMENT_HACK 1
+DCPOMATIC_DISABLE_WARNINGS
+#include <gtk/gtk.h>
+DCPOMATIC_ENABLE_WARNINGS
+#endif
#include <boost/foreach.hpp>
#include <set>
#include <iostream>
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
+using namespace dcpomatic;
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)
+ , _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);
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
optional<FrameRateChange> ref_frc;
optional<DCPTime> ref_ph;
- ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
-
+ Suspender::Block bl = _film_content_changed_suspender.block ();
BOOST_FOREACH (shared_ptr<Content> 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
ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
}
+ ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
i->set_trim_start (trim);
}
fv->set_coalesce_player_changes (true);
- ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
+ Suspender::Block bl = _film_content_changed_suspender.block ();
BOOST_FOREACH (shared_ptr<Content> 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);
}
fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true);
}
- fv->set_coalesce_player_changes (true);
+ fv->set_coalesce_player_changes (false);
}
void
TimingPanel::play_length_changed ()
{
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 ()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
i->set_trim_end (
void
TimingPanel::video_frame_rate_changed ()
{
- _set_video_frame_rate->Enable (true);
+ 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
if (_video_frame_rate->GetValue() != wxT("")) {
fr = locale_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
}
+ Suspender::Block bl = _film_content_changed_suspender.block ();
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
if (fr) {
i->set_video_frame_rate (*fr);
}
}
+ fv->set_coalesce_player_changes (false);
+
if (new_ph) {
fv->seek (new_ph.get(), true);
}
-
- fv->set_coalesce_player_changes (false);
}
void
BOOST_FOREACH (shared_ptr<Content> 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());
}
}
}
projects / dcpomatic.git / blobdiff