X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=63606f46c734ab1d939497e03e7e185d4bf0ef1c;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=8ce64777bc9441fcad37830b67bba8087281c34b;hpb=23b69b228ed5b34b59e1789de4bff052bc905ae4;p=dcpomatic.git

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 8ce64777b..63606f46c 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -1,41 +1,50 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "lib/content.h"
-#include "lib/image_content.h"
-#include "lib/raw_convert.h"
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "timecode.h"
 #include "content_panel.h"
+#include "lib/content.h"
+#include "lib/image_content.h"
+#include "lib/raw_convert.h"
+#include "lib/subtitle_content.h"
+#include "lib/dcp_subtitle_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::cout;
 using std::string;
 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)
 {
@@ -142,20 +151,22 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* 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
 TimingPanel::update_full_length ()
 {
-	ContentList cl = _parent->selected ();
-
 	set<DCPTime> check;
-	for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-		check.insert ((*i)->full_length ());
+	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		check.insert (i->full_length ());
 	}
 
 	if (check.size() == 1) {
-		_full_length->set (cl.front()->full_length (), _parent->film()->video_frame_rate ());
+		_full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ());
 	} else {
 		_full_length->clear ();
 	}
@@ -164,15 +175,13 @@ TimingPanel::update_full_length ()
 void
 TimingPanel::update_play_length ()
 {
-	ContentList cl = _parent->selected ();
-
 	set<DCPTime> check;
-	for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-		check.insert ((*i)->length_after_trim ());
+	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		check.insert (i->length_after_trim ());
 	}
 
 	if (check.size() == 1) {
-		_play_length->set (cl.front()->length_after_trim (), _parent->film()->video_frame_rate ());
+		_play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ());
 	} else {
 		_play_length->clear ();
 	}
@@ -181,7 +190,6 @@ TimingPanel::update_play_length ()
 void
 TimingPanel::film_content_changed (int property)
 {
-	ContentList cl = _parent->selected ();
 	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
@@ -191,20 +199,20 @@ TimingPanel::film_content_changed (int property)
 	if (property == ContentProperty::POSITION) {
 
 		set<DCPTime> check;
-		for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-			check.insert ((*i)->position ());
+		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+			check.insert (i->position ());
 		}
 
 		if (check.size() == 1) {
-			_position->set (cl.front()->position(), film_video_frame_rate);
+			_position->set (_parent->selected().front()->position(), film_video_frame_rate);
 		} else {
 			_position->clear ();
 		}
 
 	} else if (
 		property == ContentProperty::LENGTH ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE
+		property == ContentProperty::VIDEO_FRAME_RATE ||
+		property == VideoContentProperty::FRAME_TYPE
 		) {
 
 		update_full_length ();
@@ -212,12 +220,12 @@ TimingPanel::film_content_changed (int property)
 	} else if (property == ContentProperty::TRIM_START) {
 
 		set<ContentTime> check;
-		for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-			check.insert ((*i)->trim_start ());
+		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+			check.insert (i->trim_start ());
 		}
 
 		if (check.size() == 1) {
-			_trim_start->set (cl.front()->trim_start (), film_video_frame_rate);
+			_trim_start->set (_parent->selected().front()->trim_start (), film_video_frame_rate);
 		} else {
 			_trim_start->clear ();
 		}
@@ -225,12 +233,12 @@ TimingPanel::film_content_changed (int property)
 	} else if (property == ContentProperty::TRIM_END) {
 
 		set<ContentTime> check;
-		for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-			check.insert ((*i)->trim_end ());
+		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+			check.insert (i->trim_end ());
 		}
 
 		if (check.size() == 1) {
-			_trim_end->set (cl.front()->trim_end (), film_video_frame_rate);
+			_trim_end->set (_parent->selected().front()->trim_end (), film_video_frame_rate);
 		} else {
 			_trim_end->clear ();
 		}
@@ -240,25 +248,38 @@ TimingPanel::film_content_changed (int property)
 		property == ContentProperty::LENGTH ||
 		property == ContentProperty::TRIM_START ||
 		property == ContentProperty::TRIM_END ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE
+		property == ContentProperty::VIDEO_FRAME_RATE ||
+		property == VideoContentProperty::FRAME_TYPE
 		) {
 
 		update_play_length ();
 	}
 
-	if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
-		set<float> check;
-		shared_ptr<VideoContent> vc;
-		for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-			shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i);
-			if (t) {
-				check.insert (t->video_frame_rate ());
-				vc = t;
+	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 ()) {
+			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->subtitle && i->video_frame_rate()) {
+				++count_sc;
+				content = i;
+			}
+
 		}
-		if (check.size() == 1) {
-			checked_set (_video_frame_rate, raw_convert<string> (vc->video_frame_rate (), 5));
+
+		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, raw_convert<string> (content->video_frame_rate().get(), 5));
 			_video_frame_rate->Enable (true);
 		} else {
 			checked_set (_video_frame_rate, wxT (""));
@@ -267,8 +288,8 @@ TimingPanel::film_content_changed (int property)
 	}
 
 	bool have_still = false;
-	for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
-		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
+	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
+		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
 		if (ic && ic->still ()) {
 			have_still = true;
 		}
@@ -277,26 +298,25 @@ TimingPanel::film_content_changed (int property)
 	_full_length->set_editable (have_still);
 	_play_length->set_editable (!have_still);
 	_set_video_frame_rate->Enable (false);
+	setup_sensitivity ();
 }
 
 void
 TimingPanel::position_changed ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		(*i)->set_position (_position->get (_parent->film()->video_frame_rate ()));
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		i->set_position (_position->get (_parent->film()->video_frame_rate ()));
 	}
 }
 
 void
 TimingPanel::full_length_changed ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		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 (vfr));
+			ic->video->set_length (_full_length->get (vfr).frames_round (vfr));
 		}
 	}
 }
@@ -304,31 +324,59 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		(*i)->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
+	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 ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		(*i)->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
+	_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::play_length_changed ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		FrameRateChange const frc = _parent->film()->active_frame_rate_change ((*i)->position ());
-		(*i)->set_trim_end (
-			ContentTime ((*i)->full_length() - _play_length->get (_parent->film()->video_frame_rate()), frc)
-			- (*i)->trim_start ()
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
+		i->set_trim_end (
+			ContentTime (i->full_length() - _play_length->get (_parent->film()->video_frame_rate()), frc)
+			- i->trim_start ()
 			);
 	}
 }
@@ -342,33 +390,24 @@ TimingPanel::video_frame_rate_changed ()
 void
 TimingPanel::set_video_frame_rate ()
 {
-	ContentList c = _parent->selected ();
-	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
-		if (vc) {
-			vc->set_video_frame_rate (raw_convert<float> (wx_to_std (_video_frame_rate->GetValue ())));
-		}
-		_set_video_frame_rate->Enable (false);
+	double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		i->set_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_START);
 	film_content_changed (ContentProperty::TRIM_END);
-	film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
 }
 
 void
@@ -384,12 +423,23 @@ 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
@@ -399,8 +449,31 @@ TimingPanel::trim_end_to_playhead_clicked ()
 	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);
 }