Do resampling in AudioDecoder rather than Player.

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 7a4ca63a90f7703214e8403b3e1907a80d1a0916..909f890242dd68fbc91c5461c722a64c0456e16e 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>
@@ -35,7 +35,6 @@
 using std::string;
 using std::cout;
 using std::vector;
-using std::stringstream;
 using std::fixed;
 using std::list;
 using std::pair;
@@ -43,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;
@@ -135,9 +135,9 @@ AudioContent::set_delay (int d)
 string
 AudioContent::technical_summary () const
 {
-       string s = "audio :";
+       string s = "audio: ";
        BOOST_FOREACH (AudioStreamPtr i, streams ()) {
-               s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate());
+               s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate());
        }
 
        return s;
@@ -324,7 +324,7 @@ AudioContent::add_properties (list<UserProperty>& p) const
                        );
        }
 
-       p.push_back (UserProperty (UserProperty::AUDIO, _("DCP frame rate"), resampled_frame_rate (), _("Hz")));
+       p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate (), _("Hz")));
        p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
 
        if (stream) {
@@ -379,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;
+       }
+}