projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
ffmpeg_examiner_test.cc
diff --git
a/test/ffmpeg_examiner_test.cc
b/test/ffmpeg_examiner_test.cc
index 26834aafc8d7512b304ae24488d3d013893c8d3b..2900689e52a539d549acf780ee1d966abbe41f36 100644
(file)
--- a/
test/ffmpeg_examiner_test.cc
+++ b/
test/ffmpeg_examiner_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/>.
*/
*/
@@
-22,21
+23,23
@@
* correctly from data/count300bd24.m2ts.
*/
* correctly from data/count300bd24.m2ts.
*/
-#include <boost/test/unit_test.hpp>
#include "lib/ffmpeg_examiner.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
#include "test.h"
#include "lib/ffmpeg_examiner.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
using boost::shared_ptr;
using boost::shared_ptr;
+using boost::make_shared;
BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_examiner_test");
BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_examiner_test");
- shared_ptr<FFmpegContent> content
(new FFmpegContent (film, "test/data/count300bd24.m2ts")
);
- shared_ptr<FFmpegExaminer> examiner
(new FFmpegExaminer (content)
);
+ shared_ptr<FFmpegContent> content
= make_shared<FFmpegContent> (film, "test/data/count300bd24.m2ts"
);
+ shared_ptr<FFmpegExaminer> examiner
= make_shared<FFmpegExaminer> (content
);
BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime::from_seconds (600));
BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime::from_seconds (600));
- BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
+ BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1
U
);
BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), ContentTime::from_seconds (600));
}
BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), ContentTime::from_seconds (600));
}