X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.h;h=8be8eeb6fa030cfbb27099abdf4c18a4d9b3e519;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=26087bfffa8f9e04924170444eea908640b6bced;hpb=34b40f12d7eec52862999da9e4417fc8f6e0f9af;p=dcpomatic.git diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h index 26087bfff..8be8eeb6f 100644 --- a/src/lib/audio_mapping.h +++ b/src/lib/audio_mapping.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 @@ -21,8 +21,9 @@ #define DCPOMATIC_AUDIO_MAPPING_H #include -#include #include +#include +#include namespace xmlpp { class Node; @@ -41,8 +42,8 @@ class AudioMapping { public: AudioMapping (); - AudioMapping (int); - AudioMapping (boost::shared_ptr, int); + AudioMapping (int channels); + AudioMapping (cxml::ConstNodePtr, int); /* Default copy constructor is fine */ @@ -50,12 +51,14 @@ public: void make_default (); - void set (int, libdcp::Channel, float); - float get (int, libdcp::Channel) const; + void set (int, dcp::Channel, float); + float get (int, dcp::Channel) const; int content_channels () const { return _content_channels; } + + std::string digest () const; private: void setup (int);