projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index a76d83a370f703dceded47e1d5aff6e90cd472e3..e37beaeb26eb77dce33fd0a75a7ab8dee51d1086 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-1,5
+1,5
@@
/*
/*
- 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
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
@@
-24,10
+24,10
@@
#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 <dcp/types.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
namespace xmlpp {
class Node;
namespace xmlpp {
class Node;
@@
-64,13
+64,23
@@
public:
return _content_channels;
}
return _content_channels;
}
+ void set_name (int channel, std::string name);
+ std::string name (int channel) const {
+ return _name[channel];
+ }
+
std::string digest () const;
std::string digest () const;
+
+ std::list<dcp::Channel> mapped_dcp_channels () const;
+ void unmap_all ();
private:
void setup (int);
private:
void setup (int);
+ void make_zero ();
int _content_channels;
std::vector<std::vector<float> > _gain;
int _content_channels;
std::vector<std::vector<float> > _gain;
+ std::vector<std::string> _name;
};
#endif
};
#endif