projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 9a507b550e958a8d0928adf2f1a9733eb79db708..ca9b9847fe8f9bc7002ca268014273b934f48800 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
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,12
+17,17
@@
*/
*/
+/** @file src/lib/audio_mapping.h
+ * @brief AudioMapping class.
+ */
+
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
-#include <li
st
>
-#include <
lib
dcp/types.h>
+#include <li
bcxml/cxml.h
>
+#include <dcp/types.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include <vector>
namespace xmlpp {
class Node;
namespace xmlpp {
class Node;
@@
-32,39
+37,44
@@
namespace cxml {
class Node;
}
class Node;
}
-/** A many-to-many mapping from some content channels to DCP channels.
- * The number of content channels is set on construction and fixed,
- * and then each of those content channels can be mapped to zero or
- * more DCP channels.
+/** @class AudioMapping.
+ * @brief A many-to-many mapping of audio channels.
*/
class AudioMapping
{
public:
AudioMapping ();
*/
class AudioMapping
{
public:
AudioMapping ();
- AudioMapping (int);
- AudioMapping (
boost::shared_ptr<const cxml::Node>
);
+ AudioMapping (int
input_channels, int output_channels
);
+ AudioMapping (
cxml::ConstNodePtr, int
);
/* Default copy constructor is fine */
/* Default copy constructor is fine */
-
+
void as_xml (xmlpp::Node *) const;
void as_xml (xmlpp::Node *) const;
- void add (int, libdcp::Channel);
- void make_default ();
+ void make_zero ();
+
+ void set (int input_channel, int output_channel, float);
+ float get (int input_channel, int output_channel) const;
- std::list<int> dcp_to_content (libdcp::Channel) const;
- std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
- return _content_to_dcp;
+ int input_channels () const {
+ return _input_channels;
}
}
- int
conten
t_channels () const {
- return _
conten
t_channels;
+ int
outpu
t_channels () const {
+ return _
outpu
t_channels;
}
}
-
- std::list<libdcp::Channel> content_to_dcp (int) const;
+
+ std::string digest () const;
+
+ std::list<int> mapped_output_channels () const;
+ void unmap_all ();
private:
private:
- int _content_channels;
- std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
+ void setup (int input_channels, int output_channels);
+
+ int _input_channels;
+ int _output_channels;
+ std::vector<std::vector<float> > _gain;
};
#endif
};
#endif