wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fixed python binding build

This commit is contained in:
Arvid Norberg 2010-03-06 17:50:19 +00:00
parent b72910458d
commit ae8e86e74a
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bindings/python/src/session.cpp
View File

@ -160,22 +160,30 @@ namespace
} }
#endif #endif
entry save_state(session const& s) entry save_state(session const& s, boost::uint32_t flags)
{ {
entry e; entry e;
s.save_state(e); s.save_state(e, flags);
return e; return e;
} }
void load_state(session& s, entry const& e)
{
s.load_state(e);
}
} // namespace unnamed } // namespace unnamed
void bind_session() void bind_session()
{ {
#ifndef TORRENT_DISABLE_DHT
void (session::*start_dht0)() = &session::start_dht;
#ifndef TORRENT_NO_DEPRECATE
void (session::*start_dht1)(entry const&) = &session::start_dht;
#endif
#endif
void (session::*load_state0)(lazy_entry const&) = &session::load_state;
#ifndef TORRENT_NO_DEPRECATE
void (session::*load_state1)(entry const&) = &session::load_state;
#endif
class_<session_status>("session_status") class_<session_status>("session_status")
.def_readonly("has_incoming_connections", &session_status::has_incoming_connections) .def_readonly("has_incoming_connections", &session_status::has_incoming_connections)
@ -283,9 +291,14 @@ void bind_session()
"add_dht_router", &add_dht_router "add_dht_router", &add_dht_router
, (arg("router"), "port") , (arg("router"), "port")
) )
.def("start_dht", allow_threads(&session::start_dht)) .def("start_dht", allow_threads(start_dht0))
#ifndef TORRENT_NO_DEPRECATE
.def("start_dht", allow_threads(start_dht1))
#endif
.def("stop_dht", allow_threads(&session::stop_dht)) .def("stop_dht", allow_threads(&session::stop_dht))
#ifndef TORRENT_NO_DEPRECATE
.def("dht_state", allow_threads(&session::dht_state)) .def("dht_state", allow_threads(&session::dht_state))
#endif
.def("set_dht_proxy", allow_threads(&session::set_dht_proxy)) .def("set_dht_proxy", allow_threads(&session::set_dht_proxy))
.def("dht_proxy", allow_threads(&session::dht_proxy), return_value_policy<copy_const_reference>()) .def("dht_proxy", allow_threads(&session::dht_proxy), return_value_policy<copy_const_reference>())
#endif #endif
@ -295,7 +308,7 @@ void bind_session()
"add_torrent", &add_torrent_depr "add_torrent", &add_torrent_depr
, ( , (
arg("resume_data") = entry(), arg("resume_data") = entry(),
arg("storage_mode") = storage_mode_sparse, arg("storage_mode") = storage_mode_sparse,
arg("paused") = false arg("paused") = false
) )
) )
@ -328,9 +341,10 @@ void bind_session()
.def("load_asnum_db", &load_asnum_db) .def("load_asnum_db", &load_asnum_db)
.def("load_country_db", &load_country_db) .def("load_country_db", &load_country_db)
#endif #endif
.def("load_state", &load_state) .def("load_state", load_state0)
.def("save_state", &save_state) .def("save_state", &save_state, (arg("entry"), arg("flags") = 0xffffffff))
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
.def("load_state", load_state1)
.def("set_severity_level", allow_threads(&session::set_severity_level)) .def("set_severity_level", allow_threads(&session::set_severity_level))
#endif #endif
.def("set_alert_mask", allow_threads(&session::set_alert_mask)) .def("set_alert_mask", allow_threads(&session::set_alert_mask))
@ -360,5 +374,18 @@ void bind_session()
.def("get_cache_status", allow_threads(&session::get_cache_status)) .def("get_cache_status", allow_threads(&session::get_cache_status))
; ;
enum_<session::save_state_flags_t>("save_state_flags_t")
.value("save_settings", session::save_settings)
.value("save_dht_settings", session::save_dht_settings)
.value("save_dht_proxy", session::save_dht_proxy)
.value("save_dht_state", session::save_dht_state)
.value("save_i2p_proxy", session::save_i2p_proxy)
.value("save_encryption_settings", session:: save_encryption_settings)
.value("save_peer_proxy", session::save_peer_proxy)
.value("save_web_proxy", session::save_web_proxy)
.value("save_tracker_proxy", session::save_tracker_proxy)
.value("save_as_map", session::save_as_map)
;
register_ptr_to_python<std::auto_ptr<alert> >(); register_ptr_to_python<std::auto_ptr<alert> >();
} }