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

Clean up DownloadManager and add jobFinished() signal.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-18 06:01:59 +02:00
parent 592b1bc3c1
commit 84d36f45a2
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/DownloadManager.cpp
View File

@@ -162,8 +162,8 @@ DownloadManager::addJob( const downloadjob_ptr& job )
connect( job.data(), SIGNAL( finished() ), SLOT( onJobFinished() ) ); connect( job.data(), SIGNAL( finished() ), SLOT( onJobFinished() ) );
connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) ); connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) );
connect( job.data(), SIGNAL( finished() ), SIGNAL( jobFinished() ) );
connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SLOT( checkJobs() ) ) ; connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SLOT( checkJobs() ) ) ;
// connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ) );
checkJobs(); checkJobs();
return true; return true;
@@ -242,10 +242,6 @@ DownloadManager::checkJobs()
if ( state() == DownloadManager::Waiting && !currentJob().isNull() ) if ( state() == DownloadManager::Waiting && !currentJob().isNull() )
{ {
downloadjob_ptr job = currentJob(); downloadjob_ptr job = currentJob();
/* connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) );
connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SLOT( checkJobs() ) ) ;
connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SIGNAL( stateChanged( Track::TrackState, Track::TrackState ) ) );*/
job->download(); job->download();
} }
} }

3
src/libtomahawk/DownloadManager.h
View File

@@ -59,8 +59,7 @@ public slots:
signals: signals:
void jobAdded( const downloadjob_ptr& job ); void jobAdded( const downloadjob_ptr& job );
void jobRemoved( const downloadjob_ptr& job ); void jobRemoved( const downloadjob_ptr& job );
void jobFinished();
void stateChanged( DownloadManagerState newState, DownloadManagerState oldState );
private slots: private slots:
void onJobFinished(); void onJobFinished();