Missing stop emission for fully-timed FFmpeg subtitles; should fix #1101.

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 25a7ef8a51c96f14f4aca221ddd7edeb8630185a..909f890242dd68fbc91c5461c722a64c0456e16e 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "frame_rate_change.h"
 #include "compose.hpp"
-#include "locale_convert.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -136,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;
@@ -380,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;
+       }
+}