diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-14 20:24:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-14 20:24:48 +0000 |
| commit | 84d778a7a2816dc653ec4495d565a8a869b7a40c (patch) | |
| tree | 700baa056cf7d090c15a0d88135d6f84cc4465ee | |
| parent | ed6a471b61d36a3ba7e8696fa3e5606406c5cf62 (diff) | |
Fix merge.
| -rw-r--r-- | src/reel.cc | 3 | ||||
| -rw-r--r-- | src/sound_asset.h | 2 | ||||
| -rw-r--r-- | test/tests.cc | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/reel.cc b/src/reel.cc index ae3080ad..d8703dd0 100644 --- 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 2b925641..80122038 100644 --- 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 45087b41..e2f1f291 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -637,6 +637,7 @@ BOOST_AUTO_TEST_CASE (encryption) &(d.Progress), 24, 24, + 0, 2, true )); |