fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-14 05:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xirvik

Browse Source
This commit is contained in:
rakshasa
2012-04-12 15:30:12 +09:00
parent 05d16707d4 d2dd143d2e
commit 0b39455a4b
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -1,6 +1,6 @@
AC_INIT(rtorrent, 0.8.9, jaris@ifi.uio.no) AC_INIT(rtorrent, 0.8.9, jaris@ifi.uio.no)
AC_DEFINE(API_VERSION, 4, api version) AC_DEFINE(API_VERSION, 5, api version)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
rak/error_number.h
+1
View File
@@ -51,6 +51,7 @@ public:
static const int e_deadlk = EDEADLK; static const int e_deadlk = EDEADLK;
static const int e_noent = ENOENT; static const int e_noent = ENOENT;
static const int e_nodev = ENODEV;
static const int e_nomem = ENOMEM; static const int e_nomem = ENOMEM;
static const int e_notdir = ENOTDIR; static const int e_notdir = ENOTDIR;
static const int e_isdir = EISDIR; static const int e_isdir = EISDIR;
src/command_throttle.cc
+9
View File
@@ -162,6 +162,13 @@ apply_address_throttle(const torrent::Object::list_type& args) {
return torrent::Object(); return torrent::Object();
} }
torrent::Object
throttle_update() {
control->ui()->adjust_up_throttle(0);
control->ui()->adjust_down_throttle(0);
return torrent::Object();
}
void void
initialize_command_throttle() { initialize_command_throttle() {
CMD2_ANY ("throttle.unchoked_uploads", tr1::bind(&torrent::ResourceManager::currently_upload_unchoked, torrent::resource_manager())); CMD2_ANY ("throttle.unchoked_uploads", tr1::bind(&torrent::ResourceManager::currently_upload_unchoked, torrent::resource_manager()));
@@ -182,6 +189,8 @@ initialize_command_throttle() {
CMD2_VAR_VALUE ("throttle.max_downloads.div", 1); CMD2_VAR_VALUE ("throttle.max_downloads.div", 1);
CMD2_VAR_VALUE ("throttle.max_downloads.global", 0); CMD2_VAR_VALUE ("throttle.max_downloads.global", 0);
CMD2_ANY ("throttle.update", tr1::bind(&throttle_update));
// TODO: Move the logic into some libtorrent function. // TODO: Move the logic into some libtorrent function.
CMD2_ANY ("throttle.global_up.rate", tr1::bind(&torrent::Rate::rate, torrent::up_rate())); CMD2_ANY ("throttle.global_up.rate", tr1::bind(&torrent::Rate::rate, torrent::up_rate()));
CMD2_ANY ("throttle.global_up.total", tr1::bind(&torrent::Rate::total, torrent::up_rate())); CMD2_ANY ("throttle.global_up.total", tr1::bind(&torrent::Rate::total, torrent::up_rate()));
src/core/download.cc
+1 -3
View File
@@ -36,9 +36,7 @@
#include "config.h" #include "config.h"
#include <sigc++/adaptors/bind.h> #include <list>
#include <sigc++/adaptors/hide.h>
#include <sigc++/signal.h>
#include <rak/file_stat.h> #include <rak/file_stat.h>
#include <rak/functional.h> #include <rak/functional.h>
#include <rak/path.h> #include <rak/path.h>
src/core/download.h
-1
View File
@@ -37,7 +37,6 @@
#ifndef RTORRENT_CORE_DOWNLOAD_H #ifndef RTORRENT_CORE_DOWNLOAD_H
#define RTORRENT_CORE_DOWNLOAD_H #define RTORRENT_CORE_DOWNLOAD_H
#include <sigc++/connection.h>
#include <torrent/download.h> #include <torrent/download.h>
#include <torrent/download_info.h> #include <torrent/download_info.h>
#include <torrent/hash_string.h> #include <torrent/hash_string.h>