diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/4k_test.cc | 2 | ||||
| -rw-r--r-- | test/black_fill_test.cc | 4 | ||||
| -rw-r--r-- | test/ffmpeg_audio_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_dcp_test.cc | 2 | ||||
| -rw-r--r-- | test/scaling_test.cc | 2 | ||||
| -rw-r--r-- | test/threed_test.cc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/test/4k_test.cc b/test/4k_test.cc index ee9ac0d98..5224fae83 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE (fourk_test) shared_ptr<Film> film = new_test_film ("4k_test"); film->set_name ("4k_test"); shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->set_resolution (RESOLUTION_4K); film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); film->set_container (Ratio::from_id ("185")); diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 101fe0523..a7e44bdfb 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -38,9 +38,9 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->set_container (Ratio::from_id ("185")); film->set_sequence_video (false); shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - contentA->set_ratio (Ratio::from_id ("185")); + contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - contentB->set_ratio (Ratio::from_id ("185")); + contentB->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index 6699d1ef7..894255879 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test"); film->set_name ("ffmpeg_audio_test"); shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (c); wait_for_jobs (); diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index c79acd3df..88b1e94af 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test"); film->set_name ("test_film2"); shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (c); wait_for_jobs (); diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 7002019dd..bf8da8aac 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -33,7 +33,7 @@ using boost::shared_ptr; static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container) { - content->set_ratio (Ratio::from_id (image)); + content->set_scale (VideoContentScale (Ratio::from_id (image))); film->set_container (Ratio::from_id (container)); film->make_dcp (); diff --git a/test/threed_test.cc b/test/threed_test.cc index 31a95e382..8da9b46a8 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (threed_test) shared_ptr<Film> film = new_test_film ("threed_test"); film->set_name ("test_film2"); shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); c->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); film->examine_and_add_content (c); |