diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-02-02 12:48:26 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-02-02 12:48:26 +0000 |
| commit | be414b78f082adbfa033e8e662070b771b05e552 (patch) | |
| tree | 922354bb236e99710d7d32f8e90a2d5b89a7034b /src | |
| parent | 7e324269d1bfd63f68798eabb113ec3d28a26f22 (diff) | |
| download | qmmp-be414b78f082adbfa033e8e662070b771b05e552.tar.gz qmmp-be414b78f082adbfa033e8e662070b771b05e552.tar.bz2 qmmp-be414b78f082adbfa033e8e662070b771b05e552.zip | |
optimization
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4714 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/General/statusicon/statusicon.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/General/statusicon/statusicon.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 9fcbce60d..71ff8df4a 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -30,7 +30,6 @@ #include <qmmp/soundcore.h> #include <qmmpui/mediaplayer.h> #include <qmmpui/uihelper.h> -#include <qmmpui/metadataformatter.h> #include "qmmptrayicon.h" #include "statusicon.h" @@ -48,6 +47,7 @@ StatusIcon::StatusIcon(QObject *parent) : QObject(parent) m_hideToTray = settings.value("hide_on_close", false).toBool(); m_useStandardIcons = settings.value("use_standard_icons",false).toBool(); m_tooltip = settings.value("show_tooltip",true).toBool(); + m_formatter.setPattern("%p%if(%p&%t, - ,)%t"); #ifdef Q_WS_X11 m_tray->showNiceToolTip(m_tooltip); #endif @@ -121,8 +121,7 @@ void StatusIcon::setState(Qmmp::State state) void StatusIcon::showMetaData() { - MetaDataFormatter f("%p%if(%p&%t, - ,)%t"); - QString message = f.format(m_core->metaData()); + QString message = m_formatter.format(m_core->metaData()); if (message.isEmpty()) message = m_core->metaData(Qmmp::URL).section('/',-1); @@ -132,8 +131,7 @@ void StatusIcon::showMetaData() #ifndef Q_WS_X11 if(m_tooltip) { - MetaDataFormatter f("%p%if(%p&%t, - ,)%t"); - QString message = f.parse(m_core->metaData()); + QString message = m_formatter.format(m_core->metaData()); if(message.isEmpty()) message = m_core->metaData(Qmmp::URL).section('/',-1); m_tray->setToolTip(f.parse(m_core->metaData())); diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h index bd801a26c..36281cdef 100644 --- a/src/plugins/General/statusicon/statusicon.h +++ b/src/plugins/General/statusicon/statusicon.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2013 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,6 +23,7 @@ #include <QMap> #include <qmmpui/general.h> #include <qmmp/qmmp.h> +#include <qmmpui/metadataformatter.h> #include "qmmptrayicon.h" class SoundCore; @@ -58,6 +59,7 @@ private: SoundCore *m_core; MediaPlayer *m_player; QMenu *m_menu; + MetaDataFormatter m_formatter; }; #endif |