projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix erroneous disabling of Make DCP option after creating one (#230).
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 7d76e4f5a0643066285086522cd66d12d81ceaea..9a507b550e958a8d0928adf2f1a9733eb79db708 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-1,5
+1,3
@@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
@@
-34,26
+32,38
@@
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
{
public:
AudioMapping ();
AudioMapping (int);
AudioMapping (boost::shared_ptr<const cxml::Node>);
class AudioMapping
{
public:
AudioMapping ();
AudioMapping (int);
AudioMapping (boost::shared_ptr<const cxml::Node>);
+
+ /* Default copy constructor is fine */
void as_xml (xmlpp::Node *) const;
void add (int, libdcp::Channel);
void as_xml (xmlpp::Node *) const;
void add (int, libdcp::Channel);
+ void make_default ();
std::list<int> dcp_to_content (libdcp::Channel) const;
std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
return _content_to_dcp;
}
std::list<int> dcp_to_content (libdcp::Channel) const;
std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
return _content_to_dcp;
}
- std::list<int> content_channels () const;
+ int content_channels () const {
+ return _content_channels;
+ }
+
std::list<libdcp::Channel> content_to_dcp (int) const;
private:
std::list<libdcp::Channel> content_to_dcp (int) const;
private:
+ int _content_channels;
std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
};
std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
};