Add MainPicture etc. AssetInstances.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/asset_instance.cc b/src/asset_instance.cc
index 45f8caf2..6107cfda 100644
--- a/src/asset_instance.cc
+++ b/src/asset_instance.cc
@@ -19,7 +19,9 @@
 
 #include <libcxml/cxml.h>
 #include "asset_instance.h"
+#include "exceptions.h"
 
+using std::bad_cast;
 using boost::shared_ptr;
 using namespace libdcp;
 
@@ -38,3 +40,22 @@ AssetInstance::AssetInstance (shared_ptr<const cxml::Node> node)
 
 	node->done ();
 }
+
+Picture::Picture (shared_ptr<const cxml::Node> node)
+	: AssetInstance (node)
+{
+	frame_rate = Fraction (node->string_child ("FrameRate"));
+
+	try {
+		screen_aspect_ratio = Fraction (node->string_child ("ScreenAspectRatio"));
+	} catch (XMLError& e) {
+		/* Maybe it's not a fraction */
+	}
+	
+	try {
+		float f = node->number_child<float> ("ScreenAspectRatio");
+		screen_aspect_ratio = Fraction (f * 1000, 1000);
+	} catch (bad_cast& e) {
+
+	}
+}