summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-17 00:33:16 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-17 00:33:16 +0000
commit4870ce43dd314d557f7b14938456138c746fd617 (patch)
tree61303fba813d5520027f1d2b6fc98410710e760d /test
parent9db7ed5f6499de903313a85d59bb70302e97e7ff (diff)
dcp_trim -> trim
Diffstat (limited to 'test')
-rw-r--r--test/metadata.ref6
-rw-r--r--test/test.cc10
2 files changed, 8 insertions, 8 deletions
diff --git a/test/metadata.ref b/test/metadata.ref
index 3aea4bcba..90255e916 100644
--- a/test/metadata.ref
+++ b/test/metadata.ref
@@ -1,4 +1,4 @@
-version 1
+version 2
name fred
use_dci_name 1
content
@@ -12,8 +12,8 @@ bottom_crop 4
filter pphb
filter unsharp
scaler bicubic
-dcp_trim_start 42
-dcp_trim_end 99
+trim_start 42
+trim_end 99
dcp_ab 1
use_content_audio 1
audio_gain 0
diff --git a/test/test.cc b/test/test.cc
index 45a80f024..9143b87d5 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -99,8 +99,8 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
f_filters.push_back (Filter::from_id ("pphb"));
f_filters.push_back (Filter::from_id ("unsharp"));
f->set_filters (f_filters);
- f->set_dcp_trim_start (42);
- f->set_dcp_trim_end (99);
+ f->set_trim_start (42);
+ f->set_trim_end (99);
f->set_dcp_ab (true);
f->write_metadata ();
@@ -121,8 +121,8 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
BOOST_CHECK_EQUAL (g_filters.size(), 2);
BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb"));
BOOST_CHECK_EQUAL (g_filters.back(), Filter::from_id ("unsharp"));
- BOOST_CHECK_EQUAL (g->dcp_trim_start(), 42);
- BOOST_CHECK_EQUAL (g->dcp_trim_end(), 99);
+ BOOST_CHECK_EQUAL (g->trim_start(), 42);
+ BOOST_CHECK_EQUAL (g->trim_end(), 99);
BOOST_CHECK_EQUAL (g->dcp_ab(), true);
g->write_metadata ();
@@ -419,7 +419,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
film->examine_content ();
film->set_format (Format::from_nickname ("Flat"));
film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
- film->set_dcp_trim_end (42);
+ film->set_trim_end (42);
film->make_dcp (true);
while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {