From 65d940484aafb8c8ebf92f9931684f3cfa6be6eb Mon Sep 17 00:00:00 2001 From: rakshasa Date: Mon, 8 Aug 2005 15:59:12 +0000 Subject: [PATCH] * Adding TrackerManager class that implements a simpler interface for tracker control. It will support different modes like f.ex trying to request more peers from the trackers. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@519 e378c898-3ddf-0310-93e7-cc216c733640 --- src/ui/download.cc | 4 ++-- src/utils/task_item.h | 3 ++- src/utils/task_scheduler.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ui/download.cc b/src/ui/download.cc index ca5fbfdd..7cd01bde 100644 --- a/src/ui/download.cc +++ b/src/ui/download.cc @@ -237,8 +237,8 @@ Download::bind_keys() { (*m_bindings)['5'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_max_peers), -5); (*m_bindings)['6'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_max_peers), 5); - (*m_bindings)['t'] = sigc::bind(sigc::bind(sigc::mem_fun(m_download->get_download(), &torrent::Download::set_tracker_timeout), false), 2 * 1000000); - (*m_bindings)['T'] = sigc::bind(sigc::bind(sigc::mem_fun(m_download->get_download(), &torrent::Download::set_tracker_timeout), true), 2 * 1000000); + (*m_bindings)['t'] = sigc::bind(sigc::mem_fun(m_download->get_download(), &torrent::Download::tracker_manual_request), false); + (*m_bindings)['T'] = sigc::bind(sigc::mem_fun(m_download->get_download(), &torrent::Download::tracker_manual_request), true); (*m_bindings)['p'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_INFO); (*m_bindings)['o'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_TRACKER_LIST); diff --git a/src/utils/task_item.h b/src/utils/task_item.h index b864e9ca..7b06ea70 100644 --- a/src/utils/task_item.h +++ b/src/utils/task_item.h @@ -57,9 +57,10 @@ public: void set_slot(Slot s) { m_slot = s; } iterator get_iterator() { return m_iterator; } + const iterator get_iterator() const { return m_iterator; } void set_iterator(iterator itr) { m_iterator = itr; } - const Timer& get_time() { return m_iterator->first; } + const Timer& get_time() const { return m_iterator->first; } private: TaskItem(const TaskItem& t); diff --git a/src/utils/task_scheduler.h b/src/utils/task_scheduler.h index c4ca5e8c..b829e587 100644 --- a/src/utils/task_scheduler.h +++ b/src/utils/task_scheduler.h @@ -63,9 +63,9 @@ public: void execute(Timer time); - bool is_scheduled(TaskItem* task) { return task->get_iterator() != end(); } + bool is_scheduled(const TaskItem* task) const { return task->get_iterator() != end(); } - Timer get_next_timeout() const { return begin()->first; } + Timer get_next_timeout() const { return begin()->first; } private: inline void execute_task(const value_type& v);