mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 16:14:40 +02:00
Code Issues Releases Wiki Activity

fix playlist generation and clean up dynamicqmlwidget a bit

Browse Source
This commit is contained in:
Michael Zanetti
2013-06-29 18:48:18 +02:00
parent 1252b6618d
commit b402347bee
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp
View File

@@ -26,8 +26,6 @@ namespace Tomahawk
DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* parent ) DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* parent )
: DeclarativeView( parent ) : DeclarativeView( parent )
, m_playlist( playlist ) , m_playlist( playlist )
, m_runningOnDemand( false )
, m_activePlaylist( false )
, m_playNextResolved( false ) , m_playNextResolved( false )
{ {
m_model = new DynamicModel( this ); m_model = new DynamicModel( this );
@@ -62,8 +60,12 @@ DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* pa
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), this, SLOT( trackStarted() ) ); connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), this, SLOT( trackStarted() ) );
connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ), this, SLOT( playlistChanged( Tomahawk::playlistinterface_ptr ) ) ); connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ), this, SLOT( playlistChanged( Tomahawk::playlistinterface_ptr ) ) );
// m_playlist->generator()->generate( 20 ); if (configured()) {
loadArtistCharts(); m_playlist->generator()->generate( 20 );
} else {
// TODO: only load if needed, i.e. the user clicks on start station by artist
loadArtistCharts();
}
} }
@@ -212,10 +214,7 @@ void DynamicQmlWidget::nextTrackGenerated(const query_ptr &track)
void DynamicQmlWidget::error(const QString &title, const QString &body) void DynamicQmlWidget::error(const QString &title, const QString &body)
{ {
qDebug() << "got a generator error:" << title << body; tDebug() << "got a generator error:" << title << body;
// m_playlist->generator()->fetchNext();
} }
void DynamicQmlWidget::onRevisionLoaded(DynamicPlaylistRevision) void DynamicQmlWidget::onRevisionLoaded(DynamicPlaylistRevision)
@@ -226,9 +225,9 @@ void DynamicQmlWidget::onRevisionLoaded(DynamicPlaylistRevision)
void DynamicQmlWidget::resolvingFinished(bool hasResults) void DynamicQmlWidget::resolvingFinished(bool hasResults)
{ {
Q_UNUSED(hasResults) Q_UNUSED(hasResults)
qDebug() << "next track generated" << m_proxyModel->rowCount() << m_proxyModel->currentIndex().row(); tDebug() << "next track generated" << m_proxyModel->rowCount() << m_proxyModel->currentIndex().row();
if( m_proxyModel->rowCount() <= m_proxyModel->currentIndex().row() + 8 ) { if( m_proxyModel->rowCount() <= m_proxyModel->currentIndex().row() + 8 ) {
qDebug() << "fetching next one"; tDebug() << "fetching next one";
m_playlist->generator()->fetchNext(); m_playlist->generator()->fetchNext();
} }
@@ -240,28 +239,14 @@ void DynamicQmlWidget::resolvingFinished(bool hasResults)
void DynamicQmlWidget::trackStarted() void DynamicQmlWidget::trackStarted()
{ {
if ( m_activePlaylist && !m_playlist.isNull() && startStation();
m_playlist->mode() == OnDemand && !m_runningOnDemand )
{
startStation();
}
} }
void void
DynamicQmlWidget::playlistChanged( Tomahawk::playlistinterface_ptr pl ) DynamicQmlWidget::playlistChanged( Tomahawk::playlistinterface_ptr pl )
{ {
if ( pl == m_proxyModel->playlistInterface() ) // same playlist if ( pl != m_proxyModel->playlistInterface() ) {
m_activePlaylist = true; stopStation( false );
else
{
m_activePlaylist = false;
// user started playing something somewhere else, so give it a rest
if ( m_runningOnDemand )
{
stopStation( false );
}
} }
} }
@@ -269,14 +254,11 @@ void
DynamicQmlWidget::stopStation( bool stopPlaying ) DynamicQmlWidget::stopStation( bool stopPlaying )
{ {
m_model->stopOnDemand( stopPlaying ); m_model->stopOnDemand( stopPlaying );
m_runningOnDemand = false;
} }
void void
DynamicQmlWidget::startStation() DynamicQmlWidget::startStation()
{ {
m_runningOnDemand = true;
m_model->startOnDemand(); m_model->startOnDemand();
} }

2
src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h
View File

@@ -102,8 +102,6 @@ private:
PlayableModel* m_artistChartsModel; PlayableModel* m_artistChartsModel;
bool m_runningOnDemand;
bool m_activePlaylist;
bool m_playNextResolved; bool m_playNextResolved;
}; };