summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/audio_panel.cc6
-rw-r--r--src/wx/colour_conversion_editor.cc20
-rw-r--r--src/wx/content_menu.cc6
-rw-r--r--src/wx/hints_dialog.cc4
-rw-r--r--src/wx/job_manager_view.cc6
-rw-r--r--src/wx/report_problem_dialog.cc4
-rw-r--r--src/wx/screens_panel.cc6
-rw-r--r--src/wx/timeline.cc10
8 files changed, 25 insertions, 37 deletions
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 <wx/spinctrl.h>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
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> playlist = make_shared<Playlist> ();
+ shared_ptr<Playlist> playlist (new Playlist);
playlist->add (sel.front ());
try {
- shared_ptr<AudioAnalysis> analysis = make_shared<AudioAnalysis> (_parent->film()->audio_analysis_path (playlist));
+ shared_ptr<AudioAnalysis> 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 <dcp/modified_gamma_transfer_function.h>
#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
-#include <boost/make_shared.hpp>
#include <iostream>
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<dcp::ModifiedGammaTransferFunction> (
- _input_power->GetValue (),
- raw_convert<double> (wx_to_std (_input_threshold->GetValue ())),
- raw_convert<double> (wx_to_std (_input_A->GetValue ())),
- raw_convert<double> (wx_to_std (_input_B->GetValue ()))
+ shared_ptr<dcp::ModifiedGammaTransferFunction> (
+ new dcp::ModifiedGammaTransferFunction (
+ _input_power->GetValue (),
+ raw_convert<double> (wx_to_std (_input_threshold->GetValue ())),
+ raw_convert<double> (wx_to_std (_input_A->GetValue ())),
+ raw_convert<double> (wx_to_std (_input_B->GetValue ()))
+ )
)
);
} else {
- conversion.set_in (make_shared<dcp::GammaTransferFunction> (_input_gamma->GetValue ()));
+ conversion.set_in (
+ shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (_input_gamma->GetValue ()))
+ );
}
conversion.set_yuv_to_rgb (static_cast<dcp::YUVToRGB> (_yuv_to_rgb->GetSelection ()));
@@ -347,7 +349,7 @@ ColourConversionEditor::get () const
conversion.unset_adjusted_white ();
}
- conversion.set_out (make_shared<dcp::GammaTransferFunction> (2.6));
+ conversion.set_out (shared_ptr<dcp::GammaTransferFunction> (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 <wx/wx.h>
#include <wx/dirdlg.h>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
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<FFmpegContent> joined = boost::make_shared<FFmpegContent> (film, fc);
+ shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
BOOST_FOREACH (shared_ptr<Content> i, _content) {
film->remove_content (i);
}
@@ -266,7 +264,7 @@ ContentMenu::find_missing ()
return;
}
- shared_ptr<Job> j = make_shared<ExamineContentJob> (film, content);
+ shared_ptr<Job> 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 <wx/richtext/richtextctrl.h>
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
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<AudioAnalysis> an = make_shared<AudioAnalysis> (path);
+ shared_ptr<AudioAnalysis> 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 <boost/make_shared.hpp>
#include <iostream>
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<Job> j)
{
shared_ptr<Job> job = j.lock ();
if (job) {
- _job_records.push_back (make_shared<JobView> (job, this, _panel, _table));
+ _job_records.push_back (shared_ptr<JobView> (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 <wx/sizer.h>
-#include <boost/make_shared.hpp>
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> film)
@@ -105,5 +103,5 @@ ReportProblemDialog::report ()
return;
}
- JobManager::instance()->add (boost::make_shared<SendProblemReportJob> (_film, wx_to_std (_email->GetValue ()), wx_to_std (_summary->GetValue ())));
+ JobManager::instance()->add (shared_ptr<Job> (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 <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
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<Cinema> c = boost::make_shared<Cinema> (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute());
+ shared_ptr<Cinema> 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<Screen> s = boost::make_shared<Screen> (d->name(), d->recipient(), d->trusted_devices());
+ shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
c->add_screen (s);
optional<wxTreeItemId> 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 <wx/graphics.h>
#include <boost/weak_ptr.hpp>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <list>
#include <iostream>
@@ -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<Content> i, film->content ()) {
if (i->video) {
- _views.push_back (make_shared<TimelineVideoContentView> (*this, i));
+ _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
}
if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
- _views.push_back (make_shared<TimelineAudioContentView> (*this, i));
+ _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
if (i->subtitle) {
- _views.push_back (make_shared<TimelineSubtitleContentView> (*this, i));
+ _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
}
if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
- _views.push_back (make_shared<TimelineAtmosContentView> (*this, i));
+ _views.push_back (shared_ptr<TimelineView> (new TimelineAtmosContentView (*this, i)));
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-14 03:50:11 +0000