projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tinker with layout.
[dcpomatic.git]
/
src
/
lib
/
content_audio.h
diff --git
a/src/lib/content_audio.h
b/src/lib/content_audio.h
index 535c0b4913c7c0a2c157a94c40aeb69101620d6b..4bfbf0cc708d859cb92b8ea5a65c9c59c837777c 100644
(file)
--- a/
src/lib/content_audio.h
+++ b/
src/lib/content_audio.h
@@
-1,27
+1,32
@@
/*
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/>.
*/
*/
+#ifndef DCPOMATIC_CONTENT_AUDIO_H
+#define DCPOMATIC_CONTENT_AUDIO_H
+
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
#include "audio_buffers.h"
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
#include "audio_buffers.h"
+#include "types.h"
/** @class ContentAudio
* @brief A block of audio from a piece of content, with a timestamp as a frame within that content.
/** @class ContentAudio
* @brief A block of audio from a piece of content, with a timestamp as a frame within that content.
@@
-33,12
+38,14
@@
public:
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
-
- ContentAudio (boost::shared_ptr<AudioBuffers> a,
Audio
Frame f)
+
+ ContentAudio (boost::shared_ptr<AudioBuffers> a, Frame f)
: audio (a)
, frame (f)
{}
boost::shared_ptr<AudioBuffers> audio;
: audio (a)
, frame (f)
{}
boost::shared_ptr<AudioBuffers> audio;
-
Audio
Frame frame;
+ Frame frame;
};
};
+
+#endif