diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-07-01 19:11:19 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-07-01 19:11:19 +0000 |
| commit | 332e5b1d409332e73389b7fd6a76244dc65c118a (patch) | |
| tree | b82a7e1d0cd168f9ea4a86f5cefcc1806b74ba2f | |
| parent | a537e1ec3ad94fc1681563b9d937ef4b7e2c2be5 (diff) | |
| download | qmmp-332e5b1d409332e73389b7fd6a76244dc65c118a.tar.gz qmmp-332e5b1d409332e73389b7fd6a76244dc65c118a.tar.bz2 qmmp-332e5b1d409332e73389b7fd6a76244dc65c118a.zip | |
refactoring
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5201 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/General/mpris/mpris1/tracklistobject.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/playlistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/playlistmodel.h | 2 |
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 |