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/lib/analyse_audio_job.cc | 4 +--- src/lib/atmos_mxf_content.cc | 6 ++---- src/lib/audio_analysis.cc | 4 +--- src/lib/audio_buffers.cc | 6 ++---- src/lib/audio_content.cc | 1 - src/lib/audio_decoder.cc | 4 +--- src/lib/audio_decoder_stream.cc | 10 ++++------ src/lib/audio_delay.cc | 4 +--- src/lib/audio_filter.cc | 4 +--- src/lib/audio_filter_graph.cc | 4 +--- src/lib/cinema.cc | 4 +--- src/lib/cinema_kdms.cc | 4 +--- src/lib/config.cc | 8 +++----- src/lib/dcp_content.cc | 4 +--- src/lib/dcp_decoder.cc | 10 ++++------ src/lib/dcp_subtitle_content.cc | 4 +--- src/lib/dcp_video.cc | 4 +--- src/lib/decoder_factory.cc | 14 ++++++-------- src/lib/encode_server.cc | 8 +++----- src/lib/encode_server_finder.cc | 6 ++---- src/lib/ffmpeg_content.cc | 8 +++----- src/lib/ffmpeg_decoder.cc | 8 +++----- src/lib/ffmpeg_examiner.cc | 4 +--- src/lib/film.cc | 16 +++++++--------- src/lib/image.cc | 8 +++----- src/lib/image_content.cc | 4 +--- src/lib/image_proxy.cc | 8 +++----- src/lib/j2k_image_proxy.cc | 4 +--- src/lib/json_server.cc | 4 +--- src/lib/log.cc | 10 ++++------ src/lib/mid_side_decoder.cc | 6 ++---- src/lib/player.cc | 12 +++++------- src/lib/reel_writer.cc | 10 ++++------ src/lib/render_subtitles.cc | 4 +--- src/lib/resampler.cc | 6 ++---- src/lib/server.cc | 4 +--- src/lib/subtitle_content.cc | 5 +---- src/lib/text_subtitle_content.cc | 4 +--- src/lib/transcode_job.cc | 4 +--- src/lib/upmixer_a.cc | 6 ++---- src/lib/upmixer_b.cc | 8 +++----- src/lib/video_content.cc | 1 - src/lib/video_decoder.cc | 8 +++----- src/lib/video_filter_graph.cc | 7 +++---- src/lib/video_mxf_content.cc | 8 +++----- src/lib/video_mxf_decoder.cc | 8 +++----- 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 ++++------ src/wx/audio_panel.cc | 6 ++---- src/wx/colour_conversion_editor.cc | 20 +++++++++++--------- src/wx/content_menu.cc | 6 ++---- src/wx/hints_dialog.cc | 4 +--- src/wx/job_manager_view.cc | 6 ++---- src/wx/report_problem_dialog.cc | 4 +--- src/wx/screens_panel.cc | 6 ++---- src/wx/timeline.cc | 10 ++++------ 59 files changed, 147 insertions(+), 259 deletions(-) (limited to 'src') diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index ffe7c0fc7..8d0accf0f 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -36,7 +36,6 @@ extern "C" { #endif } #include -#include #include #include "i18n.h" @@ -47,7 +46,6 @@ using std::min; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::make_shared; int const AnalyseAudioJob::_num_points = 1024; @@ -92,7 +90,7 @@ AnalyseAudioJob::json_name () const void AnalyseAudioJob::run () { - shared_ptr player = make_shared (_film, _playlist); + shared_ptr player (new Player (_film, _playlist)); player->set_ignore_video (); player->set_fast (); player->set_play_referenced (); diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc index 870fca56e..f8cc05178 100644 --- a/src/lib/atmos_mxf_content.cc +++ b/src/lib/atmos_mxf_content.cc @@ -25,14 +25,12 @@ #include #include #include -#include #include "i18n.h" using std::list; using std::string; using boost::shared_ptr; -using boost::make_shared; AtmosMXFContent::AtmosMXFContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) @@ -50,7 +48,7 @@ bool AtmosMXFContent::valid_mxf (boost::filesystem::path path) { try { - shared_ptr a = make_shared (path); + shared_ptr a (new dcp::AtmosAsset (path)); return true; } catch (dcp::MXFFileError& e) { @@ -66,7 +64,7 @@ AtmosMXFContent::examine (shared_ptr job) { job->set_progress_unknown (); Content::examine (job); - shared_ptr a = make_shared (path(0)); + shared_ptr a (new dcp::AtmosAsset (path(0))); { boost::mutex::scoped_lock lm (_mutex); diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index b133dec3d..1863e38ee 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,6 @@ using std::cout; using std::max; using std::list; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; AudioAnalysis::AudioAnalysis (int channels) @@ -114,7 +112,7 @@ AudioAnalysis::points (int c) const void AudioAnalysis::write (boost::filesystem::path filename) { - shared_ptr doc = make_shared (); + shared_ptr doc (new xmlpp::Document); xmlpp::Element* root = doc->create_root_node ("AudioAnalysis"); BOOST_FOREACH (vector& i, _data) { diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index 4c3c2d4a7..2ab8e187e 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -20,7 +20,6 @@ #include "audio_buffers.h" #include "dcpomatic_assert.h" -#include #include #include #include @@ -28,7 +27,6 @@ using std::bad_alloc; using boost::shared_ptr; -using boost::make_shared; /** Construct an AudioBuffers. Audio data is undefined after this constructor. * @param channels Number of channels. @@ -307,7 +305,7 @@ AudioBuffers::apply_gain (float dB) shared_ptr AudioBuffers::channel (int c) const { - shared_ptr o = make_shared (1, frames ()); + shared_ptr o (new AudioBuffers (1, frames ())); o->copy_channel_from (this, c, 0); return o; } @@ -322,7 +320,7 @@ AudioBuffers::copy_channel_from (AudioBuffers const * from, int from_channel, in shared_ptr AudioBuffers::clone () const { - shared_ptr b = make_shared (channels (), frames ()); + shared_ptr b (new AudioBuffers (channels (), frames ())); b->copy_from (this, frames (), 0, 0); return b; } diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 57f878b71..7a4ca63a9 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -75,7 +75,6 @@ AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) return shared_ptr (); } - /* Can't use make_shared here as the constructor is private */ return shared_ptr (new AudioContent (parent, node)); } diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index fa9fe9711..8c395cb89 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -23,7 +23,6 @@ #include "audio_decoder_stream.h" #include "audio_content.h" #include -#include #include #include "i18n.h" @@ -31,14 +30,13 @@ using std::cout; using std::map; using boost::shared_ptr; -using boost::make_shared; AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr content, bool fast, shared_ptr log) : _ignore (false) , _fast (fast) { BOOST_FOREACH (AudioStreamPtr i, content->streams ()) { - _streams[i] = make_shared (content, i, parent, fast, log); + _streams[i] = shared_ptr (new AudioDecoderStream (content, i, parent, fast, log)); } } diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index 527610cdf..1bfc65871 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -28,7 +28,6 @@ #include "log.h" #include "audio_content.h" #include "compose.hpp" -#include #include #include "i18n.h" @@ -40,7 +39,6 @@ using std::min; using std::max; using boost::optional; using boost::shared_ptr; -using boost::make_shared; AudioDecoderStream::AudioDecoderStream (shared_ptr content, AudioStreamPtr stream, Decoder* decoder, bool fast, shared_ptr log) : _content (content) @@ -58,7 +56,7 @@ AudioDecoderStream::AudioDecoderStream (shared_ptr content, void AudioDecoderStream::reset_decoded () { - _decoded = ContentAudio (make_shared (_stream->channels(), 0), 0); + _decoded = ContentAudio (shared_ptr (new AudioBuffers (_stream->channels(), 0)), 0); } ContentAudio @@ -120,7 +118,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) Frame const to_return = max ((Frame) 0, min (available, length)); /* Copy our data to the output */ - shared_ptr out = make_shared (_decoded.audio->channels(), to_return); + shared_ptr out (new AudioBuffers (_decoded.audio->channels(), to_return)); out->copy_from (_decoded.audio.get(), to_return, decoded_offset, 0); Frame const remaining = max ((Frame) 0, available - to_return); @@ -159,7 +157,7 @@ AudioDecoderStream::audio (shared_ptr data, ContentTime time Frame const delta_frames = delta.frames_round (frame_rate); if (delta_frames > 0) { /* This data comes after the seek time. Pad the data with some silence. */ - shared_ptr padded = make_shared (data->channels(), data->frames() + delta_frames); + shared_ptr padded (new AudioBuffers (data->channels(), data->frames() + delta_frames)); padded->make_silent (); padded->copy_from (data.get(), data->frames(), 0, delta_frames); data = padded; @@ -174,7 +172,7 @@ AudioDecoderStream::audio (shared_ptr data, ContentTime time */ return; } - shared_ptr trimmed = make_shared (data->channels(), to_keep); + shared_ptr trimmed (new AudioBuffers (data->channels(), to_keep)); trimmed->copy_from (data.get(), to_keep, to_discard, 0); data = trimmed; time += ContentTime::from_frames (to_discard, frame_rate); diff --git a/src/lib/audio_delay.cc b/src/lib/audio_delay.cc index e33d9879b..893773ddd 100644 --- a/src/lib/audio_delay.cc +++ b/src/lib/audio_delay.cc @@ -21,12 +21,10 @@ #include "audio_delay.h" #include "audio_buffers.h" #include "dcpomatic_assert.h" -#include #include using std::cout; using boost::shared_ptr; -using boost::make_shared; AudioDelay::AudioDelay (int samples) : _samples (samples) @@ -40,7 +38,7 @@ AudioDelay::run (shared_ptr in) /* You can't call this with varying channel counts */ DCPOMATIC_ASSERT (!_tail || in->channels() == _tail->channels()); - shared_ptr out = make_shared (in->channels(), in->frames()); + shared_ptr out (new AudioBuffers (in->channels(), in->frames())); if (in->frames() > _samples) { diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc index 4203d074c..44345fc9d 100644 --- a/src/lib/audio_filter.cc +++ b/src/lib/audio_filter.cc @@ -20,12 +20,10 @@ #include "audio_filter.h" #include "audio_buffers.h" -#include #include using std::min; using boost::shared_ptr; -using boost::make_shared; /** @return array of floats which the caller must destroy with delete[] */ float * @@ -77,7 +75,7 @@ AudioFilter::~AudioFilter () shared_ptr AudioFilter::run (shared_ptr in) { - shared_ptr out = make_shared (in->channels(), in->frames()); + shared_ptr out (new AudioBuffers (in->channels(), in->frames())); if (!_tail) { _tail.reset (new AudioBuffers (in->channels(), _M + 1)); diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc index f27befb03..87a158a4e 100644 --- a/src/lib/audio_filter_graph.cc +++ b/src/lib/audio_filter_graph.cc @@ -25,14 +25,12 @@ extern "C" { #include #include } -#include #include "i18n.h" using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels) : _sample_rate (sample_rate) @@ -115,7 +113,7 @@ AudioFilterGraph::process (shared_ptr buffers) the constructor) so we need to create new buffers with some extra silent channels. */ - shared_ptr extended_buffers = make_shared (process_channels, buffers->frames()); + shared_ptr extended_buffers (new AudioBuffers (process_channels, buffers->frames())); for (int i = 0; i < buffers->channels(); ++i) { extended_buffers->copy_channel_from (buffers.get(), i, i); } diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index 3f1750621..469cf2e6b 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -25,13 +25,11 @@ #include #include #include -#include #include using std::list; using std::string; using boost::shared_ptr; -using boost::make_shared; Cinema::Cinema (cxml::ConstNodePtr node) : name (node->string_child ("Name")) @@ -58,7 +56,7 @@ Cinema::read_screens (cxml::ConstNodePtr node) { list s = node->node_children ("Screen"); for (list::iterator i = s.begin(); i != s.end(); ++i) { - add_screen (make_shared (*i)); + add_screen (shared_ptr (new Screen (*i))); } } diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index b32da4d6e..84cd9c18f 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -29,7 +29,6 @@ #include "log.h" #include #include -#include #include "i18n.h" @@ -38,7 +37,6 @@ using std::cout; using std::string; using std::runtime_error; using boost::shared_ptr; -using boost::make_shared; void CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) const @@ -55,7 +53,7 @@ CinemaKDMs::make_zip_file (string film_name, boost::filesystem::path zip_file) c list > kdm_strings; BOOST_FOREACH (ScreenKDM const & i, screen_kdms) { - shared_ptr kdm = boost::make_shared (i.kdm.as_xml ()); + shared_ptr kdm (new string (i.kdm.as_xml ())); kdm_strings.push_back (kdm); struct zip_source* source = zip_source_buffer (zip, kdm->c_str(), kdm->length(), 0); diff --git a/src/lib/config.cc b/src/lib/config.cc index 8e1997325..891d832a2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,6 @@ using std::remove; using std::exception; using std::cerr; using boost::shared_ptr; -using boost::make_shared; using boost::optional; using boost::algorithm::trim; @@ -269,7 +267,7 @@ Config::read () cxml::NodePtr signer = f.optional_node_child ("Signer"); if (signer) { - shared_ptr c = make_shared (); + shared_ptr c (new dcp::CertificateChain ()); /* Read the signing certificates and private key in from the config file */ BOOST_FOREACH (cxml::NodePtr i, signer->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); @@ -283,7 +281,7 @@ Config::read () cxml::NodePtr decryption = f.optional_node_child ("Decryption"); if (decryption) { - shared_ptr c = make_shared (); + shared_ptr c (new dcp::CertificateChain ()); BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); } @@ -561,7 +559,7 @@ Config::read_cinemas (cxml::Document const & f) /* Slightly grotty two-part construction of Cinema here so that we can use shared_from_this. */ - shared_ptr cinema = make_shared (*i); + shared_ptr cinema (new Cinema (*i)); cinema->read_screens (*i); _cinemas.push_back (cinema); } diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index dbbd65077..295f33b3c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -48,7 +47,6 @@ using std::pair; using std::vector; using std::list; using boost::shared_ptr; -using boost::make_shared; using boost::scoped_ptr; using boost::optional; using boost::function; @@ -134,7 +132,7 @@ DCPContent::examine (shared_ptr job) job->set_progress_unknown (); Content::examine (job); - shared_ptr examiner = make_shared (shared_from_this ()); + shared_ptr examiner (new DCPExaminer (shared_from_this ())); video->take_from_examiner (examiner); set_default_colour_conversion (); diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 3bf7c1464..e7e88d319 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -43,14 +43,12 @@ #include #include #include -#include #include using std::list; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::make_shared; DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log, bool fast) : _dcp_content (c) @@ -96,15 +94,15 @@ DCPDecoder::pass (PassReason reason, bool) shared_ptr asset = (*_reel)->main_picture()->asset (); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (_mono_reader) { - video->give (make_shared (_mono_reader->get_frame (entry_point + frame), asset->size()), _offset + frame); + video->give (shared_ptr (new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size())), _offset + frame); } else { video->give ( - make_shared (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT), + shared_ptr (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)), _offset + frame ); video->give ( - make_shared (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT), + shared_ptr (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)), _offset + frame ); } @@ -117,7 +115,7 @@ DCPDecoder::pass (PassReason reason, bool) int const channels = _dcp_content->audio->stream()->channels (); int const frames = sf->size() / (3 * channels); - shared_ptr data = make_shared (channels, frames); + shared_ptr data (new AudioBuffers (channels, frames)); for (int i = 0; i < frames; ++i) { for (int j = 0; j < channels; ++j) { data->data()[j][i] = static_cast ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast (INT_MAX - 256); diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index b361b9419..e7057efc4 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include "i18n.h" @@ -36,7 +35,6 @@ using std::string; using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::make_shared; DCPSubtitleContent::DCPSubtitleContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) @@ -78,7 +76,7 @@ DCPSubtitleContent::examine (shared_ptr job) _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ()); BOOST_FOREACH (shared_ptr i, sc->load_font_nodes ()) { - subtitle->add_font (boost::make_shared (i->id)); + subtitle->add_font (shared_ptr (new Font (i->id))); } } diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 6d270dab2..be69f3eed 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -61,7 +60,6 @@ using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; using dcp::Size; using dcp::Data; @@ -160,7 +158,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (Config::instance()->server_port_base ())); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); - shared_ptr socket = make_shared (timeout); + shared_ptr socket (new Socket (timeout)); socket->connect (*endpoint_iterator); diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index ec0140b0c..dc01a043a 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -31,44 +31,42 @@ #include "video_mxf_content.h" #include "video_mxf_decoder.h" #include -#include using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::make_shared; shared_ptr decoder_factory (shared_ptr content, shared_ptr log, bool fast) { shared_ptr fc = dynamic_pointer_cast (content); if (fc) { - return make_shared (fc, log, fast); + return shared_ptr (new FFmpegDecoder (fc, log, fast)); } shared_ptr dc = dynamic_pointer_cast (content); if (dc) { - return make_shared (dc, log, fast); + return shared_ptr (new DCPDecoder (dc, log, fast)); } shared_ptr ic = dynamic_pointer_cast (content); if (ic) { - return make_shared (ic, log); + return shared_ptr (new ImageDecoder (ic, log)); } shared_ptr rc = dynamic_pointer_cast (content); if (rc) { - return make_shared (rc); + return shared_ptr (new TextSubtitleDecoder (rc)); } shared_ptr dsc = dynamic_pointer_cast (content); if (dsc) { - return make_shared (dsc); + return shared_ptr (new DCPSubtitleDecoder (dsc)); } shared_ptr vmc = dynamic_pointer_cast (content); if (vmc) { - return make_shared (vmc, log); + return shared_ptr (new VideoMXFDecoder (vmc, log)); } return shared_ptr (); diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 635913cc2..f318da03b 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -64,7 +63,6 @@ using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; -using boost::make_shared; using dcp::Size; using dcp::Data; @@ -110,7 +108,7 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st socket->read (reinterpret_cast (buffer.get()), length); string s (buffer.get()); - shared_ptr xml = make_shared ("EncodingRequest"); + shared_ptr xml (new cxml::Document ("EncodingRequest")); xml->read_string (s); /* This is a double-check; the server shouldn't even be on the candidate list if it is the wrong version, but it doesn't hurt to make sure here. @@ -121,7 +119,7 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st return -1; } - shared_ptr pvf = make_shared (xml, socket); + shared_ptr pvf (new PlayerVideo (xml, socket)); DCPVideo dcp_video_frame (pvf, xml, _log); @@ -266,7 +264,7 @@ EncodeServer::broadcast_received () if (_verbose) { cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n"; } - shared_ptr socket = make_shared (); + shared_ptr socket (new Socket); try { socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1)); socket->write (xml.length() + 1); diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index a017a0af1..7491d9ef7 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -28,7 +28,6 @@ #include "raw_convert.h" #include #include -#include #include #include "i18n.h" @@ -40,7 +39,6 @@ using std::cout; using boost::shared_ptr; using boost::scoped_array; using boost::weak_ptr; -using boost::make_shared; EncodeServerFinder* EncodeServerFinder::_instance = 0; @@ -153,7 +151,7 @@ catch (...) void EncodeServerFinder::start_accept () { - shared_ptr socket = make_shared (); + shared_ptr socket (new Socket ()); _listen_acceptor->async_accept ( socket->socket(), boost::bind (&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error, socket) @@ -176,7 +174,7 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptrread (reinterpret_cast (buffer.get()), length); string s (buffer.get()); - shared_ptr xml = make_shared ("ServerAvailable"); + shared_ptr xml (new cxml::Document ("ServerAvailable")); xml->read_string (s); string const ip = socket->socket().remote_endpoint().address().to_string (); diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index f3a4c4c4f..b34fdf6aa 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -42,7 +42,6 @@ extern "C" { } #include #include -#include #include #include "i18n.h" @@ -57,7 +56,6 @@ using std::pair; using std::make_pair; using std::max; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; using boost::optional; @@ -80,7 +78,7 @@ FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr no list c = node->node_children ("SubtitleStream"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { - _subtitle_streams.push_back (make_shared (*i, version)); + _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i, version))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); } @@ -88,7 +86,7 @@ FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr no c = node->node_children ("AudioStream"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr as = make_shared (*i, version); + shared_ptr as (new FFmpegAudioStream (*i, version)); audio->add_stream (as); if (version < 11 && !(*i)->optional_node_child ("Selected")) { /* This is an old file and this stream is not selected, so un-map it */ @@ -212,7 +210,7 @@ FFmpegContent::examine (shared_ptr job) Content::examine (job); - shared_ptr examiner = make_shared (shared_from_this (), job); + shared_ptr examiner (new FFmpegExaminer (shared_from_this (), job)); if (examiner->has_video ()) { video.reset (new VideoContent (this)); diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 69ed7ac12..df6b7416b 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -50,7 +50,6 @@ extern "C" { } #include #include -#include #include #include #include @@ -72,7 +71,6 @@ using std::pair; using std::max; using std::map; using boost::shared_ptr; -using boost::make_shared; using boost::is_any_of; using boost::split; using dcp::Size; @@ -177,7 +175,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const */ int const total_samples = size / bytes_per_audio_sample (stream); int const frames = total_samples / stream->channels(); - shared_ptr audio = make_shared (stream->channels(), frames); + shared_ptr audio (new AudioBuffers (stream->channels(), frames)); switch (audio_sample_format (stream)) { case AV_SAMPLE_FMT_U8: @@ -454,7 +452,7 @@ FFmpegDecoder::decode_video_packet () if (i->second != AV_NOPTS_VALUE) { double const pts = i->second * av_q2d (_format_context->streams[_video_stream.get()]->time_base) + _pts_offset.seconds (); video->give ( - make_shared (image), + shared_ptr (new RawImageProxy (image)), llrint (pts * _ffmpeg_content->active_video_frame_rate ()) ); } else { @@ -534,7 +532,7 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP /* Note RGBA is expressed little-endian, so the first byte in the word is R, second G, third B, fourth A. */ - shared_ptr image = make_shared (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true); + shared_ptr image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true)); #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT /* Start of the first line in the subtitle */ diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 2e48810b1..18a87f40e 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -32,7 +32,6 @@ extern "C" { #include "util.h" #include "safe_stringstream.h" #include -#include #include #include "i18n.h" @@ -41,7 +40,6 @@ using std::string; using std::cout; using std::max; using boost::shared_ptr; -using boost::make_shared; using boost::optional; /** @param job job that the examiner is operating in, or 0 */ @@ -82,7 +80,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrcodec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - _subtitle_streams.push_back (boost::make_shared (subtitle_stream_name (s), s->id)); + _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id))); } } diff --git a/src/lib/film.cc b/src/lib/film.cc index 3378b2042..3cd3f0f21 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -90,7 +89,6 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; -using boost::make_shared; #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); #define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); @@ -320,21 +318,21 @@ Film::make_dcp () throw MissingSettingError (_("name")); } - JobManager::instance()->add (make_shared (shared_from_this())); + JobManager::instance()->add (shared_ptr (new TranscodeJob (shared_from_this()))); } /** Start a job to send our DCP to the configured TMS */ void Film::send_dcp_to_tms () { - shared_ptr j = make_shared (shared_from_this()); + shared_ptr j (new UploadJob (shared_from_this())); JobManager::instance()->add (j); } shared_ptr Film::metadata () const { - shared_ptr doc = make_shared (); + shared_ptr doc (new xmlpp::Document); xmlpp::Element* root = doc->create_root_node ("Metadata"); root->add_child("Version")->add_child_text (raw_convert (current_state_version)); @@ -1005,7 +1003,7 @@ Film::content () const void Film::examine_content (shared_ptr c) { - shared_ptr j = make_shared (shared_from_this(), c); + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); JobManager::instance()->add (j); } @@ -1016,7 +1014,7 @@ Film::examine_and_add_content (shared_ptr c) run_ffprobe (c->path(0), file ("ffprobe.log"), _log); } - shared_ptr j = make_shared (shared_from_this(), c); + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); _job_connections.push_back ( j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr (j), weak_ptr (c))) @@ -1040,7 +1038,7 @@ Film::maybe_add_content (weak_ptr j, weak_ptr c) add_content (content); if (Config::instance()->automatic_audio_analysis() && content->audio) { - shared_ptr playlist = make_shared (); + shared_ptr playlist (new Playlist); playlist->add (content); boost::signals2::connection c; JobManager::instance()->analyse_audio ( @@ -1182,7 +1180,7 @@ Film::make_kdm ( dcp::Formulation formulation ) const { - shared_ptr cpl = make_shared (cpl_file); + shared_ptr cpl (new dcp::CPL (cpl_file)); shared_ptr signer = Config::instance()->signer_chain (); if (!signer->valid ()) { throw InvalidSignerError (); diff --git a/src/lib/image.cc b/src/lib/image.cc index 1107f0a40..71a3a5bcc 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -34,7 +34,6 @@ extern "C" { #include #include } -#include #include #include "i18n.h" @@ -46,7 +45,6 @@ using std::cerr; using std::list; using std::runtime_error; using boost::shared_ptr; -using boost::make_shared; using dcp::Size; int @@ -151,7 +149,7 @@ Image::crop_scale_window ( To get around this, we ask Image to overallocate its buffers by the overrun. */ - shared_ptr out = make_shared (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2); + shared_ptr out (new Image (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2)); out->make_black (); /* Size of the image after any crop */ @@ -229,7 +227,7 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo */ DCPOMATIC_ASSERT (aligned ()); - shared_ptr scaled = make_shared (out_format, out_size, out_aligned); + shared_ptr scaled (new Image (out_format, out_size, out_aligned)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -821,7 +819,7 @@ merge (list images) all.extend (dcpomatic::Rect (i->position, i->image->size().width, i->image->size().height)); } - shared_ptr merged = make_shared (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true); + shared_ptr merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true)); merged->make_transparent (); for (list::const_iterator i = images.begin(); i != images.end(); ++i) { merged->alpha_blend (i->image, i->position - all.position()); diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index ca8bd380f..d4e736771 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -40,7 +39,6 @@ using std::string; using std::cout; using std::list; using boost::shared_ptr; -using boost::make_shared; ImageContent::ImageContent (shared_ptr film, boost::filesystem::path p) : Content (film) @@ -121,7 +119,7 @@ ImageContent::examine (shared_ptr job) shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - shared_ptr examiner = make_shared (film, shared_from_this(), job); + shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); video->take_from_examiner (examiner); set_default_colour_conversion (); } diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 69c296605..3a09cb8e8 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -27,7 +27,6 @@ #include "cross.h" #include #include -#include #include #include "i18n.h" @@ -35,17 +34,16 @@ using std::cout; using std::string; using boost::shared_ptr; -using boost::make_shared; shared_ptr image_proxy_factory (shared_ptr xml, shared_ptr socket) { if (xml->string_child("Type") == N_("Raw")) { - return make_shared (xml, socket); + return shared_ptr (new RawImageProxy (xml, socket)); } else if (xml->string_child("Type") == N_("Magick")) { - return make_shared (xml, socket); + return shared_ptr (new MagickImageProxy (xml, socket)); } else if (xml->string_child("Type") == N_("J2K")) { - return make_shared (xml, socket); + return shared_ptr (new J2KImageProxy (xml, socket)); } throw NetworkError (_("Unexpected image type received by server")); diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 35d70162c..44b5ebea7 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -40,7 +39,6 @@ using std::cout; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using boost::make_shared; using dcp::Data; /** Construct a J2KImageProxy from a JPEG2000 file */ @@ -109,7 +107,7 @@ J2KImageProxy::image (optional) const } } - shared_ptr image = make_shared (pixel_format(), _size, true); + shared_ptr image (new Image (pixel_format(), _size, true)); /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming the data is 12-bit either way. diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index 6e53f9819..0006201e6 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -27,7 +27,6 @@ #include "util.h" #include "film.h" #include "transcode_job.h" -#include #include using std::string; @@ -36,7 +35,6 @@ using std::map; using std::list; using boost::thread; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; using boost::asio::ip::tcp; @@ -63,7 +61,7 @@ try tcp::acceptor a (io_service, tcp::endpoint (tcp::v4 (), port)); while (true) { try { - shared_ptr s = make_shared (io_service); + shared_ptr s (new tcp::socket (io_service)); a.accept (*s); handle (s); } diff --git a/src/lib/log.cc b/src/lib/log.cc index 769852044..b7edd4e29 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -27,7 +27,6 @@ #include "config.h" #include "safe_stringstream.h" #include "string_log_entry.h" -#include #include #include @@ -36,7 +35,6 @@ using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; Log::Log () : _types (0) @@ -73,7 +71,7 @@ Log::log (string message, int type) return; } - shared_ptr e = boost::make_shared (type, message); + shared_ptr e (new StringLogEntry (type, message)); do_log (e); } @@ -83,13 +81,13 @@ Log::dcp_log (dcp::NoteType type, string m) { switch (type) { case dcp::DCP_PROGRESS: - do_log (boost::make_shared (LogEntry::TYPE_GENERAL, m)); + do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_GENERAL, m))); break; case dcp::DCP_ERROR: - do_log (boost::make_shared (LogEntry::TYPE_ERROR, m)); + do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_ERROR, m))); break; case dcp::DCP_NOTE: - do_log (boost::make_shared (LogEntry::TYPE_WARNING, m)); + do_log (shared_ptr (new StringLogEntry (LogEntry::TYPE_WARNING, m))); break; } } diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc index 8d5dc1875..b9b8dd098 100644 --- a/src/lib/mid_side_decoder.cc +++ b/src/lib/mid_side_decoder.cc @@ -21,7 +21,6 @@ #include "mid_side_decoder.h" #include "audio_buffers.h" #include "audio_mapping.h" -#include #include "i18n.h" @@ -29,7 +28,6 @@ using std::string; using std::min; using std::vector; using boost::shared_ptr; -using boost::make_shared; string MidSideDecoder::name () const @@ -52,14 +50,14 @@ MidSideDecoder::out_channels () const shared_ptr MidSideDecoder::clone (int) const { - return make_shared (); + return shared_ptr (new MidSideDecoder ()); } shared_ptr MidSideDecoder::run (shared_ptr in, int channels) { int const N = min (channels, 3); - shared_ptr out = make_shared (channels, in->frames ()); + shared_ptr out (new AudioBuffers (channels, in->frames ())); for (int i = 0; i < in->frames(); ++i) { float const left = in->data()[0][i]; float const right = in->data()[1][i]; diff --git a/src/lib/player.cc b/src/lib/player.cc index 1d3e22e20..30313d39d 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -72,7 +71,6 @@ using std::map; using std::make_pair; using std::copy; using boost::shared_ptr; -using boost::make_shared; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; @@ -141,7 +139,7 @@ Player::setup_pieces () decoder->audio->set_ignore (); } - _pieces.push_back (make_shared (i, decoder, frc)); + _pieces.push_back (shared_ptr (new Piece (i, decoder, frc))); } _have_valid_pieces = true; @@ -280,7 +278,7 @@ Player::black_player_video_frame (DCPTime time) const { return shared_ptr ( new PlayerVideo ( - make_shared (_black_image), + shared_ptr (new RawImageProxy (_black_image)), time, Crop (), optional (), @@ -415,7 +413,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) Frame const length_frames = length.frames_round (_film->audio_frame_rate ()); - shared_ptr audio = make_shared (_film->audio_channels(), length_frames); + shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); list > ov = overlaps (time, time + length, has_audio); @@ -472,13 +470,13 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) /* Gain */ if (i->content->audio->gain() != 0) { - shared_ptr gain = make_shared (all.audio); + shared_ptr gain (new AudioBuffers (all.audio)); gain->apply_gain (i->content->audio->gain ()); all.audio = gain; } /* Remap channels */ - shared_ptr dcp_mapped = make_shared (_film->audio_channels(), all.audio->frames()); + shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames())); dcp_mapped->make_silent (); AudioMapping map = j->mapping (); for (int i = 0; i < map.input_channels(); ++i) { diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index eff5c48ee..e6533d2cc 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -42,7 +42,6 @@ #include #include #include -#include #include "i18n.h" @@ -55,7 +54,6 @@ using std::list; using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; using boost::optional; using boost::dynamic_pointer_cast; using dcp::Data; @@ -305,7 +303,7 @@ ReelWriter::finish () shared_ptr ReelWriter::create_reel (list const & refs, list > const & fonts) { - shared_ptr reel = make_shared (); + shared_ptr reel (new dcp::Reel ()); shared_ptr reel_picture_asset; @@ -338,7 +336,7 @@ ReelWriter::create_reel (list const & refs, listadd (make_shared (_sound_asset, 0)); + reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); } else { /* We don't have a sound asset of our own; hopefully we have one to reference */ BOOST_FOREACH (ReferencedReelAsset j, refs) { @@ -462,13 +460,13 @@ ReelWriter::write (PlayerSubtitles subs) lang = "Unknown"; } if (_film->interop ()) { - shared_ptr s = make_shared (); + shared_ptr s (new dcp::InteropSubtitleAsset ()); s->set_movie_title (_film->name ()); s->set_language (lang); s->set_reel_number ("1"); _subtitle_asset = s; } else { - shared_ptr s = make_shared (); + shared_ptr s (new dcp::SMPTESubtitleAsset ()); s->set_content_title_text (_film->name ()); s->set_language (lang); s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc index 94a6b837b..76aa09229 100644 --- a/src/lib/render_subtitles.cc +++ b/src/lib/render_subtitles.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include using std::list; @@ -40,7 +39,6 @@ using std::pair; using std::cerr; using std::make_pair; using boost::shared_ptr; -using boost::make_shared; using boost::optional; static FcConfig* fc_config = 0; @@ -82,7 +80,7 @@ render_line (list subtitles, list > fonts, /* ...and add a bit more for luck */ height += target.height / 11; - shared_ptr image = make_shared (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false); + shared_ptr image (new Image (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false)); image->make_black (); #ifdef DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index 4476d9f1f..db5552d15 100644 --- a/src/lib/resampler.cc +++ b/src/lib/resampler.cc @@ -24,7 +24,6 @@ #include "compose.hpp" #include "dcpomatic_assert.h" #include -#include #include #include "i18n.h" @@ -34,7 +33,6 @@ using std::pair; using std::make_pair; using std::runtime_error; using boost::shared_ptr; -using boost::make_shared; /** @param in Input sampling rate (Hz) * @param out Output sampling rate (Hz) @@ -64,7 +62,7 @@ Resampler::run (shared_ptr in) int in_frames = in->frames (); int in_offset = 0; int out_offset = 0; - shared_ptr resampled = make_shared (_channels, 0); + shared_ptr resampled (new AudioBuffers (_channels, 0)); while (in_frames > 0) { @@ -138,7 +136,7 @@ Resampler::run (shared_ptr in) shared_ptr Resampler::flush () { - shared_ptr out = make_shared (_channels, 0); + shared_ptr out (new AudioBuffers (_channels, 0)); int out_offset = 0; int64_t const output_size = 65536; diff --git a/src/lib/server.cc b/src/lib/server.cc index d90ec9116..09e0a4bd0 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -20,12 +20,10 @@ #include "server.h" #include "dcpomatic_socket.h" -#include #include "i18n.h" using boost::shared_ptr; -using boost::make_shared; Server::Server (int port) : _terminate (false) @@ -58,7 +56,7 @@ Server::start_accept () } } - shared_ptr socket = make_shared (); + shared_ptr socket (new Socket); _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error)); } diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 9fd49831f..5b3b453b6 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -38,7 +37,6 @@ using std::vector; using std::cout; using std::list; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; int const SubtitleContentProperty::X_OFFSET = 500; @@ -86,7 +84,6 @@ SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version return shared_ptr (); } - /* Can't use make_shared here as the constructor is private */ return shared_ptr (new SubtitleContent (parent, node, version)); } @@ -133,7 +130,7 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int list fonts = node->node_children ("Font"); for (list::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - _fonts.push_back (make_shared (*i)); + _fonts.push_back (shared_ptr (new Font (*i))); } connect_to_fonts (); diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc index ea56ac7bb..24a328d08 100644 --- a/src/lib/text_subtitle_content.cc +++ b/src/lib/text_subtitle_content.cc @@ -26,7 +26,6 @@ #include "raw_convert.h" #include "subtitle_content.h" #include -#include #include #include "i18n.h" @@ -34,7 +33,6 @@ using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; TextSubtitleContent::TextSubtitleContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) @@ -60,7 +58,7 @@ TextSubtitleContent::examine (boost::shared_ptr job) boost::mutex::scoped_lock lm (_mutex); _length = s.length (); - subtitle->add_font (make_shared (TEXT_FONT_ID)); + subtitle->add_font (shared_ptr (new Font (TEXT_FONT_ID))); } string diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 5e41253b8..7144f70d5 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -30,7 +30,6 @@ #include "log.h" #include "safe_stringstream.h" #include "compose.hpp" -#include #include #include @@ -45,7 +44,6 @@ using std::fixed; using std::setprecision; using std::cout; using boost::shared_ptr; -using boost::make_shared; /** @param s Film to use. */ @@ -92,7 +90,7 @@ TranscodeJob::run () _transcoder.reset (); if (_film->upload_after_make_dcp ()) { - shared_ptr job = make_shared (_film); + shared_ptr job (new UploadJob (_film)); JobManager::instance()->add (job); } diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc index e390487d4..a1221e5ac 100644 --- a/src/lib/upmixer_a.cc +++ b/src/lib/upmixer_a.cc @@ -21,7 +21,6 @@ #include "upmixer_a.h" #include "audio_buffers.h" #include "audio_mapping.h" -#include #include "i18n.h" @@ -29,7 +28,6 @@ using std::string; using std::min; using std::vector; using boost::shared_ptr; -using boost::make_shared; UpmixerA::UpmixerA (int sampling_rate) : _left (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate) @@ -63,7 +61,7 @@ UpmixerA::out_channels () const shared_ptr UpmixerA::clone (int sampling_rate) const { - return make_shared (sampling_rate); + return shared_ptr (new UpmixerA (sampling_rate)); } shared_ptr @@ -87,7 +85,7 @@ UpmixerA::run (shared_ptr in, int channels) all_out.push_back (_ls.run (in_L)); all_out.push_back (_rs.run (in_R)); - shared_ptr out = make_shared (channels, in->frames ()); + shared_ptr out (new AudioBuffers (channels, in->frames ())); int const N = min (channels, 6); for (int i = 0; i < N; ++i) { diff --git a/src/lib/upmixer_b.cc b/src/lib/upmixer_b.cc index 65452424a..90e1267cd 100644 --- a/src/lib/upmixer_b.cc +++ b/src/lib/upmixer_b.cc @@ -21,7 +21,6 @@ #include "upmixer_b.h" #include "audio_buffers.h" #include "audio_mapping.h" -#include #include "i18n.h" @@ -29,7 +28,6 @@ using std::string; using std::min; using std::vector; using boost::shared_ptr; -using boost::make_shared; UpmixerB::UpmixerB (int sampling_rate) : _lfe (0.01, 150.0 / sampling_rate) @@ -60,13 +58,13 @@ UpmixerB::out_channels () const shared_ptr UpmixerB::clone (int sampling_rate) const { - return make_shared (sampling_rate); + return shared_ptr (new UpmixerB (sampling_rate)); } shared_ptr UpmixerB::run (shared_ptr in, int channels) { - shared_ptr out = make_shared (channels, in->frames()); + shared_ptr out (new AudioBuffers (channels, in->frames())); /* L + R minus 6dB (in terms of amplitude) */ shared_ptr in_LR = in->channel(0); @@ -96,7 +94,7 @@ UpmixerB::run (shared_ptr in, int channels) shared_ptr S; if (channels > 4) { /* Ls is L - R with some delay */ - shared_ptr sub = make_shared (1, in->frames()); + shared_ptr sub (new AudioBuffers (1, in->frames())); sub->copy_channel_from (in.get(), 0, 0); float* p = sub->data (0); float const * q = in->data (1); diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index ae6cb64dd..a59e9669d 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -83,7 +83,6 @@ VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) return shared_ptr (); } - /* Can't use make_shared here as the constructor is private */ return shared_ptr (new VideoContent (parent, node, version)); } diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index fbc8de9ae..edc746010 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -25,7 +25,6 @@ #include "log.h" #include "compose.hpp" #include -#include #include #include "i18n.h" @@ -35,7 +34,6 @@ using std::list; using std::max; using std::back_inserter; using boost::shared_ptr; -using boost::make_shared; using boost::optional; VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr c, shared_ptr log) @@ -168,7 +166,7 @@ VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye) } /* Fill with black... */ - shared_ptr filler_image = make_shared (_black_image); + shared_ptr filler_image (new RawImageProxy (_black_image)); Part filler_part = PART_WHOLE; /* ...unless there's some video we can fill with */ @@ -194,8 +192,8 @@ void VideoDecoder::fill_both_eyes (VideoFrame from, VideoFrame to) { /* Fill with black... */ - shared_ptr filler_left_image = make_shared (_black_image); - shared_ptr filler_right_image = make_shared (_black_image); + shared_ptr filler_left_image (new RawImageProxy (_black_image)); + shared_ptr filler_right_image (new RawImageProxy (_black_image)); Part filler_left_part = PART_WHOLE; Part filler_right_part = PART_WHOLE; diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc index b6b3c2668..201150560 100644 --- a/src/lib/video_filter_graph.cc +++ b/src/lib/video_filter_graph.cc @@ -25,7 +25,6 @@ extern "C" { #include #include } -#include #include "i18n.h" @@ -35,7 +34,6 @@ using std::vector; using std::string; using std::make_pair; using boost::shared_ptr; -using boost::make_shared; VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p) : _size (s) @@ -53,7 +51,7 @@ VideoFilterGraph::process (AVFrame* frame) list, int64_t> > images; if (_copy) { - images.push_back (make_pair (make_shared (frame), av_frame_get_best_effort_timestamp (frame))); + images.push_back (make_pair (shared_ptr (new Image (frame)), av_frame_get_best_effort_timestamp (frame))); } else { int r = av_buffersrc_write_frame (_buffer_src_context, frame); if (r < 0) { @@ -65,7 +63,7 @@ VideoFilterGraph::process (AVFrame* frame) break; } - images.push_back (make_pair (make_shared (_frame), av_frame_get_best_effort_timestamp (_frame))); + images.push_back (make_pair (shared_ptr (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame))); av_frame_unref (_frame); } } @@ -119,3 +117,4 @@ VideoFilterGraph::sink_name () const { return "buffersink"; } + diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index f5fab485e..d86fc4cf6 100644 --- a/src/lib/video_mxf_content.cc +++ b/src/lib/video_mxf_content.cc @@ -28,14 +28,12 @@ #include #include #include -#include #include "i18n.h" using std::list; using std::string; using boost::shared_ptr; -using boost::make_shared; VideoMXFContent::VideoMXFContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) @@ -53,7 +51,7 @@ bool VideoMXFContent::valid_mxf (boost::filesystem::path path) { try { - shared_ptr mp = make_shared (path); + shared_ptr mp (new dcp::MonoPictureAsset (path)); return true; } catch (dcp::MXFFileError& e) { @@ -62,7 +60,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path) } try { - shared_ptr sp = make_shared (path); + shared_ptr sp (new dcp::StereoPictureAsset (path)); return true; } catch (dcp::MXFFileError& e) { @@ -81,7 +79,7 @@ VideoMXFContent::examine (shared_ptr job) Content::examine (job); video.reset (new VideoContent (this)); - shared_ptr examiner = make_shared (shared_from_this ()); + shared_ptr examiner (new VideoMXFExaminer (shared_from_this ())); video->take_from_examiner (examiner); } diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc index 24f5c31ea..938d7deaf 100644 --- a/src/lib/video_mxf_decoder.cc +++ b/src/lib/video_mxf_decoder.cc @@ -27,10 +27,8 @@ #include #include #include -#include using boost::shared_ptr; -using boost::make_shared; VideoMXFDecoder::VideoMXFDecoder (shared_ptr content, shared_ptr log) : _content (content) @@ -79,10 +77,10 @@ VideoMXFDecoder::pass (PassReason, bool) } if (_mono_reader) { - video->give (make_shared (_mono_reader->get_frame(frame), _size), frame); + video->give (shared_ptr (new J2KImageProxy (_mono_reader->get_frame(frame), _size)), frame); } else { - video->give (make_shared (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT), frame); - video->give (make_shared (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT), frame); + video->give (shared_ptr (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT)), frame); + video->give (shared_ptr (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT)), frame); } _next += ContentTime::from_frames (1, vfr); 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) { diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 8ffe8b7a4..ab26329a4 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -33,7 +33,6 @@ #include "lib/audio_content.h" #include #include -#include #include using std::vector; @@ -43,7 +42,6 @@ using std::list; using std::pair; using boost::dynamic_pointer_cast; using boost::shared_ptr; -using boost::make_shared; using boost::optional; AudioPanel::AudioPanel (ContentPanel* p) @@ -314,10 +312,10 @@ AudioPanel::setup_peak () if (sel.size() != 1) { _peak->SetLabel (wxT ("")); } else { - shared_ptr playlist = make_shared (); + shared_ptr playlist (new Playlist); playlist->add (sel.front ()); try { - shared_ptr analysis = make_shared (_parent->film()->audio_analysis_path (playlist)); + shared_ptr analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist))); if (analysis->sample_peak ()) { float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist); if (peak_dB > -3) { diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 19ebc90d5..01b1ca056 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -27,13 +27,11 @@ #include #include #include -#include #include using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) @@ -310,15 +308,19 @@ ColourConversionEditor::get () const if (_input_gamma_linearised->GetValue ()) { conversion.set_in ( - make_shared ( - _input_power->GetValue (), - raw_convert (wx_to_std (_input_threshold->GetValue ())), - raw_convert (wx_to_std (_input_A->GetValue ())), - raw_convert (wx_to_std (_input_B->GetValue ())) + shared_ptr ( + new dcp::ModifiedGammaTransferFunction ( + _input_power->GetValue (), + raw_convert (wx_to_std (_input_threshold->GetValue ())), + raw_convert (wx_to_std (_input_A->GetValue ())), + raw_convert (wx_to_std (_input_B->GetValue ())) + ) ) ); } else { - conversion.set_in (make_shared (_input_gamma->GetValue ())); + conversion.set_in ( + shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) + ); } conversion.set_yuv_to_rgb (static_cast (_yuv_to_rgb->GetSelection ())); @@ -347,7 +349,7 @@ ColourConversionEditor::get () const conversion.unset_adjusted_white (); } - conversion.set_out (make_shared (2.6)); + conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); return conversion; } diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 99b942174..3d5b00279 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -37,14 +37,12 @@ #include #include #include -#include #include using std::cout; using std::vector; using std::exception; using boost::shared_ptr; -using boost::make_shared; using boost::weak_ptr; using boost::dynamic_pointer_cast; @@ -161,7 +159,7 @@ ContentMenu::join () } try { - shared_ptr joined = boost::make_shared (film, fc); + shared_ptr joined (new FFmpegContent (film, fc)); BOOST_FOREACH (shared_ptr i, _content) { film->remove_content (i); } @@ -266,7 +264,7 @@ ContentMenu::find_missing () return; } - shared_ptr j = make_shared (film, content); + shared_ptr j (new ExamineContentJob (film, content)); _job_connection = j->Finished.connect ( bind ( diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 2150d4576..72ab0eef4 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -29,11 +29,9 @@ #include #include #include -#include using std::max; using boost::shared_ptr; -using boost::make_shared; using boost::optional; using boost::dynamic_pointer_cast; @@ -178,7 +176,7 @@ HintsDialog::film_changed () boost::filesystem::path path = film->audio_analysis_path (film->playlist ()); if (boost::filesystem::exists (path)) { - shared_ptr an = make_shared (path); + shared_ptr an (new AudioAnalysis (path)); if (an->sample_peak() || an->true_peak()) { float const peak = max (an->sample_peak().get_value_or(0), an->true_peak().get_value_or(0)); float const peak_dB = 20 * log10 (peak) + an->gain_correction (film->playlist ()); diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index cba221784..cd6918b72 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -19,7 +19,7 @@ */ /** @file src/job_manager_view.cc - * @brief Class generating a widget to show the progress of jobs. + * @brief Class generating a GTK widget to show the progress of jobs. */ #include "job_manager_view.h" @@ -30,7 +30,6 @@ #include "lib/util.h" #include "lib/exceptions.h" #include "lib/compose.hpp" -#include #include using std::string; @@ -39,7 +38,6 @@ using std::map; using std::min; using std::cout; using boost::shared_ptr; -using boost::make_shared; using boost::weak_ptr; /** Must be called in the GUI thread */ @@ -70,7 +68,7 @@ JobManagerView::job_added (weak_ptr j) { shared_ptr job = j.lock (); if (job) { - _job_records.push_back (make_shared (job, this, _panel, _table)); + _job_records.push_back (shared_ptr (new JobView (job, this, _panel, _table))); } } diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc index 1a32e8fad..68411ee91 100644 --- a/src/wx/report_problem_dialog.cc +++ b/src/wx/report_problem_dialog.cc @@ -24,11 +24,9 @@ #include "lib/job_manager.h" #include "lib/send_problem_report_job.h" #include -#include using std::string; using boost::shared_ptr; -using boost::make_shared; /** @param film Film that we are working on, or 0 */ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr film) @@ -105,5 +103,5 @@ ReportProblemDialog::report () return; } - JobManager::instance()->add (boost::make_shared (_film, wx_to_std (_email->GetValue ()), wx_to_std (_summary->GetValue ()))); + JobManager::instance()->add (shared_ptr (new SendProblemReportJob (_film, wx_to_std (_email->GetValue ()), wx_to_std (_summary->GetValue ())))); } diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index df07a08c4..0638763fe 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -26,7 +26,6 @@ #include "cinema_dialog.h" #include "screen_dialog.h" #include -#include using std::list; using std::pair; @@ -35,7 +34,6 @@ using std::map; using std::string; using std::make_pair; using boost::shared_ptr; -using boost::make_shared; using boost::optional; ScreensPanel::ScreensPanel (wxWindow* parent) @@ -151,7 +149,7 @@ ScreensPanel::add_cinema_clicked () { CinemaDialog* d = new CinemaDialog (this, _("Add Cinema")); if (d->ShowModal () == wxID_OK) { - shared_ptr c = boost::make_shared (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); + shared_ptr c (new Cinema (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute())); Config::instance()->add_cinema (c); add_cinema (c); } @@ -210,7 +208,7 @@ ScreensPanel::add_screen_clicked () return; } - shared_ptr s = boost::make_shared (d->name(), d->recipient(), d->trusted_devices()); + shared_ptr s (new Screen (d->name(), d->recipient(), d->trusted_devices())); c->add_screen (s); optional id = add_screen (c, s); if (id) { diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index ef8549d42..6bb216df8 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -48,7 +47,6 @@ using std::list; using std::cout; using std::max; using boost::shared_ptr; -using boost::make_shared; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; @@ -152,19 +150,19 @@ Timeline::recreate_views () BOOST_FOREACH (shared_ptr i, film->content ()) { if (i->video) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); } if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); } if (i->subtitle) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); } if (dynamic_pointer_cast (i)) { - _views.push_back (make_shared (*this, i)); + _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); } } -- cgit v1.2.3