summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc22
-rw-r--r--src/tools/dcpomatic_batch.cc4
-rw-r--r--src/tools/dcpomatic_create.cc4
-rw-r--r--src/tools/dcpomatic_kdm.cc16
-rw-r--r--src/tools/server_test.cc10
5 files changed, 23 insertions, 33 deletions
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 <boost/filesystem.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
#include <fstream>
#include <sstream>
@@ -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> film = make_shared<Film> (path);
+ shared_ptr<Film> 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> film = make_shared<Film> (file);
+ shared_ptr<Film> film (new Film (file));
list<string> const notes = film->read_metadata ();
if (film->state_version() == 4) {
@@ -492,14 +490,14 @@ private:
);
} else {
JobManager::instance()->add (
- boost::make_shared<SendKDMEmailJob> (
- _film->name(),
- _film->dcp_name(),
- d->from(),
- d->until(),
- CinemaKDMs::collect (screen_kdms),
- _film->log()
- )
+ shared_ptr<Job> (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 <wx/cmdline.h>
#include <wx/preferences.h>
#include <wx/wx.h>
-#include <boost/make_shared.hpp>
#include <iostream>
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> film = make_shared<Film> (path);
+ shared_ptr<Film> 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 <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
#include <getopt.h>
#include <string>
#include <iostream>
@@ -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> film = make_shared<Film> (output, false);
+ shared_ptr<Film> 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 <boost/bind.hpp>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#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> job = boost::make_shared<SendKDMEmailJob> (
- film_name,
- decrypted.content_title_text(),
- _timing->from(), _timing->until(),
- CinemaKDMs::collect (screen_kdms),
- shared_ptr<Log> ()
- );
+ shared_ptr<Job> job (new SendKDMEmailJob (
+ film_name,
+ decrypted.content_title_text(),
+ _timing->from(), _timing->until(),
+ CinemaKDMs::collect (screen_kdms),
+ shared_ptr<Log> ()
+ ));
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 <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) {
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-08 20:39:24 +0000