Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 4e9d5cd5cee5395b3a22058fd0cf6c08f57e1e57..5d89719f77d49214dc230dac66afb9f80f941a65 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -23,8 +23,8 @@
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
-#include "raw_convert.h"
 #include "compose.hpp"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
@@ -42,6 +42,7 @@ using std::setprecision;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::raw_convert;
 
 /** Something stream-related has changed */
 int const AudioContentProperty::STREAMS = 200;
@@ -378,3 +379,19 @@ AudioContent::set_stream (AudioStreamPtr stream)
 
        _parent->signal_changed (AudioContentProperty::STREAMS);
 }
+
+void
+AudioContent::use_template (shared_ptr<const AudioContent> c)
+{
+       _gain = c->_gain;
+       _delay = c->_delay;
+
+       size_t i = 0;
+       size_t j = 0;
+
+       while (i < _streams.size() && j < c->_streams.size()) {
+               _streams[i]->set_mapping (c->_streams[j]->mapping());
+               ++i;
+               ++j;
+       }
+}