projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index a76d83a370f703dceded47e1d5aff6e90cd472e3..1a3c16ef9a2da957581e650de7b4f06c7c947ab8 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-24,52
+25,50
@@
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
#ifndef DCPOMATIC_AUDIO_MAPPING_H
#define DCPOMATIC_AUDIO_MAPPING_H
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <dcp/types.h>
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+#include <vector>
namespace xmlpp {
class Node;
}
namespace xmlpp {
class Node;
}
-namespace cxml {
- class Node;
-}
-
/** @class AudioMapping.
/** @class AudioMapping.
- * @brief 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 are mapped to each DCP channel
- * by a linear gain.
+ * @brief A many-to-many mapping of audio channels.
*/
class AudioMapping
{
public:
AudioMapping ();
*/
class AudioMapping
{
public:
AudioMapping ();
- AudioMapping (int channels);
+ AudioMapping (int
input_channels, int output_
channels);
AudioMapping (cxml::ConstNodePtr, int);
/* Default copy constructor is fine */
AudioMapping (cxml::ConstNodePtr, int);
/* Default copy constructor is fine */
-
+
void as_xml (xmlpp::Node *) const;
void as_xml (xmlpp::Node *) const;
- void make_default ();
+ void make_zero ();
+
+ void set (int input_channel, int output_channel, float);
+ float get (int input_channel, int output_channel) const;
- void set (int, dcp::Channel, float);
- float get (int, dcp::Channel) const;
+ 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::string digest () const;
}
std::string digest () const;
-
+
+ std::list<int> mapped_output_channels () const;
+ void unmap_all ();
+
private:
private:
- void setup (int);
-
- int _content_channels;
+ void setup (int input_channels, int output_channels);
+
+ int _input_channels;
+ int _output_channels;
std::vector<std::vector<float> > _gain;
};
std::vector<std::vector<float> > _gain;
};