From 4edc7417385dca72a37efbdfb257ec50c5fe628b Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 9 May 2018 08:32:35 +0000 Subject: enabled notifier plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7950 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/General.pro | 2 +- src/plugins/General/notifier/notifier.cpp | 4 ++-- src/plugins/General/notifier/popupwidget.cpp | 4 ++-- src/plugins/Ui/qsui/mainwindow.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro index 589d14b7c..14cae0744 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro @@ -1,7 +1,7 @@ include(../../../qmmp.pri) SUBDIRS += statusicon \ -# notifier \ + notifier \ # lyrics \ # scrobbler \ # fileops \ diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index c7d25db94..20b5b6195 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2017 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -54,7 +54,7 @@ Notifier::Notifier(QObject *parent) : QObject(parent) m_disableForFullScreen = settings.value("disable_fullscreen", false).toBool(); settings.endGroup(); m_core = SoundCore::instance(); - connect (m_core, SIGNAL(metaDataChanged ()), SLOT(showMetaData())); + connect (m_core, SIGNAL(trackInfoChanged()), SLOT(showMetaData())); connect (m_core, SIGNAL(stateChanged (Qmmp::State)), SLOT(setState(Qmmp::State))); connect (m_core, SIGNAL(volumeChanged(int, int)), SLOT(showVolume(int, int))); diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index d5b72e04b..7837aff65 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -84,11 +84,11 @@ void PopupWidget::showMetaData() m_timer->stop(); SoundCore *core = SoundCore::instance(); - QString title = m_formatter.format(core->metaData(), core->duration() / 1000); + QString title = m_formatter.format(core->trackInfo()); m_label1->setText(title); - QPixmap pix = MetaDataManager::instance()->getCover(core->metaData(Qmmp::URL)); + QPixmap pix = MetaDataManager::instance()->getCover(core->path()); if(!pix.isNull()) { m_pixlabel->setFixedSize(m_coverSize,m_coverSize); diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index fe93a2976..1548ec421 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -224,9 +224,9 @@ void MainWindow::showState(Qmmp::State state) case Qmmp::Playing: { updateStatus(); - m_analyzer->setCover(MetaDataManager::instance()->getCover(m_core->url())); + m_analyzer->setCover(MetaDataManager::instance()->getCover(m_core->path())); CoverWidget *cw = qobject_cast(m_ui.coverDockWidget->widget()); - cw->setCover(MetaDataManager::instance()->getCover(m_core->url())); + cw->setCover(MetaDataManager::instance()->getCover(m_core->path())); break; } case Qmmp::Paused: -- cgit v1.2.3-13-gbd6f