diff options
Diffstat (limited to 'daemon/musicmanager.cpp')
| -rw-r--r-- | daemon/musicmanager.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/daemon/musicmanager.cpp b/daemon/musicmanager.cpp index d34ae5c..385abbf 100644 --- a/daemon/musicmanager.cpp +++ b/daemon/musicmanager.cpp @@ -3,7 +3,8 @@ #include "musicmanager.h" MusicManager::MusicManager(WatchConnector *watch, QObject *parent) - : QObject(parent), watch(watch), _watcher(new QDBusServiceWatcher(this)) + : QObject(parent), l(metaObject()->className()), + watch(watch), _watcher(new QDBusServiceWatcher(this)) { QDBusConnection bus = QDBusConnection::sessionBus(); QDBusConnectionInterface *bus_iface = bus.interface(); @@ -46,7 +47,7 @@ MusicManager::MusicManager(WatchConnector *watch, QObject *parent) void MusicManager::switchToService(const QString &service) { if (_curService != service) { - logger()->debug() << "switching to mpris service" << service; + qCDebug(l) << "switching to mpris service" << service; _curService = service; if (_curService.isEmpty()) { @@ -66,10 +67,10 @@ void MusicManager::fetchMetadataFromService() call << "org.mpris.MediaPlayer2.Player" << "Metadata"; QDBusReply<QDBusVariant> reply = QDBusConnection::sessionBus().call(call); if (reply.isValid()) { - logger()->debug() << "got mpris metadata from service" << _curService; + qCDebug(l) << "got mpris metadata from service" << _curService; _curMetadata = qdbus_cast<QVariantMap>(reply.value().variant().value<QDBusArgument>()); } else { - logger()->error() << reply.error().message(); + qCWarning(l) << reply.error().message(); } } } @@ -82,7 +83,7 @@ void MusicManager::sendCurrentMprisMetadata() QString album = _curMetadata.value("xesam:album").toString().left(30); QString artist = _curMetadata.value("xesam:artist").toString().left(30); - logger()->debug() << "sending mpris metadata:" << track << album << artist; + qCDebug(l) << "sending mpris metadata:" << track << album << artist; watch->sendMusicNowPlaying(track, album, artist); } @@ -92,7 +93,7 @@ void MusicManager::callMprisMethod(const QString &method) Q_ASSERT(!method.isEmpty()); Q_ASSERT(!_curService.isEmpty()); - logger()->debug() << _curService << "->" << method; + qCDebug(l) << _curService << "->" << method; QDBusConnection bus = QDBusConnection::sessionBus(); QDBusMessage call = QDBusMessage::createMethodCall(_curService, @@ -103,16 +104,16 @@ void MusicManager::callMprisMethod(const QString &method) QDBusError err = bus.call(call); if (err.isValid()) { - logger()->error() << "while calling mpris method on" << _curService << ":" << err.message(); + qCWarning(l) << "while calling mpris method on" << _curService << ":" << err.message(); } } void MusicManager::handleMusicControl(WatchConnector::MusicControl operation) { - logger()->debug() << "operation from watch:" << operation; + qCDebug(l) << "operation from watch:" << operation; if (_curService.isEmpty()) { - logger()->info() << "can't do any music operation, no mpris interface active"; + qCDebug(l) << "can't do any music operation, no mpris interface active"; return; } @@ -148,17 +149,17 @@ void MusicManager::handleMusicControl(WatchConnector::MusicControl operation) else { volume -= 0.1; } - logger()->debug() << "Setting volume" << volume; + qCDebug(l) << "Setting volume" << volume; call = QDBusMessage::createMethodCall(_curService, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Set"); call << "org.mpris.MediaPlayer2.Player" << "Volume" << QVariant::fromValue(QDBusVariant(volume)); QDBusError err = QDBusConnection::sessionBus().call(call); if (err.isValid()) { - logger()->error() << err.message(); + qCWarning(l) << err.message(); } } else { - logger()->error() << volumeReply.error().message(); + qCWarning(l) << volumeReply.error().message(); } } break; @@ -168,7 +169,7 @@ void MusicManager::handleMusicControl(WatchConnector::MusicControl operation) break; default: - logger()->warn() << "Operation" << operation << "not supported"; + qCWarning(l) << "Operation" << operation << "not supported"; break; } } @@ -194,7 +195,7 @@ void MusicManager::handleMprisPropertiesChanged(const QString &interface, const if (changed.contains("Metadata")) { QVariantMap metadata = qdbus_cast<QVariantMap>(changed.value("Metadata").value<QDBusArgument>()); - logger()->debug() << "received new metadata" << metadata; + qCDebug(l) << "received new metadata" << metadata; _curMetadata = metadata; } |