From: Carl Hetherington Date: Sat, 3 Jul 2021 22:13:39 +0000 (+0200) Subject: C++11 tidying. X-Git-Tag: v2.15.156~15 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=34e5ddc254c0a12224cb985e440a2ab7075b532a C++11 tidying. --- diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index fb9439155..baa11ac93 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,19 +18,22 @@ */ -#include -#include "examine_content_job.h" -#include "log.h" + #include "content.h" +#include "examine_content_job.h" #include "film.h" +#include "log.h" +#include #include #include "i18n.h" + using std::string; using std::cout; using std::shared_ptr; + ExamineContentJob::ExamineContentJob (shared_ptr film, shared_ptr c) : Job (film) , _content (c) @@ -38,23 +41,27 @@ ExamineContentJob::ExamineContentJob (shared_ptr film, shared_ptr + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,13 @@ */ + #include "job.h" + class Content; + class ExamineContentJob : public Job { public: diff --git a/src/lib/signaller.h b/src/lib/signaller.h index b67a63917..44650de87 100644 --- a/src/lib/signaller.h +++ b/src/lib/signaller.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,20 +18,18 @@ */ + #ifndef DCPOMATIC_SIGNALLER_H #define DCPOMATIC_SIGNALLER_H + #include "signal_manager.h" #include + class WrapperBase { public: - WrapperBase () - : _valid (true) - , _finished (false) - {} - virtual ~WrapperBase () {} /* Can be called from any thread */ @@ -59,10 +57,11 @@ public: protected: /* Protect _valid and _finished */ mutable boost::mutex _mutex; - bool _valid; - bool _finished; + bool _valid = true; + bool _finished = false; }; + /** Helper class to manage lifetime of signals, specifically to address * the problem where an object containing a signal is deleted before * its signal is emitted. @@ -91,6 +90,7 @@ private: T _signal; }; + /** Parent for any class which needs to raise cross-thread signals (from non-UI * to UI). Subclasses should call, e.g. emit (boost::bind (boost::ref (MySignal), foo, bar)); */ @@ -100,8 +100,8 @@ public: /* Can be called from any thread */ virtual ~Signaller () { boost::mutex::scoped_lock lm (_signaller_mutex); - for (std::list::iterator i = _wrappers.begin(); i != _wrappers.end(); ++i) { - (*i)->invalidate (); + for (auto i: _wrappers) { + i->invalidate(); } } @@ -109,17 +109,17 @@ public: template void emit (T signal) { - Wrapper* w = new Wrapper (signal); + auto w = new Wrapper (signal); if (signal_manager) { - signal_manager->emit (boost::bind (&Wrapper::signal, w)); + signal_manager->emit (boost::bind(&Wrapper::signal, w)); } boost::mutex::scoped_lock lm (_signaller_mutex); /* Clean up finished Wrappers */ - std::list::iterator i = _wrappers.begin (); + auto i = _wrappers.begin (); while (i != _wrappers.end ()) { - std::list::iterator tmp = i; + auto tmp = i; ++tmp; if ((*i)->finished ()) { delete *i; @@ -138,4 +138,5 @@ private: std::list _wrappers; }; + #endif diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc index ec474abdf..113e3a7e8 100644 --- a/src/lib/upload_job.cc +++ b/src/lib/upload_job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,25 @@ */ + /** @file src/upload_job.cc * @brief A job to copy DCPs to a server using libcurl. */ + #include "compose.hpp" -#include "upload_job.h" #include "config.h" -#include "log.h" +#include "curl_uploader.h" #include "dcpomatic_log.h" #include "film.h" +#include "log.h" #include "scp_uploader.h" -#include "curl_uploader.h" +#include "upload_job.h" #include #include "i18n.h" + using std::string; using std::min; using std::shared_ptr; @@ -42,6 +45,7 @@ using boost::scoped_ptr; using namespace boost::placeholders; #endif + UploadJob::UploadJob (shared_ptr film) : Job (film) , _status (_("Waiting")) @@ -49,23 +53,27 @@ UploadJob::UploadJob (shared_ptr film) } + UploadJob::~UploadJob () { stop_thread (); } + string UploadJob::name () const { return _("Copy DCP to TMS"); } + string UploadJob::json_name () const { return N_("upload"); } + void UploadJob::run () { @@ -88,17 +96,19 @@ UploadJob::run () set_state (FINISHED_OK); } + string UploadJob::status () const { boost::mutex::scoped_lock lm (_status_mutex); - string s = Job::status (); - if (!_status.empty () && !finished_in_error ()) { + auto s = Job::status (); + if (!_status.empty() && !finished_in_error()) { s += N_("; ") + _status; } return s; } + void UploadJob::set_status (string s) { diff --git a/src/lib/upload_job.h b/src/lib/upload_job.h index ef9b6b451..afd5ebda4 100644 --- a/src/lib/upload_job.h +++ b/src/lib/upload_job.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,12 +18,15 @@ */ + /** @file src/upload_job.h * @brief A job to copy DCPs to a server using libcurl. */ + #include "job.h" + class UploadJob : public Job { public: