aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp2
-rw-r--r--src/plugins/General/mpris/mpris1/tracklistobject.cpp4
-rw-r--r--src/plugins/Ui/skinned/listwidget.cpp2
-rw-r--r--src/plugins/Ui/skinned/playlisttitlebar.cpp2
-rw-r--r--src/qmmpui/columneditor.cpp2
-rw-r--r--src/qmmpui/groupedcontainer.cpp8
-rw-r--r--src/qmmpui/groupedcontainer_p.h2
-rw-r--r--src/qmmpui/metadataformatter.cpp3
-rw-r--r--src/qmmpui/metadataformatter.h2
-rw-r--r--src/qmmpui/normalcontainer.cpp12
-rw-r--r--src/qmmpui/normalcontainer_p.h2
-rw-r--r--src/qmmpui/playlistcontainer.cpp6
-rw-r--r--src/qmmpui/playlistcontainer_p.h2
-rw-r--r--src/qmmpui/playlistitem.cpp10
-rw-r--r--src/qmmpui/playlistitem.h6
-rw-r--r--src/qmmpui/playlistmanager.cpp2
-rw-r--r--src/qmmpui/playlistmodel.cpp4
-rw-r--r--src/qmmpui/playlistmodel.h6
18 files changed, 41 insertions, 36 deletions
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 67c4d1014..416a1007c 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.format(track));
+ out += QString("%1. %2").arg(model->indexOfTrack(i) + 1).arg(formatter.format(track));
if(i == model->currentIndex())
out += " [*]";
out += "\n";
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index a7dd70aa9..28720b3a5 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -74,7 +74,7 @@ int TrackListObject::GetCurrentTrack()
int TrackListObject::GetLength()
{
- return m_model->numberOfTrack(m_model->count() - 1) + 1;
+ return m_model->indexOfTrack(m_model->count() - 1) + 1;
}
QVariantMap TrackListObject::GetMetadata(int in0)
@@ -122,7 +122,7 @@ void TrackListObject::playTrack(PlayListTrack *track)
void TrackListObject::updateTrackList(int flags)
{
if(flags & PlayListModel::STRUCTURE)
- emit TrackListChange(m_model->numberOfTrack(m_model->count() - 1) + 1);
+ emit TrackListChange(m_model->indexOfTrack(m_model->count() - 1) + 1);
}
void TrackListObject::switchPlayList(PlayListModel *cur, PlayListModel *prev)
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index c0ac85ee2..c634ee53a 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -373,7 +373,7 @@ void ListWidget::updateList(int flags)
//optimization: reduces number of PlaListModel::numberOfTrack(int) calls
if(!prev_number)
{
- row->number = m_model->numberOfTrack(m_first+i) + 1;
+ row->number = m_model->indexOfTrack(m_first+i) + 1;
prev_number = row->number;
}
else
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index a11905d83..d8fb2c02c 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -268,7 +268,7 @@ void PlayListTitleBar::showCurrent()
PlayListTrack* track = m_model->currentTrack();
if (track)
{
- m_text = QString("%1. %2").arg(m_model->numberOfTrack(m_model->currentIndex())+1)
+ m_text = QString("%1. %2").arg(m_model->indexOfTrack(m_model->currentIndex())+1)
.arg(m_formatter.format(track));
}
else
diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp
index 3808ef69b..ecb131dcf 100644
--- a/src/qmmpui/columneditor.cpp
+++ b/src/qmmpui/columneditor.cpp
@@ -89,6 +89,7 @@ void ColumnEditor::createMenu()
menu->addAction(tr("File Name"))->setData("%f");
menu->addAction(tr("File Path"))->setData("%F");
menu->addAction(tr("Year"))->setData("%y");
+ menu->addAction(tr("Track Index"))->setData("%I");
menu->addAction(tr("Condition"))->setData("%if(%p,%p - %t,%t)");
m_ui->formatButton->setMenu(menu);
connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
@@ -111,6 +112,7 @@ void ColumnEditor::fillTypes()
m_ui->comboBox->addItem(tr("Disc Number"),"%D");
m_ui->comboBox->addItem(tr("File Name"),"%f");
m_ui->comboBox->addItem(tr("File Path"),"%F");
+ m_ui->comboBox->addItem(tr("Track Index"), "%I");
m_ui->comboBox->addItem(tr("Year"),"%y");
m_ui->comboBox->addItem(tr("Custom"),"custom");
}
diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp
index 4ffaa9e71..2d3cb5fe5 100644
--- a/src/qmmpui/groupedcontainer.cpp
+++ b/src/qmmpui/groupedcontainer.cpp
@@ -60,7 +60,7 @@ void GroupedContainer::addTrack(PlayListTrack *track)
m_groups.append(group);
m_items.append(group);
m_items.append(track);
- track->setTrackNumber(trackCount() - 1);
+ track->setTrackIndex(trackCount() - 1);
}
void GroupedContainer::addTracks(QList<PlayListTrack *> tracks)
@@ -236,7 +236,7 @@ bool GroupedContainer::contains(PlayListItem *item) const
return m_items.contains(item);
}
-int GroupedContainer::numberOfTrack(int index) const
+int GroupedContainer::indexOfTrack(int index) const
{
updateCache();
if(index >= count() || index < 0)
@@ -244,7 +244,7 @@ int GroupedContainer::numberOfTrack(int index) const
qWarning("GroupedContainer: index is out of range");
return -1;
}
- return m_items.at(index)->trackNumber();
+ return m_items.at(index)->trackIndex();
}
PlayListTrack *GroupedContainer::findTrack(int number) const
@@ -423,7 +423,7 @@ void GroupedContainer::updateCache() const
m_items.append(m_groups.at(i));
foreach (PlayListTrack *track, m_groups.at(i)->trackList)
{
- track->setTrackNumber(t++);
+ track->setTrackIndex(t++);
m_items.append(track);
}
}
diff --git a/src/qmmpui/groupedcontainer_p.h b/src/qmmpui/groupedcontainer_p.h
index 373311d9d..1274b3cc5 100644
--- a/src/qmmpui/groupedcontainer_p.h
+++ b/src/qmmpui/groupedcontainer_p.h
@@ -53,7 +53,7 @@ public:
PlayListTrack *track(int index) const;
PlayListGroup *group(int index) const;
bool contains(PlayListItem *item) const;
- int numberOfTrack(int index) const;
+ int indexOfTrack(int index) const;
PlayListTrack *findTrack(int number) const;
void removeTrack(PlayListTrack *track);
void removeTracks(QList<PlayListTrack *> tracks);
diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp
index 16e4336bc..65562127a 100644
--- a/src/qmmpui/metadataformatter.cpp
+++ b/src/qmmpui/metadataformatter.cpp
@@ -36,6 +36,7 @@ Syntax:
%F - full path,
%y - year,
%l - duration,
+%I - track index,
%if(A,B,C) or %if(A&B&C,D,E) - condition.
*/
@@ -90,7 +91,7 @@ const QString MetaDataFormatter::pattern() const
QString MetaDataFormatter::format(const PlayListTrack *item) const
{
- return format(*item, item->length(), item->trackNumber());
+ return format(*item, item->length(), item->trackIndex());
}
QString MetaDataFormatter::format(const QMap<Qmmp::MetaData, QString> &metaData, qint64 length, int track) const
diff --git a/src/qmmpui/metadataformatter.h b/src/qmmpui/metadataformatter.h
index 1a270fba6..2ea6ce045 100644
--- a/src/qmmpui/metadataformatter.h
+++ b/src/qmmpui/metadataformatter.h
@@ -51,6 +51,7 @@ public:
* %F - full path,
* %y - year,
* %l - duration,
+ * %I - track index,
* %if(A,B,C) or %if(A&B&C,D,E) - condition.
*/
MetaDataFormatter(const QString &pattern = QString());
@@ -67,6 +68,7 @@ public:
* Converts metadata to one string using template.
* @param metaData Metadata array.
* @param length Length in seconds.
+ * @param track Index of track.
*/
QString format(const QMap<Qmmp::MetaData, QString> &metaData, qint64 length = 0, int track = 0) const;
/*!
diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp
index 36e13fd46..104ea1517 100644
--- a/src/qmmpui/normalcontainer.cpp
+++ b/src/qmmpui/normalcontainer.cpp
@@ -33,7 +33,7 @@ void NormalContainer::addTracks(QList<PlayListTrack *> tracks)
foreach (PlayListTrack *track, tracks)
{
m_items.append(track);
- track->setTrackNumber(m_items.count() - 1);
+ track->setTrackIndex(m_items.count() - 1);
}
}
@@ -42,12 +42,12 @@ void NormalContainer::insertTrack(int index, PlayListTrack *track)
if(index >= 0 && index < m_items.count())
{
m_items.insert(index, track);
- track->setTrackNumber(index);
+ track->setTrackIndex(index);
}
else
{
m_items.append(track);
- track->setTrackNumber(m_items.count() - 1);
+ track->setTrackIndex(m_items.count() - 1);
}
}
@@ -148,7 +148,7 @@ bool NormalContainer::contains(PlayListItem *item) const
return m_items.contains(item);
}
-int NormalContainer::numberOfTrack(int index) const
+int NormalContainer::indexOfTrack(int index) const
{
return index;
}
@@ -173,7 +173,7 @@ void NormalContainer::removeTracks(QList<PlayListTrack *> tracks)
m_items.removeAll(t);
for(int i = 0; i < m_items.count(); ++i)
- m_items[i]->setTrackNumber(i);
+ m_items[i]->setTrackIndex(i);
}
bool NormalContainer::move(QList<int> indexes, int from, int to)
@@ -237,5 +237,5 @@ void NormalContainer::randomizeList()
m_items.swap(qrand()%m_items.size(), qrand()%m_items.size());
for(int i = 0; i < m_items.count(); ++i)
- m_items[i]->setTrackNumber(i);
+ m_items[i]->setTrackIndex(i);
}
diff --git a/src/qmmpui/normalcontainer_p.h b/src/qmmpui/normalcontainer_p.h
index 803b8ada0..a8a40b03a 100644
--- a/src/qmmpui/normalcontainer_p.h
+++ b/src/qmmpui/normalcontainer_p.h
@@ -52,7 +52,7 @@ public:
PlayListTrack *track(int index) const;
PlayListGroup *group(int index) const;
bool contains(PlayListItem *item) const;
- int numberOfTrack(int index) const;
+ int indexOfTrack(int index) const;
PlayListTrack *findTrack(int number) const;
void removeTrack(PlayListTrack *track);
void removeTracks(QList<PlayListTrack *> tracks);
diff --git a/src/qmmpui/playlistcontainer.cpp b/src/qmmpui/playlistcontainer.cpp
index d57310f1a..90455789a 100644
--- a/src/qmmpui/playlistcontainer.cpp
+++ b/src/qmmpui/playlistcontainer.cpp
@@ -31,7 +31,7 @@ void PlayListContainer::addTrack(PlayListTrack *track)
void PlayListContainer::swapTrackNumbers(QList<PlayListItem *> *container, int index1, int index2)
{
- int number = container->at(index1)->trackNumber();
- container->at(index1)->setTrackNumber(container->at(index2)->trackNumber());
- container->at(index2)->setTrackNumber(number);
+ int number = container->at(index1)->trackIndex();
+ container->at(index1)->setTrackIndex(container->at(index2)->trackIndex());
+ container->at(index2)->setTrackIndex(number);
}
diff --git a/src/qmmpui/playlistcontainer_p.h b/src/qmmpui/playlistcontainer_p.h
index 5cdc281e7..c0586c601 100644
--- a/src/qmmpui/playlistcontainer_p.h
+++ b/src/qmmpui/playlistcontainer_p.h
@@ -57,7 +57,7 @@ public:
virtual PlayListTrack *track(int index) const = 0;
virtual PlayListGroup *group(int index) const = 0;
virtual bool contains(PlayListItem *item) const = 0;
- virtual int numberOfTrack(int index) const = 0;
+ virtual int indexOfTrack(int index) const = 0;
virtual PlayListTrack *findTrack(int number) const = 0;
virtual void removeTrack(PlayListTrack *track) = 0;
virtual void removeTracks(QList<PlayListTrack *> tracks) = 0;
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 5f339080d..101b8a497 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -24,7 +24,7 @@
PlayListItem::PlayListItem()
{
- m_number = -1;
+ m_track_index = -1;
m_selected = false;
}
@@ -41,14 +41,14 @@ bool PlayListItem::isSelected() const
return m_selected;
}
-void PlayListItem::setTrackNumber(int number)
+void PlayListItem::setTrackIndex(int number)
{
- m_number = number;
+ m_track_index = number;
}
-int PlayListItem::trackNumber() const
+int PlayListItem::trackIndex() const
{
- return m_number;
+ return m_track_index;
}
diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h
index 33bbd5464..cfe9ca1f3 100644
--- a/src/qmmpui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
@@ -64,13 +64,13 @@ public:
*/
virtual bool isGroup() const = 0;
- void setTrackNumber(int number);
+ void setTrackIndex(int number);
- int trackNumber() const;
+ int trackIndex() const;
private:
bool m_selected;
- int m_number;
+ int m_track_index;
};
#endif
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 8a2395470..151b0dabd 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -340,7 +340,7 @@ void PlayListManager::writePlayLists()
{
QList<PlayListItem *> items = model->items();
tmpFile.write(QString("playlist=%1\n").arg(model->name()).toUtf8());
- tmpFile.write(QString("current=%1\n").arg(model->numberOfTrack(model->currentIndex())).toUtf8());
+ tmpFile.write(QString("current=%1\n").arg(model->indexOfTrack(model->currentIndex())).toUtf8());
foreach(PlayListItem* m, items)
{
if(m->isGroup())
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 7659eefba..304396516 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -431,9 +431,9 @@ bool PlayListModel::contains(const QString &url)
return false;
}
-int PlayListModel::numberOfTrack(int index) const
+int PlayListModel::indexOfTrack(int index) const
{
- return m_container->numberOfTrack(index);
+ return m_container->indexOfTrack(index);
}
PlayListTrack *PlayListModel::findTrack(int number) const
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 37cd0ef76..32a844b53 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -296,10 +296,10 @@ public:
GROUP /*!< by group name */
};
/*!
- * Returns number of track with index \b index.
- * Returns \b -1 if track with index \b index does not exist.
+ * Converts item index \b index to track index
+ * Returns \b -1 if item with index \b index is not a track or does not exist.
*/
- int numberOfTrack(int index) const;
+ int indexOfTrack(int index) const;
PlayListTrack *findTrack(int number) const;
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 12:55:02 +0000