From 74ebeae36e6e1bcd6b65e44ef156c63bb3cb5eaf Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 20 Jan 2011 12:52:50 +0000 Subject: [PATCH] In current trunk m_currentMetadata is a pointer to the object in all_music, so this code was causing playcount to be incremented twice. I've commented out the code for now since it may need to be revisited. --- .../mythmusic/mythmusic/musicplayer.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp index c22313e7c52..da146d660e3 100644 --- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp +++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp @@ -502,7 +502,7 @@ void MusicPlayer::customEvent(QEvent *event) if (list.size() >= 3) { int volume = list[3].toInt(); - if (volume >= 0 && volume <= 100) + if (volume >= 0 && volume <= 100) setVolume(volume); } } @@ -929,16 +929,16 @@ void MusicPlayer::updateLastplay() sendMetadataChangedEvent(m_currentMetadata->ID()); } // if all_music is still in scope we need to keep that in sync - if (gMusicData->all_music) - { - Metadata *mdata - = gMusicData->all_music->getMetadata(m_currentNode->getInt()); - if (mdata) - { - mdata->incPlayCount(); - mdata->setLastPlay(); - } - } +// if (gMusicData->all_music) +// { +// Metadata *mdata +// = gMusicData->all_music->getMetadata(m_currentNode->getInt()); +// if (mdata) +// { +// mdata->incPlayCount(); +// mdata->setLastPlay(); +// } +// } } m_updatedLastplay = true;