aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CommandLineOptions/StatusOption/statusoption.cpp4
-rw-r--r--src/plugins/Effect/filewriter/filewriterplugin.cpp16
-rw-r--r--src/plugins/Effect/filewriter/filewriterplugin.h2
-rw-r--r--src/plugins/General/statusicon/statusicon.cpp20
-rw-r--r--src/plugins/General/statusicon/statusiconpopupwidget.cpp2
-rw-r--r--src/plugins/Output/shout/shoutoutput.cpp2
-rw-r--r--src/plugins/Output/shout/shoutoutput.h2
-rw-r--r--src/plugins/Transports/http/httpstreamreader.cpp2
-rw-r--r--src/plugins/Transports/mms/mmsstreamreader.cpp4
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp2
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp2
-rw-r--r--src/plugins/Ui/skinned/textscroller.cpp2
12 files changed, 29 insertions, 31 deletions
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index ecb0f8b37..79d2b64bd 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -71,7 +71,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
out += "TRACK = %n\n";
out += "FILE = %f";
MetaDataFormatter formatter(out);
- out = formatter.format(core->metaData(), core->duration());
+ out = formatter.format(&core->trackInfo());
}
out += "\n";
}
@@ -79,7 +79,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
{
QString t = args.join(" ");
MetaDataFormatter formatter(t);
- out = formatter.format(core->metaData(), core->duration());
+ out = formatter.format(&core->trackInfo());
out += "\n";
}
else if(opt_str == "--nowplaying-syntax")
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index f7646d0a4..ecc0d1ba7 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -40,13 +40,13 @@ void FileWriterPlugin::configure(quint32 srate, ChannelMap map)
{
Effect::configure(srate, map);
if(SoundCore::instance()->state() == Qmmp::Playing || SoundCore::instance()->state() == Qmmp::Paused)
- init(SoundCore::instance()->metaData());
+ init(SoundCore::instance()->trackInfo());
}
void FileWriterPlugin::applyEffect(Buffer *b)
{
- if(!b->metaData.isNull())
- init(*b->metaData);
+ if(!b->trackInfo.isNull())
+ init(*b->trackInfo);
if(!m_inited || !b->samples)
return;
@@ -110,7 +110,7 @@ void FileWriterPlugin::applyEffect(Buffer *b)
}
}
-void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
+void FileWriterPlugin::init(const TrackInfo &info)
{
deinit();
@@ -120,10 +120,10 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
outDir = settings.value("FileWriter/out_dir", outDir).toString();
QString fileName = settings.value("FileWriter/file_name", "%p%if(%p&%t, - ,)%t").toString();
if(fileName.isEmpty())
- fileName = metaData[Qmmp::URL].section("/", 1);
+ fileName = info.path().section("/", 1);
MetaDataFormatter formatter(fileName);
- fileName = formatter.format(metaData, SoundCore::instance()->duration());
+ fileName = formatter.format(&info);
if(!fileName.endsWith(".ogg", Qt::CaseInsensitive))
fileName.append(".ogg");
@@ -173,8 +173,8 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
int i = 0;
while(tag_map[i].key != Qmmp::UNKNOWN)
{
- if(!metaData[tag_map[i].key].isEmpty())
- vorbis_comment_add_tag(&m_vc, tag_map[i].tag, metaData.value(tag_map[i].key).toUtf8().constData());
+ if(!info.value(tag_map[i].key).isEmpty())
+ vorbis_comment_add_tag(&m_vc, tag_map[i].tag, info.value(tag_map[i].key).toUtf8().constData());
i++;
}
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.h b/src/plugins/Effect/filewriter/filewriterplugin.h
index ebf0c6f39..1ec1174bd 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.h
+++ b/src/plugins/Effect/filewriter/filewriterplugin.h
@@ -37,7 +37,7 @@ public:
void applyEffect(Buffer *b);
private:
- void init(const QMap<Qmmp::MetaData, QString> &metaData);
+ void init(const TrackInfo &info);
void deinit();
void sendHeader();
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 86a260324..a4b96b7d3 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -124,21 +124,21 @@ void StatusIcon::setState(Qmmp::State state)
void StatusIcon::showMetaData()
{
- QMap<Qmmp::MetaData, QString> meta = m_core->metaData();
- if(m_splitFileName && meta[Qmmp::TITLE].isEmpty() && !meta[Qmmp::URL].contains("://"))
+ TrackInfo info = m_core->trackInfo();
+ if(m_splitFileName && info.value(Qmmp::TITLE).isEmpty() && !info.path().contains("://"))
{
- QString name = QFileInfo(meta[Qmmp::URL]).completeBaseName();
+ QString name = QFileInfo(info.path()).completeBaseName();
if(name.contains("-"))
{
- meta[Qmmp::TITLE] = name.section('-',1,1).trimmed();
- if(meta[Qmmp::ARTIST].isEmpty())
- meta[Qmmp::ARTIST] = name.section('-',0,0).trimmed();
+ info.setValue(Qmmp::TITLE, name.section('-',1,1).trimmed());
+ if(info.value(Qmmp::ARTIST).isEmpty())
+ info.setValue(Qmmp::ARTIST, name.section('-',0,0).trimmed());
}
}
- QString message = m_messageFormatter.format(meta, m_core->duration());
+ QString message = m_messageFormatter.format(&info);
if (message.isEmpty())
- message = meta[Qmmp::URL].section('/',-1);
+ message = info.path().section('/',-1);
if (m_showMessage)
m_tray->showMessage (tr("Now Playing"), message,
@@ -146,9 +146,9 @@ void StatusIcon::showMetaData()
if(m_showToolTip)
{
- message = m_toolTipFormatter.format(meta, m_core->duration());
+ message = m_toolTipFormatter.format(&info);
if(message.isEmpty())
- message = meta[Qmmp::URL].section('/',-1);
+ message = info.path().section('/',-1);
m_tray->setToolTip(message);
}
}
diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
index e219d4122..e74492fb0 100644
--- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp
+++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
@@ -100,7 +100,7 @@ void StatusIconPopupWidget::updateMetaData(const QString &message)
m_textLabel->setText(message);
if(core->state() == Qmmp::Playing || core->state() == Qmmp::Paused)
{
- QPixmap cover = MetaDataManager::instance()->getCover(core->metaData(Qmmp::URL));
+ QPixmap cover = MetaDataManager::instance()->getCover(core->trackInfo().path());
m_cover->show();
m_bar->show();
if(cover.isNull())
diff --git a/src/plugins/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp
index 15bafb570..6be627357 100644
--- a/src/plugins/Output/shout/shoutoutput.cpp
+++ b/src/plugins/Output/shout/shoutoutput.cpp
@@ -196,7 +196,7 @@ void ShoutOutput::drain()
void ShoutOutput::reset()
{}
-void ShoutOutput::setMetaData(const QMap<Qmmp::MetaData, QString> &metaData)
+void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData)
{
vorbis_comment_clear(&m_vc);
diff --git a/src/plugins/Output/shout/shoutoutput.h b/src/plugins/Output/shout/shoutoutput.h
index 71ff2dea0..5c0bc6d2c 100644
--- a/src/plugins/Output/shout/shoutoutput.h
+++ b/src/plugins/Output/shout/shoutoutput.h
@@ -37,7 +37,7 @@ public:
qint64 writeAudio(unsigned char *data, qint64 maxSize);
void drain();
void reset();
- void setMetaData(const QMap<Qmmp::MetaData, QString> &metaData);
+ void setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData);
private:
void sendHeader();
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index be051a89b..25fa2729b 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -390,7 +390,6 @@ void HttpStreamReader::checkBuffer()
{
metaData.insert(Qmmp::TITLE, m_stream.header.value("icy-name"));
metaData.insert(Qmmp::GENRE, m_stream.header.value("icy-genre"));
- metaData.insert(Qmmp::URL, m_url);
m_parent->addMetaData(metaData);
}
sendStreamInfo(m_codec);
@@ -480,7 +479,6 @@ void HttpStreamReader::parseICYMetaData(char *data, qint64 size)
else
metaData.insert(Qmmp::TITLE, codec->toUnicode(m_stream.header.value("icy-name")));
metaData.insert(Qmmp::GENRE, codec->toUnicode(m_stream.header.value("icy-genre")));
- metaData.insert(Qmmp::URL, m_url);
m_parent->addMetaData(metaData);
sendStreamInfo(codec);
m_meta_sent = true;
diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp
index 503879654..73bb1bdbb 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.cpp
+++ b/src/plugins/Transports/mms/mmsstreamreader.cpp
@@ -199,9 +199,9 @@ void MMSStreamReader::checkBuffer()
{
m_ready = true;
qDebug("MMSStreamReader: ready");
- QMap<Qmmp::MetaData, QString> metaData;
+ /*QMap<Qmmp::MetaData, QString> metaData;
metaData.insert(Qmmp::URL, m_url);
- m_parent->addMetaData(metaData);
+ m_parent->addMetaData(metaData);*/
emit ready();
}
else if (!m_ready)
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index f872c7186..7fb0db61b 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -894,7 +894,7 @@ void MainWindow::showMetaData()
{
PlayListModel *model = m_pl_manager->currentPlayList();
PlayListTrack *track = model->currentTrack();
- if(track && track->path() == m_core->metaData().value(Qmmp::URL))
+ if(track && track->path() == m_core->trackInfo().path())
{
setWindowTitle(m_titleFormatter.format(track));
}
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 388f1d71c..8229f8a53 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -203,7 +203,7 @@ void MainWindow::showState(Qmmp::State state)
void MainWindow::showMetaData()
{
PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
- if (track && track->path() == m_core->metaData().value(Qmmp::URL))
+ if (track && track->path() == m_core->trackInfo().path())
{
setWindowTitle(m_titleFormatter.format(track));
}
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index ffd69ad2e..5a22049b5 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -253,7 +253,7 @@ void TextScroller::processMetaData()
{
if(m_core->state() == Qmmp::Playing)
{
- m_titleText = m_formater.format(m_core->metaData(), m_core->duration());
+ m_titleText = m_formater.format(&m_core->trackInfo());
updateText();
}
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 17:09:06 +0000