Remove slightly strange InteropSubtitleAsset constructor; add default one for SMPTESubtitleAsset.

4 files changed, 11 insertions, 4 deletions

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 96ccb68a..231dda16 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -56,10 +56,9 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file)
 	parse_subtitles (xml, font_nodes);
 }
 
-InteropSubtitleAsset::InteropSubtitleAsset (string movie_title, string language)
-	: _movie_title (movie_title)
+InteropSubtitleAsset::InteropSubtitleAsset ()
 {
-	_language = language;
+	
 }
 
 Glib::ustring
diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index 56350421..378bacc7 100644
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_subtitle_asset.h
@@ -36,7 +36,7 @@ class InteropLoadFontNode;
 class InteropSubtitleAsset : public SubtitleAsset
 {
 public:
-	InteropSubtitleAsset (std::string movie_title, std::string language);
+	InteropSubtitleAsset ();
 	InteropSubtitleAsset (boost::filesystem::path file);
 
 	bool equals (
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 87211cf2..69e2712f 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -43,6 +43,12 @@ using boost::split;
 using boost::is_any_of;
 using namespace dcp;
 
+SMPTESubtitleAsset::SMPTESubtitleAsset ()
+	: _time_code_rate (0)
+{
+	
+}
+
 /** Construct a SMPTESubtitleAsset by reading an XML or MXF file.
  *  @param file Filename.
  *  @param mxf true if file is an MXF, false if it is XML.
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 6df924aa..cd68f44b 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -36,6 +36,8 @@ class SMPTELoadFontNode;
 class SMPTESubtitleAsset : public SubtitleAsset, public MXF
 {
 public:
+	SMPTESubtitleAsset ();
+	
 	/** @param file File name
 	 *  @param mxf true if `file' is a MXF, or false if it is an XML file.
 	 */