mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

* The mutex isn't needed.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-05 09:34:41 +02:00
parent a6be13b80c
commit 6748d37a8b
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/widgets/NetworkActivityWidget.cpp
View File

@@ -116,42 +116,39 @@ NetworkActivityWidget::fetchData()
void void
NetworkActivityWidget::weeklyCharts( const QList<Tomahawk::track_ptr>& tracks ) NetworkActivityWidget::weeklyCharts( const QList<Tomahawk::track_ptr>& tracks )
{ {
QSharedPointer<QMutexLocker> locker = QSharedPointer<QMutexLocker>( new QMutexLocker( &m_retrieveMutex ) );
m_weeklyChartsModel = new PlaylistModel( ui->tracksViewLeft ); m_weeklyChartsModel = new PlaylistModel( ui->tracksViewLeft );
m_weeklyChartsModel->startLoading(); m_weeklyChartsModel->startLoading();
// Pipeline::instance()->resolve( tracks ); // Pipeline::instance()->resolve( tracks );
m_weeklyChartsModel->appendTracks( tracks ); m_weeklyChartsModel->appendTracks( tracks );
m_weeklyChartsModel->finishLoading(); m_weeklyChartsModel->finishLoading();
checkDone( locker ); checkDone();
} }
void void
NetworkActivityWidget::monthlyCharts( const QList<Tomahawk::track_ptr>& tracks ) NetworkActivityWidget::monthlyCharts( const QList<Tomahawk::track_ptr>& tracks )
{ {
QSharedPointer<QMutexLocker> locker = QSharedPointer<QMutexLocker>( new QMutexLocker( &m_retrieveMutex ) );
m_monthlyChartsModel = new PlaylistModel( ui->tracksViewLeft ); m_monthlyChartsModel = new PlaylistModel( ui->tracksViewLeft );
m_monthlyChartsModel->startLoading(); m_monthlyChartsModel->startLoading();
// Pipeline::instance()->resolve( tracks ); // Pipeline::instance()->resolve( tracks );
m_monthlyChartsModel->appendTracks( tracks ); m_monthlyChartsModel->appendTracks( tracks );
m_monthlyChartsModel->finishLoading(); m_monthlyChartsModel->finishLoading();
checkDone( locker ); checkDone();
} }
void void
NetworkActivityWidget::yearlyCharts( const QList<Tomahawk::track_ptr>& tracks ) NetworkActivityWidget::yearlyCharts( const QList<Tomahawk::track_ptr>& tracks )
{ {
QSharedPointer<QMutexLocker> locker = QSharedPointer<QMutexLocker>( new QMutexLocker( &m_retrieveMutex ) );
m_yearlyChartsModel = new PlaylistModel( ui->tracksViewLeft ); m_yearlyChartsModel = new PlaylistModel( ui->tracksViewLeft );
m_yearlyChartsModel->startLoading(); m_yearlyChartsModel->startLoading();
// Pipeline::instance()->resolve( tracks ); // Pipeline::instance()->resolve( tracks );
m_yearlyChartsModel->appendTracks( tracks ); m_yearlyChartsModel->appendTracks( tracks );
m_yearlyChartsModel->finishLoading(); m_yearlyChartsModel->finishLoading();
checkDone( locker ); checkDone();
} }
@@ -215,7 +212,7 @@ NetworkActivityWidget::actualFetchData()
void void
NetworkActivityWidget::checkDone( QSharedPointer<QMutexLocker> ) NetworkActivityWidget::checkDone()
{ {
if ( !m_weeklyChartsModel.isNull() && !m_yearlyChartsModel.isNull() && !m_monthlyChartsModel.isNull() ) if ( !m_weeklyChartsModel.isNull() && !m_yearlyChartsModel.isNull() && !m_monthlyChartsModel.isNull() )
{ {

4
src/libtomahawk/widgets/NetworkActivityWidget.h
View File

@@ -61,9 +61,7 @@ private slots:
private: private:
void actualFetchData(); void actualFetchData();
void checkDone( QSharedPointer<QMutexLocker> ); void checkDone();
QMutex m_retrieveMutex;
QSharedPointer<Ui::NetworkActivityWidget> ui; QSharedPointer<Ui::NetworkActivityWidget> ui;
Tomahawk::playlistinterface_ptr m_playlistInterface; Tomahawk::playlistinterface_ptr m_playlistInterface;