fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-15 06:32:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use TR1 slots instead of sigc++ for DownloadInfo events.

Browse Source
This commit is contained in:
rakshasa
2012-04-07 03:37:37 +09:00
parent 5bed4f01ad
commit 36f8e5d349
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_download.cc
+2 -2
View File
@@ -285,8 +285,8 @@ retrieve_d_bitfield(core::Download* download) {
// Just a helper function atm.
torrent::Object
cmd_d_initialize_logs(core::Download* download) {
download->info()->signal_network_log().connect(sigc::mem_fun(control->core(), &core::Manager::push_log_complete));
download->info()->signal_storage_error().connect(sigc::mem_fun(control->core(), &core::Manager::push_log_complete));
download->info()->signal_network_log().push_back(tr1::bind(&core::Manager::push_log_complete, control->core(), tr1::placeholders::_1));
download->info()->signal_storage_error().push_back(tr1::bind(&core::Manager::push_log_complete, control->core(), tr1::placeholders::_1));
return torrent::Object();
}
src/core/download.cc
+4 -9
View File
@@ -65,21 +65,16 @@ Download::Download(download_type d) :
m_resumeFlags(~uint32_t()),
m_group(0) {
m_connTrackerSucceeded = m_download.info()->signal_tracker_success().connect(sigc::bind(sigc::mem_fun(*this, &Download::receive_tracker_msg), ""));
m_connTrackerFailed = m_download.info()->signal_tracker_failed().connect(sigc::mem_fun(*this, &Download::receive_tracker_msg));
m_connStorageError = m_download.info()->signal_storage_error().connect(sigc::mem_fun(*this, &Download::receive_storage_error));
m_download.info()->signal_chunk_failed().connect(sigc::mem_fun(*this, &Download::receive_chunk_failed));
m_download.info()->signal_tracker_success().push_back(tr1::bind(&Download::receive_tracker_msg, this, ""));
m_download.info()->signal_tracker_failed().push_back(tr1::bind(&Download::receive_tracker_msg, this, tr1::placeholders::_1));
m_download.info()->signal_storage_error().push_back(tr1::bind(&Download::receive_storage_error, this, tr1::placeholders::_1));
m_download.info()->signal_chunk_failed().push_back(tr1::bind(&Download::receive_chunk_failed, this, tr1::placeholders::_1));
}
Download::~Download() {
if (!m_download.is_valid())
return;
m_connTrackerSucceeded.disconnect();
m_connTrackerFailed.disconnect();
m_connStorageError.disconnect();
m_download = download_type();
}
src/core/download.h
-4
View File
@@ -155,10 +155,6 @@ private:
uint32_t m_resumeFlags;
sigc::connection m_connTrackerSucceeded;
sigc::connection m_connTrackerFailed;
sigc::connection m_connStorageError;
unsigned int m_group;
};