projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of splitting CCAP streams into different assets.
[dcpomatic.git]
/
src
/
lib
/
cinema_sound_processor.cc
diff --git
a/src/lib/cinema_sound_processor.cc
b/src/lib/cinema_sound_processor.cc
index 6a79051145e81e33ff998cacf1f4f7e21cb6c7d7..0b00ee2ee237f90a9d056e17e3cd92fc3a095b9f 100644
(file)
--- a/
src/lib/cinema_sound_processor.cc
+++ b/
src/lib/cinema_sound_processor.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-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/>.
*/
*/
@@
-21,10
+22,11
@@
* @brief CinemaSoundProcessor class.
*/
* @brief CinemaSoundProcessor class.
*/
-#include <iostream>
-#include <cassert>
#include "cinema_sound_processor.h"
#include "dolby_cp750.h"
#include "cinema_sound_processor.h"
#include "dolby_cp750.h"
+#include "dcpomatic_assert.h"
+#include <iostream>
+#include <cassert>
using namespace std;
using namespace std;
@@
-98,6
+100,6
@@
CinemaSoundProcessor::as_index (CinemaSoundProcessor const * s)
CinemaSoundProcessor const *
CinemaSoundProcessor::from_index (int i)
{
CinemaSoundProcessor const *
CinemaSoundProcessor::from_index (int i)
{
-
assert
(i <= int(_cinema_sound_processors.size ()));
+
DCPOMATIC_ASSERT
(i <= int(_cinema_sound_processors.size ()));
return _cinema_sound_processors[i];
}
return _cinema_sound_processors[i];
}