diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-24 00:17:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-24 00:17:26 +0000 |
| commit | e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a (patch) | |
| tree | 78aed756a937f979983de33f51acbf2b43744aa4 /test/time_calculation_test.cc | |
| parent | 794396aa29061894ea359a6f30aa0f759a1f1b74 (diff) | |
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.
Diffstat (limited to 'test/time_calculation_test.cc')
| -rw-r--r-- | test/time_calculation_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<string> notes; shared_ptr<FFmpegContent> 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> player (new Player (film, film->playlist ())); @@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2) list<string> notes; shared_ptr<FFmpegContent> 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> player (new Player (film, film->playlist ())); @@ -534,7 +534,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3) list<string> notes; shared_ptr<FFmpegContent> 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> player (new Player (film, film->playlist ())); |