/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "lib/raw_convert.h"
#include "lib/subtitle_content.h"
#include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_content.h"
+#include "lib/audio_content.h"
+#include "lib/text_subtitle_content.h"
+#include "lib/video_content.h"
#include <boost/foreach.hpp>
#include <set>
#include <iostream>
using std::set;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
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)
{
_play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this));
_video_frame_rate->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TimingPanel::video_frame_rate_changed, this));
_set_video_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::set_video_frame_rate, this));
+
+ _viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this));
+
+ setup_sensitivity ();
}
void
property == ContentProperty::LENGTH ||
property == VideoContentProperty::VIDEO_FRAME_RATE ||
property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+ property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE ||
property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
) {
property == ContentProperty::TRIM_END ||
property == VideoContentProperty::VIDEO_FRAME_RATE ||
property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+ property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE ||
property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
) {
if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) {
set<double> check_vc;
- shared_ptr<const VideoContent> vc;
+ shared_ptr<const Content> vc;
+ int count_ac = 0;
+ shared_ptr<const Content> ac;
int count_sc = 0;
- shared_ptr<const SubtitleContent> sc;
+ shared_ptr<const Content> sc;
BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
- shared_ptr<const VideoContent> vt = dynamic_pointer_cast<const VideoContent> (i);
- if (vt) {
- check_vc.insert (vt->video_frame_rate ());
- vc = vt;
+ if (i->video) {
+ check_vc.insert (i->video->video_frame_rate ());
+ vc = i;
+ }
+ shared_ptr<const AudioContent> at = dynamic_pointer_cast<const AudioContent> (i);
+ if (i->audio) {
+ ++count_ac;
+ ac = at;
}
- shared_ptr<const SubtitleContent> st = dynamic_pointer_cast<const SubtitleContent> (i);
- if (st) {
+ if (i->subtitle) {
++count_sc;
- sc = st;
+ sc = i;
}
}
bool const single_frame_image_content = vc && dynamic_pointer_cast<const ImageContent> (vc) && vc->number_of_paths() == 1;
- if ((check_vc.size() == 1 || count_sc == 1) && !single_frame_image_content) {
+ if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) {
if (vc) {
- checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5));
+ checked_set (_video_frame_rate, raw_convert<string> (vc->video->video_frame_rate (), 5));
+ } else if (ac) {
+ checked_set (_video_frame_rate, raw_convert<string> (ac->audio->audio_video_frame_rate (), 5));
} else if (sc) {
- checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle_video_frame_rate (), 5));
+ checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle->subtitle_video_frame_rate (), 5));
}
_video_frame_rate->Enable (true);
} else {
_full_length->set_editable (have_still);
_play_length->set_editable (!have_still);
_set_video_frame_rate->Enable (false);
+ setup_sensitivity ();
}
void
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
if (ic && ic->still ()) {
int const vfr = _parent->film()->video_frame_rate ();
- ic->set_video_length (_full_length->get (vfr).frames_round (vfr));
+ ic->video->set_video_length (_full_length->get (vfr).frames_round (vfr));
}
}
}
void
TimingPanel::trim_start_changed ()
{
+ DCPTime const ph = _viewer->position ();
+
+ _viewer->set_coalesce_player_changes (true);
+
+ shared_ptr<Content> ref;
+ optional<FrameRateChange> ref_frc;
+ optional<DCPTime> ref_ph;
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+ if (i->position() <= ph && ph < i->end()) {
+ /* 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.
+ */
+ ref = i;
+ ref_frc = _parent->film()->active_frame_rate_change (i->position ());
+ ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
+ }
+
i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
}
-}
+ if (ref) {
+ _viewer->set_position (max (DCPTime(), ref_ph.get() + ref->position() - DCPTime (ref->trim_start(), ref_frc.get())));
+ }
+
+ _viewer->set_coalesce_player_changes (false);
+}
void
TimingPanel::trim_end_changed ()
{
+ _viewer->set_coalesce_player_changes (true);
+
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
}
+
+ /* 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()));
+ }
+
+ _viewer->set_coalesce_player_changes (true);
}
void
TimingPanel::set_video_frame_rate ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
shared_ptr<DCPSubtitleContent> dsc = dynamic_pointer_cast<DCPSubtitleContent> (i);
- shared_ptr<SubRipContent> ssc = dynamic_pointer_cast<SubRipContent> (i);
- if (vc) {
- vc->set_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+ shared_ptr<TextSubtitleContent> tsc = dynamic_pointer_cast<TextSubtitleContent> (i);
+ double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
+ if (i->video) {
+ i->video->set_video_frame_rate (fr);
+ } else if (i->audio) {
+ /* Audio but not video, i.e. SndfileContent */
+ i->audio->set_audio_video_frame_rate (fr);
} else if (dsc) {
- dsc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
- } else if (ssc) {
- ssc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+ dsc->set_subtitle_video_frame_rate (fr);
+ } else if (tsc) {
+ tsc->set_subtitle_video_frame_rate (fr);
}
_set_video_frame_rate->Enable (false);
}
void
TimingPanel::content_selection_changed ()
{
- bool const e = !_parent->selected().empty ();
-
- _position->Enable (e);
- _full_length->Enable (e);
- _trim_start->Enable (e);
- _trim_end->Enable (e);
- _play_length->Enable (e);
- _video_frame_rate->Enable (e);
+ setup_sensitivity ();
film_content_changed (ContentProperty::POSITION);
film_content_changed (ContentProperty::LENGTH);
film_content_changed (ContentProperty::TRIM_END);
film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
film_content_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
+ film_content_changed (AudioContentProperty::AUDIO_VIDEO_FRAME_RATE);
}
void
TimingPanel::trim_start_to_playhead_clicked ()
{
DCPTime const ph = _viewer->position ();
+ optional<DCPTime> new_ph;
+
+ _viewer->set_coalesce_player_changes (true);
+
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
if (i->position() < ph && ph < i->end ()) {
FrameRateChange const frc = _parent->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());
+ }
+
+ _viewer->set_coalesce_player_changes (false);
}
void
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
if (i->position() < ph && ph < i->end ()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
- i->set_trim_end (ContentTime (i->position() + i->full_length() - ph, frc) - i->trim_start());
+ i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
}
+ }
+}
+
+void
+TimingPanel::setup_sensitivity ()
+{
+ bool const e = !_parent->selected().empty ();
+ _position->Enable (e);
+ _full_length->Enable (e);
+ _trim_start->Enable (e);
+ _trim_end->Enable (e);
+ _play_length->Enable (e);
+ _video_frame_rate->Enable (e);
+
+ DCPTime const ph = _viewer->position ();
+ bool any_over_ph = false;
+ BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+ if (i->position() <= ph && ph < i->end()) {
+ any_over_ph = true;
+ }
}
+
+ _trim_start_to_playhead->Enable (any_over_ph);
+ _trim_end_to_playhead->Enable (any_over_ph);
}
projects / dcpomatic.git / blobdiff