Skip to content

Commit

Permalink
Needed to bring aux::session_settings.
Browse files Browse the repository at this point in the history
  • Loading branch information
aldenml committed Mar 2, 2015
1 parent a490565 commit d1ddf29
Show file tree
Hide file tree
Showing 8 changed files with 355 additions and 2 deletions.
Binary file modified libjlibtorrent.dylib
Binary file not shown.
8 changes: 8 additions & 0 deletions src/com/frostwire/jlibtorrent/SettingsPack.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,12 @@ public boolean getBoolean(int name) {
public void setBoolean(int name, boolean value) {
sp.set_bool(name, value);
}

public int getInteger(int name) {
return sp.get_int(name);
}

public void setInteger(int name, int value) {
sp.set_int(name, value);
}
}
8 changes: 8 additions & 0 deletions src/com/frostwire/jlibtorrent/swig/libtorrent.java
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,19 @@ public static long peer_priority(tcp_endpoint e1, tcp_endpoint e2) {
return libtorrent_jni.peer_priority(tcp_endpoint.getCPtr(e1), e1, tcp_endpoint.getCPtr(e2), e2);
}

public static void initialize_default_settings(session_settings s) {
libtorrent_jni.initialize_default_settings(session_settings.getCPtr(s), s);
}

public static settings_pack load_pack_from_dict(lazy_entry settings) {
long cPtr = libtorrent_jni.load_pack_from_dict(lazy_entry.getCPtr(settings), settings);
return (cPtr == 0) ? null : new settings_pack(cPtr, false);
}

public static void save_settings_to_dict(session_settings s, string_entry_map sett) {
libtorrent_jni.save_settings_to_dict(session_settings.getCPtr(s), s, string_entry_map.getCPtr(sett), sett);
}

public static int setting_by_name(String name) {
return libtorrent_jni.setting_by_name(name);
}
Expand Down
11 changes: 11 additions & 0 deletions src/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
Original file line number Diff line number Diff line change
Expand Up @@ -3003,7 +3003,17 @@ public class libtorrent_jni {
public final static native void dht_settings_block_ratelimit_set(long jarg1, dht_settings jarg1_, int jarg2);
public final static native int dht_settings_block_ratelimit_get(long jarg1, dht_settings jarg1_);
public final static native void delete_dht_settings(long jarg1);
public final static native void initialize_default_settings(long jarg1, session_settings jarg1_);
public final static native void session_settings_set_str(long jarg1, session_settings jarg1_, int jarg2, String jarg3);
public final static native String session_settings_get_str(long jarg1, session_settings jarg1_, int jarg2);
public final static native void session_settings_set_int(long jarg1, session_settings jarg1_, int jarg2, int jarg3);
public final static native int session_settings_get_int(long jarg1, session_settings jarg1_, int jarg2);
public final static native void session_settings_set_bool(long jarg1, session_settings jarg1_, int jarg2, boolean jarg3);
public final static native boolean session_settings_get_bool(long jarg1, session_settings jarg1_, int jarg2);
public final static native long new_session_settings();
public final static native void delete_session_settings(long jarg1);
public final static native long load_pack_from_dict(long jarg1, lazy_entry jarg1_);
public final static native void save_settings_to_dict(long jarg1, session_settings jarg1_, long jarg2, string_entry_map jarg2_);
public final static native int setting_by_name(String jarg1);
public final static native String name_for_setting(int jarg1);
public final static native void settings_pack_set_str(long jarg1, settings_pack jarg1_, int jarg2, String jarg3);
Expand Down Expand Up @@ -3190,6 +3200,7 @@ public class libtorrent_jni {
public final static native void session_remove_torrent__SWIG_0(long jarg1, session jarg1_, long jarg2, torrent_handle jarg2_, int jarg3);
public final static native void session_remove_torrent__SWIG_1(long jarg1, session jarg1_, long jarg2, torrent_handle jarg2_);
public final static native void session_apply_settings(long jarg1, session jarg1_, long jarg2, settings_pack jarg2_);
public final static native long session_get_settings(long jarg1, session jarg1_);
public final static native long session_pop_alert(long jarg1, session jarg1_);
public final static native void session_pop_alerts(long jarg1, session jarg1_, long jarg2, alert_ptr_deque jarg2_);
public final static native long session_wait_for_alert(long jarg1, session jarg1_, long jarg2, time_duration jarg2_);
Expand Down
4 changes: 4 additions & 0 deletions src/com/frostwire/jlibtorrent/swig/session.java
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ public void apply_settings(settings_pack s) {
libtorrent_jni.session_apply_settings(swigCPtr, this, settings_pack.getCPtr(s), s);
}

public session_settings get_settings() {
return new session_settings(libtorrent_jni.session_get_settings(swigCPtr, this), true);
}

public alert pop_alert() {
long cPtr = libtorrent_jni.session_pop_alert(swigCPtr, this);
return (cPtr == 0) ? null : new alert(cPtr, true);
Expand Down
66 changes: 66 additions & 0 deletions src/com/frostwire/jlibtorrent/swig/session_settings.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 3.0.5
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */

package com.frostwire.jlibtorrent.swig;

public class session_settings {
private long swigCPtr;
protected boolean swigCMemOwn;

protected session_settings(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}

protected static long getCPtr(session_settings obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}

protected void finalize() {
delete();
}

public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
libtorrent_jni.delete_session_settings(swigCPtr);
}
swigCPtr = 0;
}
}

public void set_str(int name, String value) {
libtorrent_jni.session_settings_set_str(swigCPtr, this, name, value);
}

public String get_str(int name) {
return libtorrent_jni.session_settings_get_str(swigCPtr, this, name);
}

public void set_int(int name, int value) {
libtorrent_jni.session_settings_set_int(swigCPtr, this, name, value);
}

public int get_int(int name) {
return libtorrent_jni.session_settings_get_int(swigCPtr, this, name);
}

public void set_bool(int name, boolean value) {
libtorrent_jni.session_settings_set_bool(swigCPtr, this, name, value);
}

public boolean get_bool(int name) {
return libtorrent_jni.session_settings_get_bool(swigCPtr, this, name);
}

public session_settings() {
this(libtorrent_jni.new_session_settings(), true);
}

}
4 changes: 2 additions & 2 deletions swig/libtorrent.i
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "libtorrent/peer_connection.hpp"
#include "libtorrent/session_status.hpp"
#include "libtorrent/session_settings.hpp"
#include "libtorrent/aux_/session_settings.hpp"
#include "libtorrent/settings_pack.hpp"
#include "libtorrent/peer_class.hpp"
#include "libtorrent/peer_class_type_filter.hpp"
Expand Down Expand Up @@ -470,7 +471,6 @@ namespace std {
%ignore libtorrent::session::dht_get_item(boost::array<char, 32>);
%ignore libtorrent::session::add_extension;
%ignore libtorrent::session::set_load_function;
%ignore libtorrent::session::get_settings;
%ignore libtorrent::peer_connection::peer_connection;
%ignore libtorrent::peer_connection::incoming_piece;
%ignore libtorrent::peer_connection::send_buffer;
Expand Down Expand Up @@ -597,7 +597,6 @@ namespace std {
%ignore libtorrent::clear_bufs;
%ignore libtorrent::copy_bufs;
%ignore libtorrent::apply_pack;
%ignore libtorrent::save_settings_to_dict;
%ignore libtorrent::storage_error::operator bool() const;

%ignore libtorrent::detail::nop;
Expand Down Expand Up @@ -689,6 +688,7 @@ namespace std {
%include "libtorrent/peer_connection.hpp"
%include "libtorrent/session_status.hpp"
%include "libtorrent/session_settings.hpp"
%include "libtorrent/aux_/session_settings.hpp"
%include "libtorrent/settings_pack.hpp"
%include "libtorrent/peer_class.hpp"
%include "libtorrent/peer_class_type_filter.hpp"
Expand Down

0 comments on commit d1ddf29

Please sign in to comment.