~jamesh/mediascanner/disable-tmdb

Viewing changes to src/mediascanner/filesystemscanner.cpp

Committer: Tarmac
Author(s): Jussi Pakkanen
Date: 2013-09-11 15:37:17 UTC
mfrom: (381.2.7 media-scanner)
Revision ID: tarmac-20130911153717-j22y231kn1w9slmj

Replace boost::bind with std::bind. Fixes: https://bugs.launchpad.net/bugs/1223906.

Approved by Pawel Stolowski, PS Jenkins bot.

files modified:
README.md

src/grlmediascanner/mediasource.cpp

src/mediascanner-service/main.cpp

src/mediascanner/commitpolicy.cpp

src/mediascanner/dbusservice.cpp

src/mediascanner/dbusservice.h

src/mediascanner/dbustypes.cpp

src/mediascanner/dbustypes.h

src/mediascanner/dbusutils.cpp

src/mediascanner/dbusutils.h

src/mediascanner/filesystemscanner.cpp

src/mediascanner/filesystemwalker.cpp

src/mediascanner/filter.cpp

src/mediascanner/glibutils.h

src/mediascanner/logging.cpp

src/mediascanner/logging.h

src/mediascanner/mediaindex.cpp

src/mediascanner/mediaindex.h

src/mediascanner/mediaroot.cpp

src/mediascanner/mediautils.cpp

src/mediascanner/metadataresolver.cpp

src/mediascanner/metadataresolver.h

src/mediascanner/property.cpp

src/mediascanner/property.h

src/mediascanner/propertyschema.cpp

src/mediascanner/settings.cpp

src/mediascanner/settings.h

src/mediascanner/taskfacades.h

src/mediascanner/taskmanager.cpp

src/mediascanner/taskmanager.h

src/mediascanner/utilities.cpp

src/mediascanner/utilities.h

tests/auto/filesystemscannertest.cpp

tests/auto/griloplugintest.cpp

tests/auto/loggingtest.cpp

tests/auto/metadataresolvertest.cpp

tests/auto/taskmanagertest.cpp

tests/manual/dbustest.cpp

tests/testlib/environments.cpp

tests/testlib/testutils.h

Show diffs side-by-side

added added

removed removed

src/mediascanner/filesystemscanner.cpp

#include "mediascanner/filesystemscanner.h"

// Boost C++

#include <boost/bind.hpp>

#include <boost/function.hpp>

// C++ Standard Library

#include <algorithm>

#include <limits>

293

289

if (walker_started) {

294

290

d->file_task_manager_->AppendGroupedTask

295

291

(walker->task_group(),

296

boost::bind(&Private::OnMediaRootFinished, d, walker));

292

std::bind(&Private::OnMediaRootFinished, d, walker));

297

293

298

294

d->pending_roots_.push_back(walker->task_group());

299

295

}

354

350

355

351

BOOST_ASSERT(is_idle());

356

352

357

Idle::AddOnce(boost::bind(&Private::NotifyScanningFinished,

353

Idle::AddOnce(std::bind(&Private::NotifyScanningFinished,

358

354

this, std::string()));

359

355

}

360

356

364

360

void FileSystemScanner::Private::NotifyScanningFinished

365

361

(std::string error_message) {

366

362

std::for_each(listeners_.begin(), listeners_.end(),

367

boost::bind(&FileSystemScanner::Listener::OnScanningFinished,

368

_1, error_message));

363

std::bind(&FileSystemScanner::Listener::OnScanningFinished,

364

std::placeholders::_1, error_message));

369

365

}

370

366

371

367

} // namespace mediascanner

Older »