Very slightly less verbose subs checking.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 137d359f9cf936fb155ffaea203d19897778e10d..58ee0cce743be77f3db0e65b9100baf817041f05 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -1,3 +1,26 @@
+/*
+    Copyright (C) 2012 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.
+
+*/
+
+/** @file  src/cpl.cc
+ *  @brief Classes used to parse a CPL.
+ */
+
 #include <iostream>
 #include "cpl.h"
 
@@ -15,7 +38,7 @@ CPL::CPL (string file)
        content_kind = kind_node ("ContentKind");
        content_version = optional_sub_node<ContentVersion> ("ContentVersion");
        ignore_node ("RatingList");
-       reels = sub_nodes<Reel> ("ReelList", "Reel");
+       reels = sub_nodes<CPLReel> ("ReelList", "Reel");
 
        ignore_node ("Issuer");
        ignore_node ("Signer");
@@ -32,7 +55,7 @@ ContentVersion::ContentVersion (xmlpp::Node const * node)
        done ();
 }
 
-Reel::Reel (xmlpp::Node const * node)
+CPLReel::CPLReel (xmlpp::Node const * node)
        : XMLNode (node)
 {
        id = string_node ("Id");
@@ -44,7 +67,8 @@ Reel::Reel (xmlpp::Node const * node)
 CPLAssetList::CPLAssetList (xmlpp::Node const * node)
        : XMLNode (node)
 {
-       main_picture = sub_node<MainPicture> ("MainPicture");
+       main_picture = optional_sub_node<MainPicture> ("MainPicture");
+       main_stereoscopic_picture = optional_sub_node<MainStereoscopicPicture> ("MainStereoscopicPicture");
        main_sound = optional_sub_node<MainSound> ("MainSound");
        main_subtitle = optional_sub_node<MainSubtitle> ("MainSubtitle");
 
@@ -52,6 +76,18 @@ CPLAssetList::CPLAssetList (xmlpp::Node const * node)
 }
 
 MainPicture::MainPicture (xmlpp::Node const * node)
+       : Picture (node)
+{
+
+}
+
+MainStereoscopicPicture::MainStereoscopicPicture (xmlpp::Node const * node)
+       : Picture (node)
+{
+
+}
+
+Picture::Picture (xmlpp::Node const * node)
        : XMLNode (node)
 {
        id = string_node ("Id");