aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/converter/converterdialog.cpp4
-rw-r--r--src/plugins/General/converter/converterdialog.h4
-rw-r--r--src/plugins/General/converter/converterhelper.cpp2
-rw-r--r--src/plugins/General/copypaste/copypaste.cpp12
-rw-r--r--src/plugins/General/copypaste/copypaste.h4
-rw-r--r--src/plugins/General/covermanager/covermanager.cpp2
-rw-r--r--src/plugins/General/fileops/fileops.cpp8
-rw-r--r--src/plugins/General/fileops/fileops.h2
-rw-r--r--src/plugins/General/hal/halplugin.cpp2
-rw-r--r--src/plugins/General/lyrics/lyrics.cpp2
-rw-r--r--src/plugins/General/mpris/mpris1/tracklistobject.cpp2
-rw-r--r--src/plugins/General/mpris/mpris2/player2object.cpp14
-rw-r--r--src/plugins/General/mpris/mpris2/player2object.h6
-rw-r--r--src/plugins/General/trackchange/trackchange.h2
-rw-r--r--src/plugins/General/udisks/udisksplugin.cpp2
-rw-r--r--src/plugins/General/udisks2/udisks2plugin.cpp2
16 files changed, 35 insertions, 35 deletions
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 2cf238441..2c83e5416 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -29,11 +29,11 @@
#include "preseteditor.h"
#include "converterdialog.h"
-ConverterDialog::ConverterDialog(QList <PlayListItem *> items, QWidget *parent) : QDialog(parent)
+ConverterDialog::ConverterDialog(QList <PlayListTrack *> items, QWidget *parent) : QDialog(parent)
{
ui.setupUi(this);
MetaDataFormatter formatter("%p%if(%p&%t, - ,)%t - %l");
- foreach(PlayListItem *item , items)
+ foreach(PlayListTrack *item , items)
{
if(item->length() == 0)
continue;
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index a7f531b55..981a726fc 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -26,7 +26,7 @@
#include "ui_converterdialog.h"
class QAction;
-class PlayListItem;
+class PlayListTrack;
class ConverterPreset;
/**
@@ -36,7 +36,7 @@ class ConverterDialog : public QDialog
{
Q_OBJECT
public:
- explicit ConverterDialog(QList <PlayListItem *> items, QWidget *parent = 0);
+ explicit ConverterDialog(QList <PlayListTrack *> items, QWidget *parent = 0);
virtual ~ConverterDialog();
QStringList selectedUrls() const;
diff --git a/src/plugins/General/converter/converterhelper.cpp b/src/plugins/General/converter/converterhelper.cpp
index 96ccf72a2..0a93990c6 100644
--- a/src/plugins/General/converter/converterhelper.cpp
+++ b/src/plugins/General/converter/converterhelper.cpp
@@ -55,7 +55,7 @@ ConverterHelper::~ConverterHelper()
void ConverterHelper::openConverter()
{
PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
- QList <PlayListItem *> items = pl_manager->selectedPlayList()->selectedItems();
+ QList <PlayListTrack *> items = pl_manager->selectedPlayList()->selectedItems();
if (items.isEmpty())
return;
diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp
index 87fc8a275..2d9576187 100644
--- a/src/plugins/General/copypaste/copypaste.cpp
+++ b/src/plugins/General/copypaste/copypaste.cpp
@@ -66,9 +66,9 @@ void CopyPaste::cut()
qDebug("%s", Q_FUNC_INFO);
qDeleteAll(m_buffer);
m_buffer.clear();
- foreach(PlayListItem *item, m_pl_manager->selectedPlayList()->selectedItems())
+ foreach(PlayListTrack *item, m_pl_manager->selectedPlayList()->selectedItems())
{
- m_buffer.append(new PlayListItem(*item));
+ m_buffer.append(new PlayListTrack(*item));
}
m_pl_manager->selectedPlayList()->removeSelected();
}
@@ -78,17 +78,17 @@ void CopyPaste::copy()
qDebug("%s", Q_FUNC_INFO);
qDeleteAll(m_buffer);
m_buffer.clear();
- foreach(PlayListItem *item, m_pl_manager->selectedPlayList()->selectedItems())
+ foreach(PlayListTrack *item, m_pl_manager->selectedPlayList()->selectedItems())
{
- m_buffer.append(new PlayListItem(*item));
+ m_buffer.append(new PlayListTrack(*item));
}
}
void CopyPaste::paste()
{
qDebug("%s", Q_FUNC_INFO);
- foreach(PlayListItem *item, m_buffer)
+ foreach(PlayListTrack *item, m_buffer)
{
- m_pl_manager->selectedPlayList()->add(new PlayListItem(*item));
+ m_pl_manager->selectedPlayList()->add(new PlayListTrack(*item));
}
}
diff --git a/src/plugins/General/copypaste/copypaste.h b/src/plugins/General/copypaste/copypaste.h
index 9a444f26c..3b550122c 100644
--- a/src/plugins/General/copypaste/copypaste.h
+++ b/src/plugins/General/copypaste/copypaste.h
@@ -26,7 +26,7 @@
class QAction;
class SoundCore;
-class PlayListItem;
+class PlayListTrack;
class PlayListManager;
/**
@@ -47,7 +47,7 @@ private slots:
private:
PlayListManager *m_pl_manager;
- QList<PlayListItem *> m_buffer;
+ QList<PlayListTrack *> m_buffer;
};
#endif //COPYPASTE_H
diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index 7ab4c82dc..a01bffa60 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -40,7 +40,7 @@ CoverManager::CoverManager(QObject *parent) : QObject(parent)
void CoverManager::showWindow()
{
- QList <PlayListItem *> items = MediaPlayer::instance()->playListManager()->selectedPlayList()->selectedItems();
+ QList <PlayListTrack *> items = MediaPlayer::instance()->playListManager()->selectedPlayList()->selectedItems();
if (!items.isEmpty())
{
CoverWidget *w = new CoverWidget(qApp->activeWindow ());
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 245c4fe20..4283bb187 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -85,7 +85,7 @@ void FileOps::execAction(int n)
QString destination = m_destinations.at(n);
PlayListModel *model = MediaPlayer::instance()->playListManager()->selectedPlayList();
- QList<PlayListItem*> items = model->selectedItems();
+ QList<PlayListTrack*> items = model->selectedItems();
switch (type)
{
@@ -105,7 +105,7 @@ void FileOps::execAction(int n)
progress.show();
progress.setAutoClose (false);
int i = 0;
- foreach(PlayListItem *item, items)
+ foreach(PlayListTrack *item, items)
{
if (!QFile::exists(item->url()))
continue;
@@ -158,7 +158,7 @@ void FileOps::execAction(int n)
}
case RENAME:
qDebug("FileOps: rename");
- foreach(PlayListItem *item, items)
+ foreach(PlayListTrack *item, items)
{
if (!QFile::exists(item->url()))
continue;
@@ -191,7 +191,7 @@ void FileOps::execAction(int n)
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
break;
- foreach(PlayListItem *item, items)
+ foreach(PlayListTrack *item, items)
{
if (QFile::exists(item->url()) && QFile::remove(item->url()))
model->removeAt (model->indexOf(item));
diff --git a/src/plugins/General/fileops/fileops.h b/src/plugins/General/fileops/fileops.h
index 23c35c6de..fdd87182f 100644
--- a/src/plugins/General/fileops/fileops.h
+++ b/src/plugins/General/fileops/fileops.h
@@ -25,7 +25,7 @@
class QAction;
class SoundCore;
-class PlayListItem;
+class PlayListTrack;
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 51db4d894..2f1dfd067 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -237,7 +237,7 @@ HalDevice *HalPlugin::findDevice(QAction *action)
void HalPlugin::addPath(const QString &path)
{
- foreach(PlayListItem *item, MediaPlayer::instance()->playListManager()->selectedPlayList()->items()) // Is it already exist?
+ foreach(PlayListTrack *item, MediaPlayer::instance()->playListManager()->selectedPlayList()->items()) // Is it already exist?
{
if (item->url().startsWith(path))
return;
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index 415e04647..fef704801 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -42,7 +42,7 @@ Lyrics::~Lyrics()
void Lyrics::showLyrics()
{
PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
- QList <PlayListItem *> items = pl_manager->selectedPlayList()->selectedItems();
+ QList <PlayListTrack *> items = pl_manager->selectedPlayList()->selectedItems();
if (!items.isEmpty())
{
if (items.at(0)->value(Qmmp::ARTIST).isEmpty() || items.at(0)->value(Qmmp::TITLE).isEmpty())
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index 9576a902a..e75900439 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -82,7 +82,7 @@ int TrackListObject::GetLength()
QVariantMap TrackListObject::GetMetadata(int in0)
{
QVariantMap map;
- PlayListItem *item = m_model->item(in0);
+ PlayListTrack *item = m_model->item(in0);
if (item)
{
if (QFile::exists(item->url()))
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 1aeb4b2ac..af22d1eb7 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -119,7 +119,7 @@ double Player2Object::maximumRate() const
QVariantMap Player2Object::metadata() const
{
- PlayListItem *item = m_pl_manager->currentPlayList()->currentItem();
+ PlayListTrack *item = m_pl_manager->currentPlayList()->currentItem();
if(!item || m_core->metaData(Qmmp::URL).isEmpty())
return QVariantMap();
QVariantMap map;
@@ -222,8 +222,8 @@ void Player2Object::OpenUri(const QString &in0)
if(!m_pl_manager->currentPlayList()->isLoaderRunning())
{
m_pl_manager->selectPlayList(m_pl_manager->currentPlayList());
- connect(m_pl_manager->currentPlayList(), SIGNAL(itemAdded(PlayListItem*)),
- SLOT(playItem(PlayListItem*)));
+ connect(m_pl_manager->currentPlayList(), SIGNAL(itemAdded(PlayListTrack*)),
+ SLOT(playItem(PlayListTrack*)));
connect(m_pl_manager->currentPlayList(), SIGNAL(loaderFinished()), this, SLOT(disconnectPl()));
}
m_pl_manager->currentPlayList()->add(path);
@@ -343,11 +343,11 @@ void Player2Object::checkSeeking(qint64 elapsed)
m_previous_pos = elapsed;
}
-void Player2Object::playItem(PlayListItem *item)
+void Player2Object::playItem(PlayListTrack *item)
{
m_pl_manager->selectPlayList((PlayListModel*)sender());
m_pl_manager->activatePlayList((PlayListModel*)sender());
- disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListItem*))), this, SLOT(playItem(PlayListItem*)));
+ disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))), this, SLOT(playItem(PlayListTrack*)));
if(!m_pl_manager->currentPlayList()->setCurrent(item))
return;
m_core->stop();
@@ -356,8 +356,8 @@ void Player2Object::playItem(PlayListItem *item)
void Player2Object::disconnectPl()
{
- disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListItem*))),
- this, SLOT(playItem(PlayListItem*)));
+ disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))),
+ this, SLOT(playItem(PlayListTrack*)));
}
void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous)
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index 37d332cf2..b808f83e5 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -30,7 +30,7 @@
class SoundCore;
class MediaPlayer;
class PlayListManager;
-class PlayListItem;
+class PlayListTrack;
class PlayListModel;
/**
@@ -97,7 +97,7 @@ private slots:
void updateId();
void checkState(Qmmp::State state);
void checkSeeking(qint64 elapsed);
- void playItem(PlayListItem *item);
+ void playItem(PlayListTrack *item);
void disconnectPl();
void setModel(PlayListModel *selected, PlayListModel *previous);
@@ -109,7 +109,7 @@ private:
PlayListManager *m_pl_manager;
QMap<QString, QVariant> m_props;
QDBusObjectPath m_trackID;
- PlayListItem *m_prev_item;
+ PlayListTrack *m_prev_item;
qint64 m_previous_pos;
};
diff --git a/src/plugins/General/trackchange/trackchange.h b/src/plugins/General/trackchange/trackchange.h
index 372964551..727f2e2d5 100644
--- a/src/plugins/General/trackchange/trackchange.h
+++ b/src/plugins/General/trackchange/trackchange.h
@@ -26,7 +26,7 @@
class QAction;
class SoundCore;
-class PlayListItem;
+class PlayListTrack;
class PlayListManager;
/**
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index ae342165d..220bf2c03 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -231,7 +231,7 @@ UDisksDevice *UDisksPlugin::findDevice(QAction *action)
void UDisksPlugin::addPath(const QString &path)
{
- foreach(PlayListItem *item, MediaPlayer::instance()->playListManager()->selectedPlayList()->items()) // Is it already exist?
+ foreach(PlayListTrack *item, MediaPlayer::instance()->playListManager()->selectedPlayList()->items()) // Is it already exist?
{
if (item->url().startsWith(path))
return;
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp
index 39c8c6af7..bfee228d8 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks2/udisks2plugin.cpp
@@ -211,7 +211,7 @@ UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
void UDisks2Plugin::addPath(const QString &path)
{
- foreach(PlayListItem *item, PlayListManager::instance()->selectedPlayList()->items()) // Is it already exist?
+ foreach(PlayListTrack *item, PlayListManager::instance()->selectedPlayList()->items()) // Is it already exist?
{
if (item->url().startsWith(path))
return;
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:34:52 +0000