Fix merge.

diff --git a/src/reel.cc b/src/reel.cc
index ae3080ad6386987e2877ad38a01332ea6196993d..d8703dd02e5eb62da8fb4c45bb8d6e2395bf186d 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -45,9 +45,6 @@ Reel::write_to_cpl (xmlpp::Node* parent) const
        if (_main_subtitle) {
                _main_subtitle->write_to_cpl (asset_list);
        }
-
-       s << "      </AssetList>\n"
-         << "    </Reel>\n";
 }
        
 bool

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 2b9256416db87cf5909dfeb92ece1b7a293f3437..801220387fdc75f0fe664578d010996125d46dda 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -54,7 +54,7 @@ public:
                boost::signals2::signal<void (float)>* progress,
                int fps,
                int length,
-               int start_frame
+               int start_frame,
                bool encrypted
                );
 

diff --git a/test/tests.cc b/test/tests.cc
index 45087b413dfa4696ea36a5d8c9b560a1a8472563..e2f1f2912ea58ba0de44656cb62b61d3d038cef2 100644 (file)
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -637,6 +637,7 @@ BOOST_AUTO_TEST_CASE (encryption)
                                                   &(d.Progress),
                                                   24,
                                                   24,
+                                                  0,
                                                   2,
                                                   true
                                                   ));