Do lots of the player processing with less copying.

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

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index d0aa33657fb383c9fbddcdde996186a9485e4b92..3620001251ec688857c172c80c2883f1b8add42a 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -34,6 +32,7 @@ using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
 
 AudioMapping::AudioMapping ()
+       : _content_channels (0)
 {
 
 }
@@ -42,13 +41,20 @@ AudioMapping::AudioMapping ()
  *  @param c Number of channels.
  */
 AudioMapping::AudioMapping (int c)
+       : _content_channels (c)
 {
-       if (c == 1) {
+
+}
+
+void
+AudioMapping::make_default ()
+{
+       if (_content_channels == 1) {
                /* Mono -> Centre */
                add (0, libdcp::CENTRE);
        } else {
                /* 1:1 mapping */
-               for (int i = 0; i < c; ++i) {
+               for (int i = 0; i < _content_channels; ++i) {
                        add (i, static_cast<libdcp::Channel> (i));
                }
        }
@@ -56,8 +62,10 @@ AudioMapping::AudioMapping (int c)
 
 AudioMapping::AudioMapping (shared_ptr<const cxml::Node> node)
 {
-       list<shared_ptr<cxml::Node> > const c = node->node_children ("Map");
-       for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
+       _content_channels = node->number_child<int> ("ContentChannels");
+       
+       list<cxml::NodePtr> const c = node->node_children ("Map");
+       for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
                add ((*i)->number_child<int> ("ContentIndex"), static_cast<libdcp::Channel> ((*i)->number_child<int> ("DCP")));
        }
 }
@@ -81,22 +89,11 @@ AudioMapping::dcp_to_content (libdcp::Channel d) const
        return c;
 }
 
-list<int>
-AudioMapping::content_channels () const
-{
-       list<int> c;
-       for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-               if (find (c.begin(), c.end(), i->first) == c.end ()) {
-                       c.push_back (i->first);
-               }
-       }
-
-       return c;
-}
-
 list<libdcp::Channel>
 AudioMapping::content_to_dcp (int c) const
 {
+       assert (c < _content_channels);
+       
        list<libdcp::Channel> d;
        for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
                if (i->first == c) {
@@ -110,6 +107,8 @@ AudioMapping::content_to_dcp (int c) const
 void
 AudioMapping::as_xml (xmlpp::Node* node) const
 {
+       node->add_child ("ContentChannels")->add_child_text (lexical_cast<string> (_content_channels));
+       
        for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
                xmlpp::Node* t = node->add_child ("Map");
                t->add_child ("ContentIndex")->add_child_text (lexical_cast<string> (i->first));