~jamesh/mediascanner/sort-results

Viewing changes to src/mediascanner/logging.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/logging.cpp

const Domain::SettingsMap &Domain::ReadSettings() {

const char *const current_env = ::getenv("MEDIASCANNER_DEBUG");

static const char *parsed_env = null_ptr;

static const char *parsed_env = nullptr;

static SettingsMap settings;

if (current_env != parsed_env) {

171

}

172

173

static Domain* unknown() {

174

static Domain domain("unknown", null_ptr,

174

static Domain domain("unknown", nullptr,

175

new_sink("UNKNOWN", DefaultMessageSink::Red));

176

return &domain;

177

}

Older »