Various tinkerings.

3 files changed, 62 insertions, 3 deletions

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index e3e83f8d..d86cd30a 100644
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 
 /** @file examples/make_dcp.cc
- *  @brief Shows how to make a DCP from some JPEG2000 and WAV files.
+ *  @brief Shows how to make a DCP from some JPEG2000 and audio data.
  */
 
 #include <vector>
diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
new file mode 100644
index 00000000..43f5f0be
--- /dev/null
+++ b/examples/read_dcp.cc
@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/* If you are using an installed libdcp, these #includes would need to be changed to
+#include <libdcp/dcp.h>
+#include <libdcp/cpl.h>
+#include <libdcp/mono_picture_asset.h>
+... etc. ...
+*/
+
+#include "dcp.h"
+
+/** @file examples/read_dcp.cc
+ *  @brief Shows how to read a DCP.
+ */
+
+int
+main ()
+{
+	/* Create a DCP, specifying where our existing data is */
+	dcp::DCP dcp ("/home/carl/diagonal.com/APPASSIONATA_TLR_F_UK-DEFR_CH_51_2K_LOK_20121115_DGL_OV");
+	/* Read the DCP to find out about it */
+	dcp.read ();
+
+	if (dcp.encrypted ()) {
+		std::cout << "DCP is encrypted.\n";
+	} else {
+		std::cout << "DCP is not encrypted.\n";
+	}
+
+	std::cout << "DCP has " << dcp.cpls().size() << " CPLs.\n";
+	std::cout << "DCP has " << dcp.assets().size() << " assets.\n";
+
+	return 0;
+}
diff --git a/examples/wscript b/examples/wscript
index 05cca98f..7de1199d 100644
--- a/examples/wscript
+++ b/examples/wscript
@@ -1,8 +1,16 @@
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')
-    obj.name   = 'examples'
+    obj.name   = 'make_dcp'
     obj.use    = 'libdcp'
     obj.uselib = 'OPENJPEG CXML'
     obj.source = 'make_dcp.cc'
     obj.target = 'make_dcp'
     obj.install_path = ''
+
+    obj = bld(features = 'cxx cxxprogram')
+    obj.name   = 'read_dcp'
+    obj.use    = 'libdcp'
+    obj.uselib = 'OPENJPEG CXML'
+    obj.source = 'read_dcp.cc'
+    obj.target = 'read_dcp'
+    obj.install_path = ''