X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.cpp;h=b375c0ec38534e9fd9acd73c24b1e0fb6b2f6ef6;hb=649755f48180b0466cdf212178dc9bdcc5d18210;hp=498394e421f09a9a7bb9aec16f45945d4270d8e9;hpb=c053a9394d1075ecad02ccce2f34c95f08c1f00f;p=lyx.git diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp index 498394e421..b375c0ec38 100644 --- a/src/graphics/GraphicsLoader.cpp +++ b/src/graphics/GraphicsLoader.cpp @@ -18,17 +18,19 @@ #include "GraphicsCache.h" #include "support/debug.h" +#include "support/lassert.h" #include "support/Timeout.h" -#include "support/bind.h" - -#include +#include #include +#include +#include using namespace std; using namespace lyx::support; namespace lyx { + namespace graphics { @@ -77,7 +79,6 @@ static int const s_numimages_ = 10; static int const s_millisecs_ = 500; -// FIXME THREAD LoaderQueue & LoaderQueue::get() { static LoaderQueue singleton; @@ -105,16 +106,17 @@ void LoaderQueue::loadNext() LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME), - running_(false) + running_(false) { - timer.timeout.connect(bind(&LoaderQueue::loadNext, this)); + // Disconnected when this is destroyed + timer.timeout.connect([this](){ loadNext(); }); } void LoaderQueue::startLoader() { LYXERR(Debug::GRAPHICS, "LoaderQueue: waking up"); - running_ = true ; + running_ = true; timer.setTimeout(s_millisecs_); timer.start(); } @@ -159,12 +161,13 @@ void LoaderQueue::touch(Cache::ItemPtr const & item) // ///////////////////////////////////////////////////////////////////// -typedef shared_ptr ImagePtr; +typedef std::shared_ptr ImagePtr; -class Loader::Impl : public boost::signals::trackable { +class Loader::Impl { + friend class Loader; public: /// - Impl(); + Impl(FileName const & doc_file); /// ~Impl(); /// @@ -178,6 +181,8 @@ public: /// Params const & params() const { return params_; } + /// + FileName doc_file_; /// The loading status of the image. ImageStatus status_; /** Must store a copy of the cached item to ensure that it is not @@ -187,9 +192,9 @@ public: /// We modify a local copy of the image once it is loaded. ImagePtr image_; /// This signal is emitted when the image loading status changes. - boost::signal signal_; - /// The connection of the signal StatusChanged - boost::signals::connection sc_; + signal signal_; + /// The connection of the signal statusChanged + scoped_connection connection_; double displayPixelRatio() const { @@ -211,27 +216,35 @@ private: }; -Loader::Loader() - : pimpl_(new Impl) +Loader::Loader(FileName const & doc_file) + : pimpl_(new Impl(doc_file)) {} -Loader::Loader(FileName const & file, bool display) - : pimpl_(new Impl) +Loader::Loader(FileName const & doc_file, FileName const & file, bool display) + : pimpl_(new Impl(doc_file)) { reset(file, display); } -Loader::Loader(FileName const & file, Params const & params) - : pimpl_(new Impl) +Loader::Loader(FileName const & doc_file, FileName const & file, Params const & params) + : pimpl_(new Impl(doc_file)) { reset(file, params); } +Loader::Loader(FileName const & doc_file, Loader const & other) + : pimpl_(new Impl(doc_file)) +{ + Params const & params = other.pimpl_->params(); + reset(params.filename, params); +} + + Loader::Loader(Loader const & other) - : pimpl_(new Impl) + : pimpl_(new Impl(other.pimpl_->doc_file_)) { Params const & params = other.pimpl_->params(); reset(params.filename, params); @@ -246,7 +259,10 @@ Loader::~Loader() Loader & Loader::operator=(Loader const & other) { + LASSERT(false, /**/); if (this != &other) { + delete pimpl_; + pimpl_ = new Impl(other.pimpl_->doc_file_); Params const & params = other.pimpl_->params(); reset(params.filename, params); } @@ -282,13 +298,14 @@ void Loader::reset(Params const & params) const void Loader::startLoading() const { - if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_) + if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_ + || pimpl_->cached_item_->status() == Converting) return; pimpl_->startLoading(); } -void Loader::reload() const +void Loader::reload() const { pimpl_->cached_item_->startLoading(); } @@ -312,12 +329,12 @@ bool Loader::monitoring() const } -unsigned long Loader::checksum() const +void Loader::checkModifiedAsync() const { if (!pimpl_->cached_item_) - return 0; + return; - return pimpl_->cached_item_->checksum(); + pimpl_->cached_item_->checkModifiedAsync(); } @@ -347,7 +364,7 @@ void Loader::setDisplayPixelRatio(double scale) } -boost::signals::connection Loader::connect(slot_type const & slot) const +connection Loader::connect(slot const & slot) const { return pimpl_->signal_.connect(slot); } @@ -359,8 +376,8 @@ Image const * Loader::image() const } -Loader::Impl::Impl() - : status_(WaitingToLoad) +Loader::Impl::Impl(FileName const & doc_file) + : doc_file_(doc_file), status_(WaitingToLoad) { } @@ -387,7 +404,12 @@ void Loader::Impl::resetFile(FileName const & file) continue_monitoring = cached_item_->monitoring(); // cached_item_ is going to be reset, so the connected // signal needs to be disconnected. - sc_.disconnect(); + try { + // This can in theory throw a BufferException + connection_.disconnect(); + } catch (...) { + LYXERR(Debug::GRAPHICS, "Unable to disconnect signal."); + } cached_item_.reset(); if (status_ != Converting) { Cache::get().remove(old_file); @@ -404,7 +426,7 @@ void Loader::Impl::resetFile(FileName const & file) Cache & gc = Cache::get(); if (!gc.inCache(file)) - gc.add(file); + gc.add(file, doc_file_); // We /must/ make a local copy of this. cached_item_ = gc.item(file); @@ -413,7 +435,8 @@ void Loader::Impl::resetFile(FileName const & file) if (continue_monitoring && !cached_item_->monitoring()) cached_item_->startMonitoring(); - sc_ = cached_item_->connect(bind(&Impl::statusChanged, this)); + // This is a scoped connection + connection_ = cached_item_->connect([this](){ statusChanged(); }); } @@ -460,10 +483,6 @@ void Loader::Impl::createPixmap() if (idx != string::npos && idx > 3) { if (filename.substr(idx - 3, 3) == "@2x") { params_.pixel_ratio = 2.0; - } else if (cached_item_->filename().extension() == "svgz") { - params_.pixel_ratio = 4.0; - } else if (cached_item_->filename().extension() == "svg") { - params_.pixel_ratio = 4.0; } } }