diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
| commit | a8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch) | |
| tree | 88bd3a7dd6d4ae56a1efa9b7443c341550759869 /src/tools/server_test.cc | |
| parent | e669b562937786bf5b771c927cc03a4074b01be8 (diff) | |
Revert "Use make_shared<>."
Support for this seems to vary wildly across DoM's build
targets. Stuff that builds on 16.04 won't build on 14.04,
for example. Seems to not be worth the hassle now.
This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
Diffstat (limited to 'src/tools/server_test.cc')
| -rw-r--r-- | src/tools/server_test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 0de05c342..5e50df227 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -31,7 +31,6 @@ #include "lib/player.h" #include "lib/player_video.h" #include "lib/encode_server_description.h" -#include <boost/make_shared.hpp> #include <getopt.h> #include <iostream> #include <iomanip> @@ -42,19 +41,18 @@ using std::cerr; using std::string; using std::pair; using boost::shared_ptr; -using boost::make_shared; using dcp::Data; static shared_ptr<Film> film; static EncodeServerDescription* server; -static shared_ptr<FileLog> log_ = make_shared<FileLog> ("servomatictest.log"); +static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame_count = 0; void process_video (shared_ptr<PlayerVideo> pvf) { - shared_ptr<DCPVideo> local = make_shared<DCPVideo> (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); - shared_ptr<DCPVideo> remote = make_shared<DCPVideo> (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); + shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame_count << ": "; cout.flush (); @@ -146,7 +144,7 @@ main (int argc, char* argv[]) film.reset (new Film (film_dir)); film->read_metadata (); - shared_ptr<Player> player = make_shared<Player> (film, film->playlist ()); + shared_ptr<Player> player (new Player (film, film->playlist ())); DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ()); for (DCPTime t; t < film->length(); t += frame) { |