diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-05 19:13:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-05 19:13:12 +0000 |
| commit | d7965cce4c5f95da7971bce6f800739a4cd2f17d (patch) | |
| tree | bcf0c244de7e00157874e3aebaa57aaa7a898212 /test | |
| parent | 22b758902ebc85b3e955606796920afb9e128eff (diff) | |
cpl.{cc,h} to dc_cpl.{cc,h} and dcp.{cc,h} to dc_package.{cc,h}
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_sar_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_font_test.cc | 4 | ||||
| -rw-r--r-- | test/dcp_test.cc | 5 | ||||
| -rw-r--r-- | test/decryption_test.cc | 4 | ||||
| -rw-r--r-- | test/encryption_test.cc | 4 | ||||
| -rw-r--r-- | test/read_dcp_test.cc | 4 | ||||
| -rw-r--r-- | test/rewrite_subs.cc | 4 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc index 2fd2134b..69558968 100644 --- a/test/cpl_sar_test.cc +++ b/test/cpl_sar_test.cc @@ -17,7 +17,7 @@ */ -#include "cpl.h" +#include "dc_cpl.h" #include "reel_mono_picture_asset.h" #include "mono_picture_asset.h" #include <libcxml/cxml.h> diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc index c8dc81b8..7abecc11 100644 --- a/test/dcp_font_test.cc +++ b/test/dcp_font_test.cc @@ -19,8 +19,8 @@ #include "interop_subtitle_asset.h" #include "smpte_subtitle_asset.h" -#include "dcp.h" -#include "cpl.h" +#include "dc_package.h" +#include "dc_cpl.h" #include "test.h" #include "reel.h" #include "util.h" diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 6c5af703..557d2a8f 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -17,9 +17,9 @@ */ -#include "dcp.h" +#include "dc_package.h" #include "metadata.h" -#include "cpl.h" +#include "dc_cpl.h" #include "mono_picture_asset.h" #include "stereo_picture_asset.h" #include "picture_asset_writer.h" @@ -206,4 +206,3 @@ BOOST_AUTO_TEST_CASE (dcp_test4) BOOST_CHECK (!A.equals (B, dcp::dc::EqualityOptions(), boost::bind (¬e, _1, _2))); } - diff --git a/test/decryption_test.cc b/test/decryption_test.cc index d5bd9eab..322d910c 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -17,9 +17,9 @@ */ -#include "dcp.h" +#include "dc_package.h" #include "mono_picture_frame.h" -#include "cpl.h" +#include "dc_cpl.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" #include "mono_picture_asset.h" diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 045d22be..08e9176e 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -20,9 +20,9 @@ #include "KM_util.h" #include "metadata.h" #include "certificate.h" -#include "dcp.h" +#include "dc_package.h" #include "certificate_chain.h" -#include "cpl.h" +#include "dc_cpl.h" #include "mono_picture_asset.h" #include "picture_asset_writer.h" #include "sound_asset_writer.h" diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc index b28d112b..f1e9fad7 100644 --- a/test/read_dcp_test.cc +++ b/test/read_dcp_test.cc @@ -18,8 +18,8 @@ */ #include <boost/test/unit_test.hpp> -#include "dcp.h" -#include "cpl.h" +#include "dc_package.h" +#include "dc_cpl.h" using std::list; using boost::shared_ptr; diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index f14a7231..a8fdb459 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -18,8 +18,8 @@ */ #include <iostream> -#include "dcp.h" -#include "cpl.h" +#include "dc_package.h" +#include "dc_cpl.h" #include "reel.h" #include "subtitle_asset.h" #include "reel_subtitle_asset.h" diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 05e46b2e..49e22520 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -25,7 +25,7 @@ #include "sound_asset.h" #include "reel.h" #include "test.h" -#include "cpl.h" +#include "dc_cpl.h" #include "mono_picture_frame.h" #include "certificate_chain.h" #include "mono_picture_asset_writer.h" |