Some allowances for video/audio/subtitle possibly being null.

6 files changed, 52 insertions, 17 deletions

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 2cd7e576f..dbd9bca8d 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -166,10 +166,17 @@ DCPContent::as_xml (xmlpp::Node* node) const
 	node->add_child("Type")->add_child_text ("DCP");
 
 	Content::as_xml (node);
-	video->as_xml (node);
-	audio->as_xml (node);
-	node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate()));
-	audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+
+	if (video) {
+		video->as_xml (node);
+	}
+
+	if (audio) {
+		audio->as_xml (node);
+		node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate()));
+		audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+	}
+
 	if (subtitle) {
 		subtitle->as_xml (node);
 	}
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 0702237f3..a806c9cbd 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -101,6 +101,10 @@ DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
 	Content::as_xml (node);
-	subtitle->as_xml (node);
+
+	if (subtitle) {
+		subtitle->as_xml (node);
+	}
+
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a8206b13e..a0bf88c25 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -156,9 +156,18 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("FFmpeg");
 	Content::as_xml (node);
-	video->as_xml (node);
-	audio->as_xml (node);
-	subtitle->as_xml (node);
+
+	if (video) {
+		video->as_xml (node);
+	}
+
+	if (audio) {
+		audio->as_xml (node);
+	}
+
+	if (subtitle) {
+		subtitle->as_xml (node);
+	}
 
 	boost::mutex::scoped_lock lm (_mutex);
 
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 15c20d874..ef82b3779 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -103,7 +103,10 @@ ImageContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Image");
 	Content::as_xml (node);
-	video->as_xml (node);
+
+	if (video) {
+		video->as_xml (node);
+	}
 }
 
 void
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 7c204e9eb..bf5f3af5b 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -49,20 +49,28 @@ SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr
 	, _audio_length (node->number_child<Frame> ("AudioLength"))
 {
 	audio = AudioContent::from_xml (this, film, node);
-	audio->set_stream (
-		AudioStreamPtr (
-			new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
-		);
+
+	if (audio) {
+		audio->set_stream (
+			AudioStreamPtr (
+				new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
+			);
+	}
 }
 
 void
 SndfileContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Sndfile");
+
 	Content::as_xml (node);
-	audio->as_xml (node);
-	node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
-	audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+
+	if (audio) {
+		audio->as_xml (node);
+		node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
+		audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+	}
+
 	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
 }
 
diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 74e785ff7..4fdd690c3 100644
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -79,7 +79,11 @@ TextSubtitleContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("TextSubtitle");
 	Content::as_xml (node);
-	subtitle->as_xml (node);
+
+	if (subtitle) {
+		subtitle->as_xml (node);
+	}
+
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }