aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qmmp/qmmpaudioengine.cpp6
-rw-r--r--src/qmmpui/groupedcontainer.cpp6
-rw-r--r--src/qmmpui/groupedcontainer_p.h6
-rw-r--r--src/qmmpui/normalcontainer.cpp6
-rw-r--r--src/qmmpui/normalcontainer_p.h6
-rw-r--r--src/qmmpui/playlistcontainer_p.h6
-rw-r--r--src/qmmpui/playlistgroup.cpp9
-rw-r--r--src/qmmpui/playlistgroup.h6
-rw-r--r--src/qmmpui/playlistitem.h6
-rw-r--r--src/qmmpui/playlistmanager.cpp2
-rw-r--r--src/qmmpui/playlistmanager.h2
-rw-r--r--src/qmmpui/playlistmodel.cpp14
-rw-r--r--src/qmmpui/playlistmodel.h18
-rw-r--r--src/qmmpui/playlisttrack.cpp8
-rw-r--r--src/qmmpui/playlisttrack.h8
15 files changed, 59 insertions, 50 deletions
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 75a6153a7..b6be71845 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -637,7 +637,8 @@ void QmmpAudioEngine::prepareEffects(Decoder *d)
m_converter->configure(m_ap.format());
m_ap = AudioParameters(m_ap.sampleRate(), m_ap.channelMap(), Qmmp::PCM_FLOAT);
//remove disabled and external effects
- for(Effect *e : qAsConst(m_effects))
+ const QList<Effect *> tmp = m_effects;
+ for(Effect *e : qAsConst(tmp))
{
if(!e->factory() || !Effect::isEnabled(e->factory()))
{
@@ -681,7 +682,10 @@ void QmmpAudioEngine::prepareEffects(Decoder *d)
for(Effect *e : qAsConst(tmp_effects)) //find effect
{
if(e->factory() == factory)
+ {
effect = e;
+ break;
+ }
}
if(effect && (effect->audioParameters() != m_ap ||
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index c011c0a5d..24193261c 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -68,7 +68,7 @@ void GroupedContainer::addTrack(PlayListTrack *track)
track->setTrackIndex(trackCount() - 1);
}
-void GroupedContainer::addTracks(QList<PlayListTrack *> tracks)
+void GroupedContainer::addTracks(const QList<PlayListTrack *> &tracks)
{
bool found = false;
@@ -123,7 +123,7 @@ void GroupedContainer::insertTrack(int index, PlayListTrack *track)
addTrack(track);
}
-void GroupedContainer::replaceTracks(QList<PlayListTrack *> tracks)
+void GroupedContainer::replaceTracks(const QList<PlayListTrack *> &tracks)
{
for(PlayListGroup *g : qAsConst(m_groups))
{
@@ -294,7 +294,7 @@ void GroupedContainer::removeTracks(QList<PlayListTrack *> tracks)
removeTrack(t);
}
-bool GroupedContainer::move(QList<int> indexes, int from, int to)
+bool GroupedContainer::move(const QList<int> &indexes, int from, int to)
{
updateCache();
PlayListGroup *group = nullptr;
diff --git a/src/qmmpui/groupedcontainer_p.h b/src/qmmpui/groupedcontainer_p.h
index 98737bd5b..3a0e1d0b6 100644
--- a/src/qmmpui/groupedcontainer_p.h
+++ b/src/qmmpui/groupedcontainer_p.h
@@ -35,9 +35,9 @@ public:
virtual ~GroupedContainer();
void addTrack(PlayListTrack *track) override;
- void addTracks(QList<PlayListTrack *> tracks) override;
+ void addTracks(const QList<PlayListTrack *> &tracks) override;
void insertTrack(int index, PlayListTrack *track) override;
- void replaceTracks(QList<PlayListTrack *> tracks) override;
+ void replaceTracks(const QList<PlayListTrack *> &tracks) override;
QList<PlayListGroup *> groups() const override;
QList<PlayListTrack *> tracks() const override;
QList<PlayListItem *> items() const override;
@@ -57,7 +57,7 @@ public:
PlayListTrack *findTrack(int number) const override;
void removeTrack(PlayListTrack *track) override;
void removeTracks(QList<PlayListTrack *> tracks) override;
- bool move(QList<int> indexes, int from, int to) override;
+ bool move(const QList<int> &indexes, int from, int to) override;
QList<PlayListTrack *> takeAllTracks() override;
void clear() override;
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index 33b549736..51d8fc839 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -33,7 +33,7 @@ NormalContainer::~NormalContainer()
clear();
}
-void NormalContainer::addTracks(QList<PlayListTrack *> tracks)
+void NormalContainer::addTracks(const QList<PlayListTrack *> &tracks)
{
for(PlayListTrack *track : qAsConst(tracks))
{
@@ -59,7 +59,7 @@ void NormalContainer::insertTrack(int index, PlayListTrack *track)
}
}
-void NormalContainer::replaceTracks(QList<PlayListTrack *> tracks)
+void NormalContainer::replaceTracks(const QList<PlayListTrack *> &tracks)
{
m_items.clear();
addTracks(tracks);
@@ -184,7 +184,7 @@ void NormalContainer::removeTracks(QList<PlayListTrack *> tracks)
m_items[i]->setTrackIndex(i);
}
-bool NormalContainer::move(QList<int> indexes, int from, int to)
+bool NormalContainer::move(const QList<int> &indexes, int from, int to)
{
if (from > to)
{
diff --git a/src/qmmpui/normalcontainer_p.h b/src/qmmpui/normalcontainer_p.h
index 35cb72605..ccf5f7fdc 100644
--- a/src/qmmpui/normalcontainer_p.h
+++ b/src/qmmpui/normalcontainer_p.h
@@ -34,9 +34,9 @@ public:
NormalContainer();
virtual ~NormalContainer();
- void addTracks(QList<PlayListTrack *> tracks) override;
+ void addTracks(const QList<PlayListTrack *> &tracks) override;
void insertTrack(int index, PlayListTrack *track) override;
- void replaceTracks(QList<PlayListTrack *> tracks) override;
+ void replaceTracks(const QList<PlayListTrack *> &tracks) override;
QList<PlayListGroup *> groups() const override;
QList<PlayListTrack *> tracks() const override;
QList<PlayListItem *> items() const override;
@@ -56,7 +56,7 @@ public:
PlayListTrack *findTrack(int number) const override;
void removeTrack(PlayListTrack *track) override;
void removeTracks(QList<PlayListTrack *> tracks) override;
- bool move(QList<int> indexes, int from, int to) override;
+ bool move(const QList<int> &indexes, int from, int to) override;
QList<PlayListTrack *> takeAllTracks() override;
void clear() override;
diff --git a/src/qmmpui/playlistcontainer_p.h b/src/qmmpui/playlistcontainer_p.h
index a8778f610..7ec98adfb 100644
--- a/src/qmmpui/playlistcontainer_p.h
+++ b/src/qmmpui/playlistcontainer_p.h
@@ -39,9 +39,9 @@ public:
virtual ~PlayListContainer(){}
virtual void addTrack(PlayListTrack *track);
- virtual void addTracks(QList<PlayListTrack *> tracks) = 0;
+ virtual void addTracks(const QList<PlayListTrack *> &tracks) = 0;
virtual void insertTrack(int index, PlayListTrack *track) = 0;
- virtual void replaceTracks(QList<PlayListTrack *> tracks) = 0;
+ virtual void replaceTracks(const QList<PlayListTrack *> &tracks) = 0;
virtual QList<PlayListGroup *> groups() const = 0;
virtual QList<PlayListItem *> items() const = 0;
virtual QList<PlayListTrack *> tracks() const = 0;
@@ -61,7 +61,7 @@ public:
virtual PlayListTrack *findTrack(int number) const = 0;
virtual void removeTrack(PlayListTrack *track) = 0;
virtual void removeTracks(QList<PlayListTrack *> tracks) = 0;
- virtual bool move(QList<int> indexes, int from, int to) = 0;
+ virtual bool move(const QList<int> &indexes, int from, int to) = 0;
virtual QList<PlayListTrack *> takeAllTracks() = 0;
virtual void clear() = 0;
diff --git a/src/qmmpui/playlistgroup.cpp b/src/qmmpui/playlistgroup.cpp
index b8636276c..cd2080762 100644
--- a/src/qmmpui/playlistgroup.cpp
+++ b/src/qmmpui/playlistgroup.cpp
@@ -38,13 +38,13 @@ PlayListGroup::~PlayListGroup()
}
}
-const QString PlayListGroup::formattedTitle(int column)
+QString PlayListGroup::formattedTitle(int column)
{
Q_UNUSED(column);
return m_name;
}
-const QStringList PlayListGroup::formattedTitles()
+QStringList PlayListGroup::formattedTitles()
{
return QStringList() << m_name;
}
@@ -69,6 +69,11 @@ int PlayListGroup::count() const
return trackList.count();
}
+QString PlayListGroup::formattedLength()
+{
+ return QString();
+}
+
bool PlayListGroup::isGroup() const
{
return true;
diff --git a/src/qmmpui/playlistgroup.h b/src/qmmpui/playlistgroup.h
index d797403f6..fc72424fb 100644
--- a/src/qmmpui/playlistgroup.h
+++ b/src/qmmpui/playlistgroup.h
@@ -46,8 +46,8 @@ public:
* Returns formatted title of the group.
* @param column Number of column (unused).
*/
- const QString formattedTitle(int column = 0) override;
- const QStringList formattedTitles() override;
+ QString formattedTitle(int column = 0) override;
+ QStringList formattedTitles() override;
/*!
* Returns \b true if the group contains track \b track.
* Otherwise returns \b false.
@@ -69,7 +69,7 @@ public:
/*!
* Returns formatted length of the item.
*/
- const QString formattedLength() override { return QString(); }
+ QString formattedLength() override;
/*!
* Returns \b true.
*/
diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h
index 21403beed..3432702fd 100644
--- a/src/qmmpui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
@@ -52,16 +52,16 @@ public:
* Returns formatted title of the item.
* @param column Number of column.
*/
- virtual const QString formattedTitle(int column) = 0;
+ virtual QString formattedTitle(int column) = 0;
/*!
* Returns the list of the formatted titles for all columns.
* Group separators contain only one title.
*/
- virtual const QStringList formattedTitles() = 0;
+ virtual QStringList formattedTitles() = 0;
/*!
* Returns formatted length of the item.
*/
- virtual const QString formattedLength() = 0;
+ virtual QString formattedLength() = 0;
/*!
* Returns \b true if the \b PlayListItem is group separator. Otherwise returns \b false.
*/
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 34812adb1..85dc95f07 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -429,7 +429,7 @@ void PlayListManager::showDetails()
m_selected->showDetails();
}
-void PlayListManager::add(QList<PlayListTrack *> tracks)
+void PlayListManager::add(const QList<PlayListTrack *> &tracks)
{
m_selected->add(tracks);
}
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index be39f11be..1f7015eb7 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -206,7 +206,7 @@ public slots:
/*!
* This is a convenience function and is the same as calling \b selectedPlayList()->add(tracks)
*/
- void add(QList <PlayListTrack *> tracks);
+ void add(const QList<PlayListTrack *> &tracks);
/*!
* This is a convenience function and is the same as calling \b selectedPlayList()->add(path)
*/
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 4d3cb040d..4c14882c6 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -110,7 +110,7 @@ void PlayListModel::add(PlayListTrack *track)
emit listChanged(flags);
}
-void PlayListModel::add(QList<PlayListTrack *> tracks)
+void PlayListModel::add(const QList<PlayListTrack *> &tracks)
{
if(tracks.isEmpty())
return;
@@ -182,7 +182,7 @@ void PlayListModel::insert(PlayListItem *before, PlayListTrack *track)
add(track);
}
-void PlayListModel::insert(int index, QList<PlayListTrack *> tracks)
+void PlayListModel::insert(int index, const QList<PlayListTrack *> &tracks)
{
if(tracks.isEmpty())
return;
@@ -208,7 +208,7 @@ void PlayListModel::insert(int index, QList<PlayListTrack *> tracks)
emit listChanged(flags);
}
-void PlayListModel::insert(PlayListItem *before, QList<PlayListTrack *> tracks)
+void PlayListModel::insert(PlayListItem *before, const QList<PlayListTrack *> &tracks)
{
if(before)
insert(m_container->indexOf(before), tracks);
@@ -450,14 +450,14 @@ void PlayListModel::setSelected(int index, bool selected)
emit listChanged(SELECTION);
}
-void PlayListModel::setSelected(QList<PlayListTrack *> tracks, bool selected)
+void PlayListModel::setSelected(const QList<PlayListTrack *> &tracks, bool selected)
{
for(PlayListTrack *t : qAsConst(tracks))
t->setSelected(selected);
emit listChanged(SELECTION);
}
-void PlayListModel::setSelected(QList<PlayListItem *> items, bool selected)
+void PlayListModel::setSelected(const QList<PlayListItem *> &items, bool selected)
{
for(PlayListItem *i : qAsConst(items))
i->setSelected(selected);
@@ -481,7 +481,7 @@ void PlayListModel::setSelected(int first, int last, bool selected)
emit listChanged(SELECTION);
}
-void PlayListModel::setSelected(QList<int> indexes, bool selected)
+void PlayListModel::setSelected(const QList<int> &indexes, bool selected)
{
for(const int &idx : qAsConst(indexes))
m_container->setSelected(idx, selected);
@@ -852,7 +852,7 @@ int PlayListModel::queueSize() const
return m_queued_songs.size();
}
-bool PlayListModel::isStopAfter(PlayListItem* item) const
+bool PlayListModel::isStopAfter(const PlayListItem *item) const
{
return m_stop_track == item;
}
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 1178a433b..6936e8c9b 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -202,13 +202,13 @@ public:
* @param tracks List of tracks.
* @param selected Selection state (\b true - select, \b false - unselect)
*/
- void setSelected(QList<PlayListTrack *> tracks, bool selected = true);
+ void setSelected(const QList<PlayListTrack *> &tracks, bool selected = true);
/*!
* Sets the selected state of the list of items to \b select
* @param items List of items.
* @param selected Selection state (\b true - select, \b false - unselect)
*/
- void setSelected(QList<PlayListItem *> items, bool selected = true);
+ void setSelected(const QList<PlayListItem *> &items, bool selected = true);
/*!
* Sets the selected state of the list of items range.
* @param first Firts item in the range.
@@ -221,7 +221,7 @@ public:
* @param indexes List of item \b indexes.
* @param selected Selection state (\b true - select, \b false - unselect)
*/
- void setSelected(QList<int> indexes, bool selected = true);
+ void setSelected(const QList<int> &indexes, bool selected = true);
/*!
* Advances to the next item. Returns \b false if next iten doesn't exist,
* otherwise returns \b true
@@ -245,7 +245,7 @@ public:
/*!
* Returns \b true if \b f file is in play queue, otherwise returns \b false.
*/
- bool isQueued(PlayListTrack* item) const;
+ bool isQueued(PlayListTrack *item) const;
/*!
* Returns \b true if play queue is empty,otherwise returns - \b false.
*/
@@ -253,7 +253,7 @@ public:
/*!
* Returns index of \b f file in queue.e
*/
- int queuedIndex(PlayListTrack* track) const;
+ int queuedIndex(PlayListTrack *track) const;
/*!
* Returns the number of items in the queue
*/
@@ -261,7 +261,7 @@ public:
/*!
* Returns \b true if playback stops after \b item, otherwise returns \b false.
*/
- bool isStopAfter(PlayListItem* item) const;
+ bool isStopAfter(const PlayListItem* item) const;
/*!
* Returns current selection(playlist can contain a lot of selections,
* this method returns selection which \b row belongs to)
@@ -399,7 +399,7 @@ public slots:
* Adds a list of tracks to the playlist.
* @param tracks List of tracks.
*/
- void add(QList <PlayListTrack *> tracks);
+ void add(const QList<PlayListTrack *> &tracks);
/*!
* Adds a list of files and directories to the playlist
* @param path Full path of file or directory.
@@ -421,11 +421,11 @@ public slots:
/*!
* Inserts \b tracks at index position \b index in the playlist.
*/
- void insert(int index, QList <PlayListTrack *> tracks);
+ void insert(int index, const QList<PlayListTrack *> &tracks);
/*!
* Inserts \b tracks after item \b before in the playlist.
*/
- void insert(PlayListItem *before, QList <PlayListTrack *> tracks);
+ void insert(PlayListItem *before, const QList<PlayListTrack *> &tracks);
/*!
* Inserts file or directory at index position \b index in the playlist.
* @param path Full path of file or directory.
diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp
index f3bf49d50..4784553e2 100644
--- a/src/qmmpui/playlisttrack.cpp
+++ b/src/qmmpui/playlisttrack.cpp
@@ -105,7 +105,7 @@ void PlayListTrack::updateMetaData()
qDeleteAll(list);
}
-const QString PlayListTrack::groupName()
+const QString &PlayListTrack::groupName()
{
if(m_group.isEmpty() || m_groupFormat != m_settings->groupFormat())
{
@@ -155,7 +155,7 @@ bool PlayListTrack::isUsed() const
return (m_refCount != 0);
}
-const QString PlayListTrack::formattedTitle(int column)
+QString PlayListTrack::formattedTitle(int column)
{
if(m_formattedTitles.count() != m_helper->columnCount())
{
@@ -186,7 +186,7 @@ const QString PlayListTrack::formattedTitle(int column)
return m_formattedTitles[column];
}
-const QStringList PlayListTrack::formattedTitles()
+QStringList PlayListTrack::formattedTitles()
{
if(m_formattedTitles.count() != m_helper->columnCount())
{
@@ -217,7 +217,7 @@ const QStringList PlayListTrack::formattedTitles()
return m_formattedTitles;
}
-const QString PlayListTrack::formattedLength()
+QString PlayListTrack::formattedLength()
{
if(duration() > 0 && m_formattedLength.isEmpty())
m_formattedLength = MetaDataFormatter::formatDuration(duration());
diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h
index 2cb0655c1..7506bd216 100644
--- a/src/qmmpui/playlisttrack.h
+++ b/src/qmmpui/playlisttrack.h
@@ -61,15 +61,15 @@ public:
* Returns formatted title of the item.
* @param column Number of column.
*/
- const QString formattedTitle(int column) override;
+ QString formattedTitle(int column) override;
/*!
* Returns the list of the formatted titles for all columns.
*/
- const QStringList formattedTitles() override;
+ QStringList formattedTitles() override;
/*!
* Returns formatted length of the item.
*/
- const QString formattedLength() override;
+ QString formattedLength() override;
/*!
* Updates current metadata.
* @param info Track information.
@@ -82,7 +82,7 @@ public:
/*!
* Returns name of the parent group.
*/
- const QString groupName();
+ const QString &groupName();
/*!
* Returns \b false.
*/
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 14:20:04 +0000