diff options
Diffstat (limited to 'src/plugins')
4 files changed, 5 insertions, 5 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 |