projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid random black gaps between bits of content A and B when
[dcpomatic.git]
/
src
/
lib
/
content_audio.h
diff --git
a/src/lib/content_audio.h
b/src/lib/content_audio.h
index 194e90e3f35919f4562a6709b97cfad47d16fd6f..509e7e4a6c92f326536637238db75bebb2081f14 100644
(file)
--- a/
src/lib/content_audio.h
+++ b/
src/lib/content_audio.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-37,13
+38,13
@@
public:
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
-
- ContentAudio (boost::shared_ptr<AudioBuffers> a, Frame f)
+
+ ContentAudio (boost::shared_ptr<
const
AudioBuffers> a, Frame f)
: audio (a)
, frame (f)
{}
: audio (a)
, frame (f)
{}
- boost::shared_ptr<AudioBuffers> audio;
+ boost::shared_ptr<
const
AudioBuffers> audio;
Frame frame;
};
Frame frame;
};