premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2015-01-26 02:07:03 +00:00
parent 097d5b484d
commit d92d53f27a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/python/src/torrent_handle.cpp
View File

@ -265,8 +265,6 @@ list trackers(torrent_handle& h)
list get_download_queue(torrent_handle& handle) list get_download_queue(torrent_handle& handle)
{ {
using boost::python::make_tuple;
list ret; list ret;
std::vector<partial_piece_info> downloading; std::vector<partial_piece_info> downloading;
@ -291,7 +289,8 @@ list get_download_queue(torrent_handle& handle)
block_info["bytes_progress"] = i->blocks[k].bytes_progress; block_info["bytes_progress"] = i->blocks[k].bytes_progress;
block_info["block_size"] = i->blocks[k].block_size; block_info["block_size"] = i->blocks[k].block_size;
block_info["peer"] = boost::python::make_tuple( block_info["peer"] = boost::python::make_tuple(
boost::lexical_cast<std::string>(i->blocks[k].peer().address()), i->blocks[k].peer().port()); i->blocks[k].peer().address().to_string()
, i->blocks[k].peer().port());
block_list.append(block_info); block_list.append(block_info);
} }
partial_piece["blocks"] = block_list; partial_piece["blocks"] = block_list;

2
src/socket_type.cpp
View File

@ -148,7 +148,7 @@ namespace libtorrent
s.get<ssl_stream<t> >()->async_shutdown(boost::bind(&on_close_socket, &s, holder)); \ s.get<ssl_stream<t> >()->async_shutdown(boost::bind(&on_close_socket, &s, holder)); \
break; break;
switch(s.type()) switch (s.type())
{ {
CASE(stream_socket) CASE(stream_socket)
CASE(socks5_stream) CASE(socks5_stream)