aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp2
-rw-r--r--src/plugins/CommandLineOptions/StatusOption/statusoption.cpp6
-rw-r--r--src/plugins/General/converter/converter.cpp6
-rw-r--r--src/plugins/General/converter/converterdialog.cpp2
-rw-r--r--src/plugins/General/covermanager/covermanager.cpp4
-rw-r--r--src/plugins/General/fileops/fileops.cpp9
-rw-r--r--src/plugins/General/kdenotify/kdenotify.cpp2
-rw-r--r--src/plugins/General/notifier/popupwidget.cpp4
-rw-r--r--src/plugins/General/rgscan/rgscandialog.cpp4
-rw-r--r--src/plugins/General/statusicon/statusicon.cpp4
-rw-r--r--src/plugins/General/statusicon/statusiconpopupwidget.cpp4
-rw-r--r--src/plugins/General/trackchange/trackchange.cpp4
-rw-r--r--src/plugins/Ui/skinned/popupwidget.cpp4
-rw-r--r--src/plugins/Ui/skinned/textscroller.cpp2
14 files changed, 28 insertions, 29 deletions
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 4082fde1c..67c4d1014 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -88,7 +88,7 @@ QString PlayListOption::executeCommand(const QString& opt_str, const QStringList
PlayListTrack *track = model->track(i);
if(!track)
continue;
- out += QString("%1. %2").arg(model->numberOfTrack(i) + 1).arg(formatter.parse(track));
+ out += QString("%1. %2").arg(model->numberOfTrack(i) + 1).arg(formatter.format(track));
if(i == model->currentIndex())
out += " [*]";
out += "\n";
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 4fe1dcbcf..fbdc7e130 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2014 by Ilya Kotov *
+ * Copyright (C) 2010-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -72,7 +72,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
out += "TRACK = %n\n";
out += "FILE = %f\n";
MetaDataFormatter formatter(out);
- out = formatter.parse(core->metaData(), core->totalTime());
+ out = formatter.format(core->metaData(), core->totalTime());
}
else
out += "\n";
@@ -81,7 +81,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
{
QString t = args.join(" ");
MetaDataFormatter formatter(t);
- out = formatter.parse(core->metaData(), core->totalTime());
+ out = formatter.format(core->metaData(), core->totalTime());
out += "\n";
}
else if(opt_str == "--nowplaying-syntax")
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index e7e51fea0..f0d21e50a 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2013 by Ilya Kotov *
+ * Copyright (C) 2011-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -166,12 +166,12 @@ void Converter::run()
QMap<Qmmp::MetaData, QString> metadata = list[0]->metaData();
MetaDataFormatter formatter(pattern);
- QString desc = tr("Track: %1").arg(desc_formatter.parse(list[0]->metaData(), list[0]->length()));
+ QString desc = tr("Track: %1").arg(desc_formatter.format(list[0]->metaData(), list[0]->length()));
desc += "\n";
desc += tr("Preset: %1").arg(preset["name"].toString());
emit desriptionChanged(desc);
- QString name = formatter.parse(list[0]->metaData(), list[0]->length());
+ QString name = formatter.format(list[0]->metaData(), list[0]->length());
QString full_path = out_path + "/" + name + "." + preset["ext"].toString();
if(QFile::exists(full_path))
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 2c83e5416..ac2482e3e 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -37,7 +37,7 @@ ConverterDialog::ConverterDialog(QList <PlayListTrack *> items, QWidget *parent
{
if(item->length() == 0)
continue;
- QString text = formatter.parse(item);
+ QString text = formatter.format(item);
QListWidgetItem *listItem = new QListWidgetItem(text);
listItem->setData(Qt::UserRole, item->url());
listItem->setCheckState(Qt::Checked);
diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index f89af8756..dd88e6643 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2013 by Ilya Kotov *
+ * Copyright (C) 2009-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -49,7 +49,7 @@ void CoverManager::showWindow()
pix = QPixmap(":/cm_no_cover.png");
w->setPixmap(pix);
MetaDataFormatter formatter("%p%if(%p&%t, - ,)%if(%t,%t,%f)");
- w->setWindowTitle(formatter.parse(tracks.at(0)));
+ w->setWindowTitle(formatter.format(tracks.at(0)));
w->show();
}
}
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 6e41178b7..e7c2d49f7 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2012 by Ilya Kotov *
+ * Copyright (C) 2009-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -82,6 +82,7 @@ void FileOps::execAction(int n)
{
int type = m_types.at(n);
QString pattern = m_patterns.at(n);
+ MetaDataFormatter formatter(pattern);
QString destination = m_destinations.at(n);
PlayListModel *model = MediaPlayer::instance()->playListManager()->selectedPlayList();
@@ -110,8 +111,7 @@ void FileOps::execAction(int n)
if (!QFile::exists(item->url()))
continue;
//generate file name
- MetaDataFormatter formatter(pattern);
- QString fname = formatter.parse(item);
+ QString fname = formatter.format(item);
//append extension
QString ext = QString(".") + item->url().split('.',QString::SkipEmptyParts).takeLast ();
if (!fname.endsWith(ext))
@@ -163,8 +163,7 @@ void FileOps::execAction(int n)
if (!QFile::exists(item->url()))
continue;
//generate file name
- MetaDataFormatter formatter(pattern);
- QString fname = formatter.parse(item);
+ QString fname = formatter.format(item);
//append extension
QString ext = QString(".") + item->url().split('.',QString::SkipEmptyParts).takeLast ();
if (!fname.endsWith(ext))
diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp
index 47e7987d6..d4bb4a482 100644
--- a/src/plugins/General/kdenotify/kdenotify.cpp
+++ b/src/plugins/General/kdenotify/kdenotify.cpp
@@ -121,7 +121,7 @@ QList<QVariant> KdeNotify::prepareNotification()
args.append(tr("Qmmp now playing:")); //summary (notification title)
MetaDataFormatter f(m_template);
- QString body = f.parse(core->metaData(), core->totalTime()/1000);
+ QString body = f.format(core->metaData(), core->totalTime()/1000);
QString coverPath;
if(m_showCovers)
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index f93999ee8..b29b5c6f0 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2014 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 *
@@ -95,7 +95,7 @@ void PopupWidget::showMetaData()
else
title.replace("%l","");
MetaDataFormatter f(title);
- title = f.parse(core->metaData());
+ title = f.format(core->metaData());
m_label1->setText(title);
diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp
index 75d9aa0e9..7b3824921 100644
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013 by Ilya Kotov *
+ * Copyright (C) 2013-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -73,7 +73,7 @@ RGScanDialog::RGScanDialog(QList <PlayListTrack *> tracks, QWidget *parent) : Q
ext == "wv") //wavpack
{
paths.append(track->url());
- QString name = formatter.parse(track);
+ QString name = formatter.format(track);
QTableWidgetItem *item = new QTableWidgetItem(name);
item->setData(Qt::UserRole, track->url());
item->setData(Qt::ToolTipRole, track->url());
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 077babe5c..9fcbce60d 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -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 *
@@ -122,7 +122,7 @@ void StatusIcon::setState(Qmmp::State state)
void StatusIcon::showMetaData()
{
MetaDataFormatter f("%p%if(%p&%t, - ,)%t");
- QString message = f.parse(m_core->metaData());
+ QString message = f.format(m_core->metaData());
if (message.isEmpty())
message = m_core->metaData(Qmmp::URL).section('/',-1);
diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
index 694c19a5b..1b057c817 100644
--- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp
+++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
@@ -2,7 +2,7 @@
* Copyright (C) 2009 by Artur Guzik *
* a.guzik88@gmail.com *
* *
- * Copyright (C) 2009-2012 by Ilya Kotov *
+ * Copyright (C) 2009-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -116,7 +116,7 @@ void StatusIconPopupWidget::updateMetaData()
}
MetaDataFormatter f(title);
- title = f.parse(core->metaData(), core->totalTime()/1000);
+ title = f.format(core->metaData(), core->totalTime()/1000);
m_textLabel->setText(title);
QPixmap cover = MetaDataManager::instance()->getCover(core->metaData(Qmmp::URL));
m_cover->show();
diff --git a/src/plugins/General/trackchange/trackchange.cpp b/src/plugins/General/trackchange/trackchange.cpp
index 9ec0f0da1..3aa4853d8 100644
--- a/src/plugins/General/trackchange/trackchange.cpp
+++ b/src/plugins/General/trackchange/trackchange.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013 by Ilya Kotov *
+ * Copyright (C) 2013-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -106,7 +106,7 @@ void TrackChange::onFinised()
bool TrackChange::executeCommand(const QMap<Qmmp::MetaData, QString> &metaData, const QString &format)
{
MetaDataFormatter formatter(format);
- QString command = formatter.parse(metaData);
+ QString command = formatter.format(metaData);
#ifdef Q_OS_WIN
bool ok = QProcess::startDetached(QString("cmd.exe \"%1\"").arg(command));
#else
diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp
index d18a689c0..63cfc7142 100644
--- a/src/plugins/Ui/skinned/popupwidget.cpp
+++ b/src/plugins/Ui/skinned/popupwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2014 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 *
@@ -95,7 +95,7 @@ void PopupWidget::prepare(PlayListTrack *item, QPoint pos)
QString title = m_template;
MetaDataFormatter f(title);
- title = f.parse(item);
+ title = f.format(item);
m_label1->setText(title);
qApp->processEvents();
updateGeometry ();
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index b87d77431..ab86942a9 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -241,7 +241,7 @@ void TextScroller::processMetaData()
MetaDataFormatter formater(TITLE_FORMAT);
if(m_core->state() == Qmmp::Playing)
{
- m_titleText = formater.parse(m_core->metaData(), m_core->totalTime()/1000);
+ m_titleText = formater.format(m_core->metaData(), m_core->totalTime()/1000);
updateText();
}
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:33:05 +0000