summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 01:14:06 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 01:14:06 +0100
commit5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch)
tree769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /src/tools/dcpomatic.cc
parent4e83acad0c2a5c528709a175a80261b8147d3b49 (diff)
Use make_shared<>.
Diffstat (limited to 'src/tools/dcpomatic.cc')
-rw-r--r--src/tools/dcpomatic.cc22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6b1d4d260..6c789632a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -72,6 +72,7 @@
#endif
#include <boost/filesystem.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
#include <fstream>
#include <sstream>
@@ -93,6 +94,7 @@ using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using boost::make_shared;
class FilmChangedDialog : public boost::noncopyable
{
@@ -275,7 +277,7 @@ public:
void new_film (boost::filesystem::path path)
{
- shared_ptr<Film> film (new Film (path));
+ shared_ptr<Film> film = make_shared<Film> (path);
film->write_metadata ();
film->set_name (path.filename().generic_string());
set_film (film);
@@ -284,7 +286,7 @@ public:
void load_film (boost::filesystem::path file)
try
{
- shared_ptr<Film> film (new Film (file));
+ shared_ptr<Film> film = make_shared<Film> (file);
list<string> const notes = film->read_metadata ();
if (film->state_version() == 4) {
@@ -490,14 +492,14 @@ private:
);
} else {
JobManager::instance()->add (
- shared_ptr<Job> (new SendKDMEmailJob (
- _film->name(),
- _film->dcp_name(),
- d->from(),
- d->until(),
- CinemaKDMs::collect (screen_kdms),
- _film->log()
- ))
+ boost::make_shared<SendKDMEmailJob> (
+ _film->name(),
+ _film->dcp_name(),
+ d->from(),
+ d->until(),
+ CinemaKDMs::collect (screen_kdms),
+ _film->log()
+ )
);
}
} catch (dcp::NotEncryptedError& e) {