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 f3096764c79c248ddb3bb0a0519efbd6caaa9f8f..d3f497fc28ec0cdbb7398a31a12fffaa7f95ad2c 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
@@
-41,7
+41,7
@@
class AudioMapping
{
public:
AudioMapping ();
{
public:
AudioMapping ();
- AudioMapping (int);
+ AudioMapping (int
channels
);
AudioMapping (boost::shared_ptr<const cxml::Node>, int);
/* Default copy constructor is fine */
AudioMapping (boost::shared_ptr<const cxml::Node>, int);
/* Default copy constructor is fine */