From e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Feb 2016 00:17:26 +0000 Subject: An unfortunately large set of timeline-related changes: - Rename sequence_video to sequence, and sequence subtitle content like we do video content (i.e. adding multiple subtitle contents will result in them sequenced in time rather than overlaid). - Stop doing selection-changed related stuff in ContentPanel if no selection change has actually happened. - Attempt to tidy up event handling in the timeline a bit. --- test/time_calculation_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/time_calculation_test.cc') diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index f11f0dc28..272d3edfe 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1) list notes; shared_ptr content (new FFmpegContent (film, doc, film->state_version(), notes)); - film->set_sequence_video (false); + film->set_sequence (false); film->add_content (content); shared_ptr player (new Player (film, film->playlist ())); @@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2) list notes; shared_ptr content (new FFmpegContent (film, doc, film->state_version(), notes)); - film->set_sequence_video (false); + film->set_sequence (false); film->add_content (content); shared_ptr player (new Player (film, film->playlist ())); @@ -534,7 +534,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3) list notes; shared_ptr content (new FFmpegContent (film, doc, film->state_version(), notes)); AudioStreamPtr stream = content->audio_streams().front(); - film->set_sequence_video (false); + film->set_sequence (false); film->add_content (content); shared_ptr player (new Player (film, film->playlist ())); -- cgit v1.2.3