diff options
Diffstat (limited to 'src/lib/audio_mapping.h')
| -rw-r--r-- | src/lib/audio_mapping.h | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h index 248d2570e..3c471d3f4 100644 --- a/src/lib/audio_mapping.h +++ b/src/lib/audio_mapping.h @@ -30,33 +30,21 @@ class AudioMapping { public: 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); + void set_from_xml (boost::shared_ptr<const cxml::Node>); + + void add (int, 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 { + 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<Channel> content_channels () const; - std::list<libdcp::Channel> content_to_dcp (Channel) const; + std::list<int> content_channels () const; + std::list<libdcp::Channel> content_to_dcp (int) const; private: - std::list<std::pair<Channel, libdcp::Channel> > _content_to_dcp; + std::list<std::pair<int, libdcp::Channel> > _content_to_dcp; }; -extern bool operator== (AudioMapping::Channel const &, AudioMapping::Channel const &); - #endif |