aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/General/mpris/mpris1/tracklistobject.cpp4
-rw-r--r--src/qmmpui/playlistmodel.cpp4
-rw-r--r--src/qmmpui/playlistmodel.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index 28720b3a5..580e0d16e 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->indexOfTrack(m_model->count() - 1) + 1;
+ return m_model->trackCount();
}
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->indexOfTrack(m_model->count() - 1) + 1);
+ emit TrackListChange(m_model->trackCount());
}
void TrackListObject::switchPlayList(PlayListModel *cur, PlayListModel *prev)
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 304396516..e381b109f 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -436,9 +436,9 @@ int PlayListModel::indexOfTrack(int index) const
return m_container->indexOfTrack(index);
}
-PlayListTrack *PlayListModel::findTrack(int number) const
+PlayListTrack *PlayListModel::findTrack(int track_index) const
{
- return m_container->findTrack(number);
+ return m_container->findTrack(track_index);
}
void PlayListModel::setSelected(int index, bool selected)
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 32a844b53..08512c2a9 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -301,7 +301,7 @@ public:
*/
int indexOfTrack(int index) const;
- PlayListTrack *findTrack(int number) const;
+ PlayListTrack *findTrack(int track_index) const;
enum UpdateFlags