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_decoder_seek_test.cc
diff --git
a/test/ffmpeg_decoder_seek_test.cc
b/test/ffmpeg_decoder_seek_test.cc
index d70471bbd75ec8559a6e5cc6995c928bfbfd85e8..5e310cd3c34ca75de5ea2c0555e0a3a272731c7f 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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/>.
*/
*/
@@
-34,12
+35,14
@@
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
#include <vector>
using std::cerr;
using std::vector;
using std::list;
using boost::shared_ptr;
#include <vector>
using std::cerr;
using std::vector;
using std::list;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
static void
using boost::optional;
static void
@@
-48,7
+51,7
@@
check (shared_ptr<FFmpegDecoder> decoder, int frame)
list<ContentVideo> v;
v = decoder->video->get (frame, true);
BOOST_CHECK (v.size() == 1);
list<ContentVideo> v;
v = decoder->video->get (frame, true);
BOOST_CHECK (v.size() == 1);
- BOOST_CHECK_EQUAL (v.front().frame, frame);
+ BOOST_CHECK_EQUAL (v.front().frame
.index()
, frame);
}
static void
}
static void
@@
-61,11
+64,11
@@
test (boost::filesystem::path file, vector<int> frames)
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
- shared_ptr<FFmpegContent> content
(new FFmpegContent (film, path)
);
+ shared_ptr<FFmpegContent> content
= make_shared<FFmpegContent> (film, path
);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<Log> log
(new NullLog
);
- shared_ptr<FFmpegDecoder> decoder
(new FFmpegDecoder (content, log, false)
);
+ shared_ptr<Log> log
= make_shared<NullLog> (
);
+ shared_ptr<FFmpegDecoder> decoder
= make_shared<FFmpegDecoder> (content, log, false
);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);