Various improvements to the content properties dialogue (including #791).

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

diff --git a/src/lib/single_stream_audio_content.cc b/src/lib/single_stream_audio_content.cc
index f978fa423150f912eee111a23a5b3e505c10c303..b1291df453871b806a7977f62ab70cb527927f56 100644 (file)
--- a/src/lib/single_stream_audio_content.cc
+++ b/src/lib/single_stream_audio_content.cc
@@ -21,29 +21,35 @@
 #include "audio_examiner.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
+
+#include "i18n.h"
 
 using std::string;
 using std::cout;
 using std::vector;
+using std::list;
+using std::pair;
 using boost::shared_ptr;
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f)
-       : Content (f)
-       , AudioContent (f)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film)
+       : Content (film)
+       , AudioContent (film)
 {
 
 }
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
-       , AudioContent (f, p)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
+       , AudioContent (film, p)
 {
 
 }
 
-SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , AudioContent (f, node)
+SingleStreamAudioContent::SingleStreamAudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
+       , AudioContent (film, node)
        , _audio_stream (new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
 {
 
@@ -60,14 +66,11 @@ SingleStreamAudioContent::as_xml (xmlpp::Node* node) const
 void
 SingleStreamAudioContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       
        {
                boost::mutex::scoped_lock lm (_mutex);
                _audio_stream.reset (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ()));
                AudioMapping m = _audio_stream->mapping ();
-               film->make_audio_mapping_default (m);
+               film()->make_audio_mapping_default (m);
                _audio_stream->set_mapping (m);
        }
 
@@ -81,3 +84,4 @@ SingleStreamAudioContent::audio_streams () const
        s.push_back (_audio_stream);
        return s;
 }
+