Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 248d2570eca8a3eee084bfbfe4df957f85f55bf8..6c7d67203781d14986dfe5406212ad62f643cf14 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,46 +17,58 @@
 
 */
 
+/** @file  src/lib/audio_mapping.h
+ *  @brief AudioMapping class.
+ */
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <list>
-#include <string>
-#include <libdcp/types.h>
-#include <boost/shared_ptr.hpp>
-#include "audio_content.h"
+#include <libcxml/cxml.h>
+#include <vector>
+
+namespace xmlpp {
+       class Node;
+}
 
+/** @class AudioMapping.
+ *  @brief A many-to-many mapping of audio channels.
+ */
 class AudioMapping
 {
 public:
+       AudioMapping ();
+       AudioMapping (int input_channels, int output_channels);
+       AudioMapping (cxml::ConstNodePtr, int);
+
+       /* Default copy constructor is fine */
+
        void as_xml (xmlpp::Node *) const;
-       void set_from_xml (ContentList const &, boost::shared_ptr<const cxml::Node>);
-       
-       struct Channel {
-               Channel (boost::weak_ptr<const AudioContent> c, int i)
-                       : content (c)
-                       , index (i)
-               {}
-               
-               boost::weak_ptr<const AudioContent> content;
-               int index;
-       };
-
-       void add (Channel, libdcp::Channel);
-
-       int dcp_channels () const;
-       std::list<Channel> dcp_to_content (libdcp::Channel) const;
-       std::list<std::pair<Channel, libdcp::Channel> > content_to_dcp () const {
-               return _content_to_dcp;
+
+       void make_zero ();
+
+       void set (int input_channel, int output_channel, float);
+       float get (int input_channel, int output_channel) const;
+
+       int input_channels () const {
+               return _input_channels;
+       }
+
+       int output_channels () const {
+               return _output_channels;
        }
 
-       std::list<Channel> content_channels () const;
-       std::list<libdcp::Channel> content_to_dcp (Channel) const;
+       std::string digest () const;
+
+       std::list<int> mapped_output_channels () const;
+       void unmap_all ();
 
 private:
-       std::list<std::pair<Channel, libdcp::Channel> > _content_to_dcp;
-};
+       void setup (int input_channels, int output_channels);
 
-extern bool operator== (AudioMapping::Channel const &, AudioMapping::Channel const &);
+       int _input_channels;
+       int _output_channels;
+       std::vector<std::vector<float> > _gain;
+};
 
 #endif