diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
| commit | 4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad (patch) | |
| tree | 06db8731e77dfeaf537f2814d73c7a599035b95c /test/play_test.cc | |
| parent | 8102046b2f29e0c7b234c29bf204b056cb30e64f (diff) | |
| parent | 66162217d93baa3fd50594bb013a44bbd779d02a (diff) | |
Merge master.
Diffstat (limited to 'test/play_test.cc')
| -rw-r--r-- | test/play_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/play_test.cc b/test/play_test.cc index 1ba2e7d88..067f772ff 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -82,7 +82,7 @@ private: BOOST_AUTO_TEST_CASE (play_test) { shared_ptr<Film> film = new_test_film ("play_test"); - film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->set_name ("play_test"); @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (play_test) } } - player->seek (10 * TIME_HZ / 25, true); + wrap.seek (10 * TIME_HZ / 25, true); optional<Video> v = wrap.get_video (); BOOST_CHECK (v); BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25); |