summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-06 02:09:08 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-06 02:09:08 +0000
commitd093a5268e64af44bc55aec06d4c9b8efca6d9d6 (patch)
tree8b15d250012d2b3fc2a86890361ce3af22d73d87 /src/lib
parent49936cb957f0d57310f05a7b17c7ab52c95e94d4 (diff)
Some work on KDM UI.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cinema.h23
-rw-r--r--src/lib/util.cc3
2 files changed, 25 insertions, 1 deletions
diff --git a/src/lib/cinema.h b/src/lib/cinema.h
new file mode 100644
index 000000000..232fc5ec8
--- /dev/null
+++ b/src/lib/cinema.h
@@ -0,0 +1,23 @@
+#include <libdcp/certificates.h>
+
+class Screen
+{
+public:
+ Screen (std::string const & n)
+ : name (n)
+ {}
+
+ std::string name;
+ libdcp::Certificate certificate;
+};
+
+class Cinema
+{
+public:
+ Cinema (std::string const & n)
+ : name (n)
+ {}
+
+ std::string name;
+ std::list<Screen> screens;
+};
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 424c736c2..9d42a52e5 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -43,6 +43,7 @@
#include <magick/MagickCore.h>
#include <magick/version.h>
#include <libdcp/version.h>
+#include <libdcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -230,7 +231,7 @@ seconds (struct timeval t)
void
dvdomatic_setup ()
{
- libdcp_setup ();
+ libdcp::init ();
Format::setup_formats ();
DCPContentType::setup_dcp_content_types ();