projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various playlist editor developments and fixes.
[dcpomatic.git]
/
test
/
film_metadata_test.cc
diff --git
a/test/film_metadata_test.cc
b/test/film_metadata_test.cc
index d61f5f0d186e86b2cd10dcaac951f95fc77097b4..854d3e6eae376be76164468f01d03703d4987d35 100644
(file)
--- a/
test/film_metadata_test.cc
+++ b/
test/film_metadata_test.cc
@@
-20,21
+20,20
@@
/** @file test/film_metadata_test.cc
* @brief Test some basic reading/writing of film metadata.
/** @file test/film_metadata_test.cc
* @brief Test some basic reading/writing of film metadata.
+ * @ingroup specific
*/
*/
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/date_time.hpp>
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "test.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/date_time.hpp>
-#include <boost/make_shared.hpp>
using std::string;
using std::list;
using boost::shared_ptr;
using std::string;
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
BOOST_AUTO_TEST_CASE (film_metadata_test)
{
BOOST_AUTO_TEST_CASE (film_metadata_test)
{
@@
-46,20
+45,22
@@
BOOST_AUTO_TEST_CASE (film_metadata_test)
BOOST_CHECK (film->dcp_content_type() == 0);
film->set_name ("fred");
BOOST_CHECK (film->dcp_content_type() == 0);
film->set_name ("fred");
- film->set_dcp_content_type (DCPContentType::from_
pretty_name ("Short
"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf_name ("SHR
"));
film->set_container (Ratio::from_id ("185"));
film->set_j2k_bandwidth (200000000);
film->set_container (Ratio::from_id ("185"));
film->set_j2k_bandwidth (200000000);
+ film->set_interop (false);
film->write_metadata ();
list<string> ignore;
ignore.push_back ("Key");
film->write_metadata ();
list<string> ignore;
ignore.push_back ("Key");
+ ignore.push_back ("ContextID");
check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
- shared_ptr<Film> g
= make_shared<Film> (dir
);
+ shared_ptr<Film> g
(new Film (dir)
);
g->read_metadata ();
BOOST_CHECK_EQUAL (g->name(), "fred");
g->read_metadata ();
BOOST_CHECK_EQUAL (g->name(), "fred");
- BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_
pretty_name ("Short
"));
+ BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_
isdcf_name ("SHR
"));
BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
g->write_metadata ();
BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
g->write_metadata ();