* Cleanup of the API, got rid of "get_" prefix for alot of the calls.

* Tweaked the http get timeout, now it has a 60 second connect timeout
and a 360 second download timeout.

* Moved libtorrent/src/parse/download_constructor to src/download.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@595 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-11-12 15:31:12 +00:00
parent 3db8179274
commit a97408328a
22 changed files with 142 additions and 138 deletions
+14 -14
View File
@@ -64,34 +64,34 @@ WindowStatusbar::redraw() {
int pos = 0;
char buf[128];
if (torrent::get_up_throttle() == 0)
if (torrent::up_throttle() == 0)
pos = snprintf(buf, 128, "off/");
else
pos = snprintf(buf, 128, "%3i/", torrent::get_up_throttle() / 1024);
pos = snprintf(buf, 128, "%3i/", torrent::up_throttle() / 1024);
if (torrent::get_down_throttle() == 0)
if (torrent::down_throttle() == 0)
pos = snprintf(buf + pos, 128 - pos, "off");
else
pos = snprintf(buf + pos, 128 - pos, "%-3i", torrent::get_down_throttle() / 1024);
pos = snprintf(buf + pos, 128 - pos, "%-3i", torrent::down_throttle() / 1024);
m_canvas->print(0, 0, "Throttle U/D: %s Rate: %5.1f / %5.1f KB Listen: %s:%i%s",
buf,
(double)torrent::get_up_rate().rate() / 1024.0,
(double)torrent::get_down_rate().rate() / 1024.0,
!torrent::get_local_address().empty() ? torrent::get_local_address().c_str() : "<default>",
(int)torrent::get_listen_port(),
!torrent::get_bind_address().empty() ? (" Bind: " + torrent::get_bind_address()).c_str() : "");
(double)torrent::up_rate().rate() / 1024.0,
(double)torrent::down_rate().rate() / 1024.0,
!torrent::local_address().empty() ? torrent::local_address().c_str() : "<default>",
(int)torrent::listen_port(),
!torrent::bind_address().empty() ? (" Bind: " + torrent::bind_address()).c_str() : "");
// pos = snprintf(buf, 128, "[U %i/%i][S %i/%i/%i][F %i/%i]",
pos = snprintf(buf, 128, "%i [U %i/%i][S %i/%i/%i][F %i/%i]",
countTicks,
torrent::currently_unchoked(),
torrent::max_unchoked(),
torrent::get_total_handshakes(),
torrent::get_open_sockets(),
torrent::get_max_open_sockets(),
torrent::get_open_files(),
torrent::get_max_open_files());
torrent::total_handshakes(),
torrent::open_sockets(),
torrent::max_open_sockets(),
torrent::open_files(),
torrent::max_open_files());
countTicks = 0;