projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: store whole signer/decryption chains and private keys encrypted by machine...
[dcpomatic.git]
/
test
/
stream_test.cc
diff --git
a/test/stream_test.cc
b/test/stream_test.cc
index 800bbd049c0c64cc1401378b39d4fca963d40a36..1e146246487ec972a5e8bfd8e162a0ded5abef4e 100644
(file)
--- a/
test/stream_test.cc
+++ b/
test/stream_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2014 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
+ 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/>.
*/
*/
@@
-42,7
+43,7
@@
BOOST_AUTO_TEST_CASE (stream_test)
root->add_child("Channels")->add_child_text ("2");
/* This is the state file version 5 description of the mapping */
root->add_child("Channels")->add_child_text ("2");
/* This is the state file version 5 description of the mapping */
-
+
xmlpp::Element* mapping = root->add_child("Mapping");
mapping->add_child("ContentChannels")->add_child_text ("2");
{
xmlpp::Element* mapping = root->add_child("Mapping");
mapping->add_child("ContentChannels")->add_child_text ("2");
{
@@
-69,7
+70,7
@@
BOOST_AUTO_TEST_CASE (stream_test)
map->add_child("ContentIndex")->add_child_text ("1");
map->add_child("DCP")->add_child_text ("2");
}
map->add_child("ContentIndex")->add_child_text ("1");
map->add_child("DCP")->add_child_text ("2");
}
-
+
FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
BOOST_CHECK_EQUAL (a.identifier(), "4");
FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
BOOST_CHECK_EQUAL (a.identifier(), "4");