mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

* Advanced random mode keeps track of playback history and prevents songs from being played too often. This is a statistically correct random, not a natural random. This should also find a random track while huge amounts of a playlist are still about to be resolved.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-14 11:26:00 +01:00
parent 732c1d6848
commit 89b77b66d1
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
View File

@@ -103,20 +103,54 @@ PlayableProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
PlayableProxyModel* proxyModel = m_proxyModel.data();
while ( m_shuffleHistory.count() >= proxyModel->rowCount() )
{
m_shuffleHistory.removeFirst();
}
QModelIndex idx = proxyModel->index( 0, 0 );
if ( proxyModel->rowCount() )
{
if ( m_shuffled )
{
// random mode is enabled
// TODO come up with a clever random logic, that keeps track of previously played items
if ( m_shuffleCache.isValid() )
{
idx = m_shuffleCache;
}
else
{
int safetyCounter = 0;
PlayableItem* item = 0;
do
{
safetyCounter++;
idx = proxyModel->index( qrand() % proxyModel->rowCount(), 0 );
item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
}
while ( safetyCounter < proxyModel->rowCount() &&
( !item || !item->query()->playable() || m_shuffleHistory.contains( item->query() ) ) );
if ( item && item->query()->playable() )
{
if ( readOnly )
{
m_shuffleCache = idx;
tDebug( LOGVERBOSE ) << "Next shuffled PlaylistItem cached:" << item->query()->toString() << item->query()->results().at( 0 )->url()
<< "- after" << safetyCounter << "tries to find a track";
}
}
else
{
tDebug() << Q_FUNC_INFO << "Error finding next shuffled playable track";
}
}
}
else if ( proxyModel->currentIndex().isValid() )
{
// random mode is disabled
idx = proxyModel->currentIndex();
// random mode is disabled
if ( m_repeatMode != PlaylistModes::RepeatOne )
{
// keep progressing through the playlist normally
@@ -146,9 +180,14 @@ PlayableProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
if ( item && item->query()->playable() )
{
qDebug() << "Next PlaylistItem found:" << item->query()->toString() << item->query()->results().at( 0 )->url();
tDebug( LOGVERBOSE ) << "Next PlaylistItem found:" << item->query()->toString() << item->query()->results().at( 0 )->url();
if ( !readOnly )
{
proxyModel->setCurrentIndex( idx );
m_shuffleHistory << item->query();
m_shuffleCache = QPersistentModelIndex();
}
return item->query()->results().at( 0 );
}
@@ -172,6 +211,7 @@ PlayableProxyModelPlaylistInterface::currentItem() const
PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->currentIndex() ) );
if ( item && !item->query().isNull() && item->query()->playable() )
return item->query()->results().at( 0 );
return Tomahawk::result_ptr();
}

3
src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h
View File

@@ -59,8 +59,11 @@ public slots:
protected:
QWeakPointer< PlayableProxyModel > m_proxyModel;
PlaylistModes::RepeatMode m_repeatMode;
bool m_shuffled;
QList< Tomahawk::query_ptr > m_shuffleHistory;
QPersistentModelIndex m_shuffleCache;
};
} //ns