projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
audio_mapping.h
diff --git
a/src/lib/audio_mapping.h
b/src/lib/audio_mapping.h
index 26087bfffa8f9e04924170444eea908640b6bced..8be8eeb6fa030cfbb27099abdf4c18a4d9b3e519 100644
(file)
--- a/
src/lib/audio_mapping.h
+++ b/
src/lib/audio_mapping.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
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
@@
-21,8
+21,9
@@
#define DCPOMATIC_AUDIO_MAPPING_H
#include <vector>
#define DCPOMATIC_AUDIO_MAPPING_H
#include <vector>
-#include <libdcp/types.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include <dcp/types.h>
+#include <libcxml/cxml.h>
namespace xmlpp {
class Node;
namespace xmlpp {
class Node;
@@
-41,8
+42,8
@@
class AudioMapping
{
public:
AudioMapping ();
{
public:
AudioMapping ();
- AudioMapping (int);
- AudioMapping (
boost::shared_ptr<const cxml::Node>
, int);
+ AudioMapping (int
channels
);
+ AudioMapping (
cxml::ConstNodePtr
, int);
/* Default copy constructor is fine */
/* Default copy constructor is fine */
@@
-50,12
+51,14
@@
public:
void make_default ();
void make_default ();
- void set (int,
lib
dcp::Channel, float);
- float get (int,
lib
dcp::Channel) const;
+ void set (int, dcp::Channel, float);
+ float get (int, dcp::Channel) const;
int content_channels () const {
return _content_channels;
}
int content_channels () const {
return _content_channels;
}
+
+ std::string digest () const;
private:
void setup (int);
private:
void setup (int);