From a8a0dfd1b21de6c0facf965ab119833ff6f790bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:53 +0100 Subject: 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. --- src/tools/dcpomatic.cc | 22 ++++++++++------------ src/tools/dcpomatic_batch.cc | 4 +--- src/tools/dcpomatic_create.cc | 4 +--- src/tools/dcpomatic_kdm.cc | 16 +++++++--------- src/tools/server_test.cc | 10 ++++------ 5 files changed, 23 insertions(+), 33 deletions(-) (limited to 'src/tools') diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 6c789632a..6b1d4d260 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -72,7 +72,6 @@ #endif #include #include -#include #include #include #include @@ -94,7 +93,6 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; -using boost::make_shared; class FilmChangedDialog : public boost::noncopyable { @@ -277,7 +275,7 @@ public: void new_film (boost::filesystem::path path) { - shared_ptr film = make_shared (path); + shared_ptr film (new Film (path)); film->write_metadata (); film->set_name (path.filename().generic_string()); set_film (film); @@ -286,7 +284,7 @@ public: void load_film (boost::filesystem::path file) try { - shared_ptr film = make_shared (file); + shared_ptr film (new Film (file)); list const notes = film->read_metadata (); if (film->state_version() == 4) { @@ -492,14 +490,14 @@ private: ); } else { JobManager::instance()->add ( - boost::make_shared ( - _film->name(), - _film->dcp_name(), - d->from(), - d->until(), - CinemaKDMs::collect (screen_kdms), - _film->log() - ) + shared_ptr (new SendKDMEmailJob ( + _film->name(), + _film->dcp_name(), + d->from(), + d->until(), + CinemaKDMs::collect (screen_kdms), + _film->log() + )) ); } } catch (dcp::NotEncryptedError& e) { diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 3570dda08..a112e457a 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -36,14 +36,12 @@ #include #include #include -#include #include using std::exception; using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; using boost::thread; using boost::scoped_array; @@ -130,7 +128,7 @@ public: void start_job (boost::filesystem::path path) { try { - shared_ptr film = make_shared (path); + shared_ptr film (new Film (path)); film->read_metadata (); film->make_dcp (); } catch (std::exception& e) { diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 3697b4e8b..fd950807c 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -31,7 +31,6 @@ #include "lib/video_content.h" #include #include -#include #include #include #include @@ -44,7 +43,6 @@ using std::cerr; using std::list; using std::exception; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; static void @@ -208,7 +206,7 @@ main (int argc, char* argv[]) } try { - shared_ptr film = make_shared (output, false); + shared_ptr film (new Film (output, false)); film->set_name (name); film->set_container (container_ratio); diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index eb44b4997..c686a974d 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -51,7 +51,6 @@ #endif #include #include -#include #ifdef check #undef check @@ -62,7 +61,6 @@ using std::list; using std::string; using std::vector; using boost::shared_ptr; -using boost::make_shared; using boost::bind; enum { @@ -303,13 +301,13 @@ private: if (film_name.empty ()) { film_name = decrypted.content_title_text (); } - shared_ptr job = boost::make_shared ( - film_name, - decrypted.content_title_text(), - _timing->from(), _timing->until(), - CinemaKDMs::collect (screen_kdms), - shared_ptr () - ); + shared_ptr job (new SendKDMEmailJob ( + film_name, + decrypted.content_title_text(), + _timing->from(), _timing->until(), + CinemaKDMs::collect (screen_kdms), + shared_ptr () + )); JobManager::instance()->add (job); if (_job_view) { 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 #include #include #include @@ -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; static EncodeServerDescription* server; -static shared_ptr log_ = make_shared ("servomatictest.log"); +static shared_ptr log_ (new FileLog ("servomatictest.log")); static int frame_count = 0; void process_video (shared_ptr pvf) { - shared_ptr local = make_shared (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); - shared_ptr remote = make_shared (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_); + shared_ptr local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr 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 = make_shared (film, film->playlist ()); + shared_ptr 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) { -- cgit v1.2.3