Skip to content

Commit

Permalink
Fixing swig and time types.
Browse files Browse the repository at this point in the history
  • Loading branch information
aldenml committed Feb 25, 2015
1 parent cd4066e commit b61b048
Show file tree
Hide file tree
Showing 17 changed files with 402 additions and 625 deletions.
26 changes: 0 additions & 26 deletions src/com/frostwire/jlibtorrent/swig/SWIGTYPE_p_ptime.java

This file was deleted.

26 changes: 0 additions & 26 deletions src/com/frostwire/jlibtorrent/swig/SWIGTYPE_p_time_duration.java

This file was deleted.

4 changes: 2 additions & 2 deletions src/com/frostwire/jlibtorrent/swig/alert.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public synchronized void delete() {
}
}

public SWIGTYPE_p_ptime timestamp() {
return new SWIGTYPE_p_ptime(libtorrent_jni.alert_timestamp(swigCPtr, this), true);
public ptime timestamp() {
return new ptime(libtorrent_jni.alert_timestamp(swigCPtr, this), true);
}

public int type() {
Expand Down
22 changes: 12 additions & 10 deletions src/com/frostwire/jlibtorrent/swig/announce_entry.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,22 @@ public int min_announce_in() {
return libtorrent_jni.announce_entry_min_announce_in(swigCPtr, this);
}

public void setNext_announce(SWIGTYPE_p_ptime value) {
libtorrent_jni.announce_entry_next_announce_set(swigCPtr, this, SWIGTYPE_p_ptime.getCPtr(value));
public void setNext_announce(ptime value) {
libtorrent_jni.announce_entry_next_announce_set(swigCPtr, this, ptime.getCPtr(value), value);
}

public SWIGTYPE_p_ptime getNext_announce() {
return new SWIGTYPE_p_ptime(libtorrent_jni.announce_entry_next_announce_get(swigCPtr, this), true);
public ptime getNext_announce() {
long cPtr = libtorrent_jni.announce_entry_next_announce_get(swigCPtr, this);
return (cPtr == 0) ? null : new ptime(cPtr, false);
}

public void setMin_announce(SWIGTYPE_p_ptime value) {
libtorrent_jni.announce_entry_min_announce_set(swigCPtr, this, SWIGTYPE_p_ptime.getCPtr(value));
public void setMin_announce(ptime value) {
libtorrent_jni.announce_entry_min_announce_set(swigCPtr, this, ptime.getCPtr(value), value);
}

public SWIGTYPE_p_ptime getMin_announce() {
return new SWIGTYPE_p_ptime(libtorrent_jni.announce_entry_min_announce_get(swigCPtr, this), true);
public ptime getMin_announce() {
long cPtr = libtorrent_jni.announce_entry_min_announce_get(swigCPtr, this);
return (cPtr == 0) ? null : new ptime(cPtr, false);
}

public void setScrape_incomplete(int value) {
Expand Down Expand Up @@ -208,8 +210,8 @@ public void failed(SWIGTYPE_p_libtorrent__aux__session_settings sett) {
libtorrent_jni.announce_entry_failed__SWIG_1(swigCPtr, this, SWIGTYPE_p_libtorrent__aux__session_settings.getCPtr(sett));
}

public boolean can_announce(SWIGTYPE_p_ptime now, boolean is_seed) {
return libtorrent_jni.announce_entry_can_announce(swigCPtr, this, SWIGTYPE_p_ptime.getCPtr(now), is_seed);
public boolean can_announce(ptime now, boolean is_seed) {
return libtorrent_jni.announce_entry_can_announce(swigCPtr, this, ptime.getCPtr(now), now, is_seed);
}

public boolean is_working() {
Expand Down
9 changes: 5 additions & 4 deletions src/com/frostwire/jlibtorrent/swig/cached_piece_info.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ public bool_vector getBlocks() {
return (cPtr == 0) ? null : new bool_vector(cPtr, false);
}

public void setLast_use(SWIGTYPE_p_ptime value) {
libtorrent_jni.cached_piece_info_last_use_set(swigCPtr, this, SWIGTYPE_p_ptime.getCPtr(value));
public void setLast_use(ptime value) {
libtorrent_jni.cached_piece_info_last_use_set(swigCPtr, this, ptime.getCPtr(value), value);
}

public SWIGTYPE_p_ptime getLast_use() {
return new SWIGTYPE_p_ptime(libtorrent_jni.cached_piece_info_last_use_get(swigCPtr, this), true);
public ptime getLast_use() {
long cPtr = libtorrent_jni.cached_piece_info_last_use_get(swigCPtr, this);
return (cPtr == 0) ? null : new ptime(cPtr, false);
}

public void setNext_to_hash(int value) {
Expand Down
84 changes: 39 additions & 45 deletions src/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,29 @@ public class libtorrent_jni {
}

public final static native int hundredth_get();
public final static native String ptime_zone_name(long jarg1, ptime jarg1_);
public final static native String ptime_zone_abbrev(long jarg1, ptime jarg1_);
public final static native String ptime_zone_as_posix_string(long jarg1, ptime jarg1_);
public final static native boolean ptime_is_not_a_date_time(long jarg1, ptime jarg1_);
public final static native boolean ptime_is_infinity(long jarg1, ptime jarg1_);
public final static native boolean ptime_is_pos_infinity(long jarg1, ptime jarg1_);
public final static native boolean ptime_is_neg_infinity(long jarg1, ptime jarg1_);
public final static native boolean ptime_is_special(long jarg1, ptime jarg1_);
public final static native long new_ptime();
public final static native void delete_ptime(long jarg1);
public final static native long new_time_duration__SWIG_0();
public final static native long new_time_duration__SWIG_1(long jarg1, long jarg2, long jarg3, long jarg4);
public final static native long new_time_duration__SWIG_2(long jarg1, time_duration jarg1_);
public final static native long new_time_duration__SWIG_3(int jarg1);
public final static native long time_duration_unit();
public final static native long time_duration_ticks_per_second();
public final static native int time_duration_resolution();
public final static native long time_duration_hours(long jarg1, time_duration jarg1_);
public final static native long time_duration_minutes(long jarg1, time_duration jarg1_);
public final static native long time_duration_seconds(long jarg1, time_duration jarg1_);
public final static native long time_duration_total_seconds(long jarg1, time_duration jarg1_);
public final static native long time_duration_total_milliseconds(long jarg1, time_duration jarg1_);
public final static native long time_duration_total_nanoseconds(long jarg1, time_duration jarg1_);
public final static native long time_duration_total_microseconds(long jarg1, time_duration jarg1_);
public final static native long time_duration_fractional_seconds(long jarg1, time_duration jarg1_);
public final static native int time_duration_num_fractional_digits();
public final static native boolean time_duration_is_negative(long jarg1, time_duration jarg1_);
public final static native long time_duration_ticks(long jarg1, time_duration jarg1_);
public final static native boolean time_duration_is_special(long jarg1, time_duration jarg1_);
public final static native boolean time_duration_is_pos_infinity(long jarg1, time_duration jarg1_);
public final static native boolean time_duration_is_neg_infinity(long jarg1, time_duration jarg1_);
public final static native boolean time_duration_is_not_a_date_time(long jarg1, time_duration jarg1_);
public final static native void delete_time_duration(long jarg1);
public final static native long new_posix_time_duration__SWIG_0();
public final static native long new_posix_time_duration__SWIG_1(long jarg1, long jarg2, long jarg3, long jarg4);
public final static native long new_posix_time_duration__SWIG_2(long jarg1, posix_time_duration jarg1_);
public final static native long new_posix_time_duration__SWIG_3(int jarg1);
public final static native long posix_time_duration_unit();
public final static native long posix_time_duration_ticks_per_second();
public final static native int posix_time_duration_resolution();
public final static native long posix_time_duration_hours(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_minutes(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_seconds(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_total_seconds(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_total_milliseconds(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_total_nanoseconds(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_total_microseconds(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_fractional_seconds(long jarg1, posix_time_duration jarg1_);
public final static native int posix_time_duration_num_fractional_digits();
public final static native boolean posix_time_duration_is_negative(long jarg1, posix_time_duration jarg1_);
public final static native long posix_time_duration_ticks(long jarg1, posix_time_duration jarg1_);
public final static native boolean posix_time_duration_is_special(long jarg1, posix_time_duration jarg1_);
public final static native boolean posix_time_duration_is_pos_infinity(long jarg1, posix_time_duration jarg1_);
public final static native boolean posix_time_duration_is_neg_infinity(long jarg1, posix_time_duration jarg1_);
public final static native boolean posix_time_duration_is_not_a_date_time(long jarg1, posix_time_duration jarg1_);
public final static native void delete_posix_time_duration(long jarg1);
public final static native long new_address__SWIG_0();
public final static native long new_address__SWIG_1(long jarg1, address_v4 jarg1_);
public final static native long new_address__SWIG_2(long jarg1, address_v6 jarg1_);
Expand Down Expand Up @@ -109,6 +99,10 @@ public class libtorrent_jni {
public final static native String udp_endpoint_address(long jarg1, udp_endpoint jarg1_);
public final static native long new_udp_endpoint();
public final static native void delete_udp_endpoint(long jarg1);
public final static native long new_ptime();
public final static native void delete_ptime(long jarg1);
public final static native long new_time_duration();
public final static native void delete_time_duration(long jarg1);
public final static native long new_char_const_ptr_int_pair__SWIG_0();
public final static native long new_char_const_ptr_int_pair__SWIG_1(String jarg1, int jarg2);
public final static native long new_char_const_ptr_int_pair__SWIG_2(long jarg1, char_const_ptr_int_pair jarg1_);
Expand Down Expand Up @@ -908,9 +902,9 @@ public class libtorrent_jni {
public final static native long announce_entry_last_error_get(long jarg1, announce_entry jarg1_);
public final static native int announce_entry_next_announce_in(long jarg1, announce_entry jarg1_);
public final static native int announce_entry_min_announce_in(long jarg1, announce_entry jarg1_);
public final static native void announce_entry_next_announce_set(long jarg1, announce_entry jarg1_, long jarg2);
public final static native void announce_entry_next_announce_set(long jarg1, announce_entry jarg1_, long jarg2, ptime jarg2_);
public final static native long announce_entry_next_announce_get(long jarg1, announce_entry jarg1_);
public final static native void announce_entry_min_announce_set(long jarg1, announce_entry jarg1_, long jarg2);
public final static native void announce_entry_min_announce_set(long jarg1, announce_entry jarg1_, long jarg2, ptime jarg2_);
public final static native long announce_entry_min_announce_get(long jarg1, announce_entry jarg1_);
public final static native void announce_entry_scrape_incomplete_set(long jarg1, announce_entry jarg1_, int jarg2);
public final static native int announce_entry_scrape_incomplete_get(long jarg1, announce_entry jarg1_);
Expand Down Expand Up @@ -943,7 +937,7 @@ public class libtorrent_jni {
public final static native void announce_entry_reset(long jarg1, announce_entry jarg1_);
public final static native void announce_entry_failed__SWIG_0(long jarg1, announce_entry jarg1_, long jarg2, int jarg3);
public final static native void announce_entry_failed__SWIG_1(long jarg1, announce_entry jarg1_, long jarg2);
public final static native boolean announce_entry_can_announce(long jarg1, announce_entry jarg1_, long jarg2, boolean jarg3);
public final static native boolean announce_entry_can_announce(long jarg1, announce_entry jarg1_, long jarg2, ptime jarg2_, boolean jarg3);
public final static native boolean announce_entry_is_working(long jarg1, announce_entry jarg1_);
public final static native void announce_entry_trim(long jarg1, announce_entry jarg1_);
public final static native long new_web_seed_entry__SWIG_0(String jarg1, int jarg2, String jarg3, long jarg4, string_string_pair_vector jarg4_);
Expand Down Expand Up @@ -1166,9 +1160,9 @@ public class libtorrent_jni {
public final static native String torrent_status_name_get(long jarg1, torrent_status jarg1_);
public final static native void torrent_status_torrent_file_set(long jarg1, torrent_status jarg1_, long jarg2);
public final static native long torrent_status_torrent_file_get(long jarg1, torrent_status jarg1_);
public final static native void torrent_status_next_announce_set(long jarg1, torrent_status jarg1_, long jarg2, time_duration jarg2_);
public final static native void torrent_status_next_announce_set(long jarg1, torrent_status jarg1_, long jarg2, posix_time_duration jarg2_);
public final static native long torrent_status_next_announce_get(long jarg1, torrent_status jarg1_);
public final static native void torrent_status_announce_interval_set(long jarg1, torrent_status jarg1_, long jarg2, time_duration jarg2_);
public final static native void torrent_status_announce_interval_set(long jarg1, torrent_status jarg1_, long jarg2, posix_time_duration jarg2_);
public final static native long torrent_status_announce_interval_get(long jarg1, torrent_status jarg1_);
public final static native void torrent_status_current_tracker_set(long jarg1, torrent_status jarg1_, String jarg2);
public final static native String torrent_status_current_tracker_get(long jarg1, torrent_status jarg1_);
Expand Down Expand Up @@ -2497,7 +2491,7 @@ public class libtorrent_jni {
public final static native long cached_piece_info_storage_get(long jarg1, cached_piece_info jarg1_);
public final static native void cached_piece_info_blocks_set(long jarg1, cached_piece_info jarg1_, long jarg2, bool_vector jarg2_);
public final static native long cached_piece_info_blocks_get(long jarg1, cached_piece_info jarg1_);
public final static native void cached_piece_info_last_use_set(long jarg1, cached_piece_info jarg1_, long jarg2);
public final static native void cached_piece_info_last_use_set(long jarg1, cached_piece_info jarg1_, long jarg2, ptime jarg2_);
public final static native long cached_piece_info_last_use_get(long jarg1, cached_piece_info jarg1_);
public final static native void cached_piece_info_next_to_hash_set(long jarg1, cached_piece_info jarg1_, int jarg2);
public final static native int cached_piece_info_next_to_hash_get(long jarg1, cached_piece_info jarg1_);
Expand Down Expand Up @@ -2536,11 +2530,11 @@ public class libtorrent_jni {
public final static native long peer_info_total_download_get(long jarg1, peer_info jarg1_);
public final static native void peer_info_total_upload_set(long jarg1, peer_info jarg1_, long jarg2);
public final static native long peer_info_total_upload_get(long jarg1, peer_info jarg1_);
public final static native void peer_info_last_request_set(long jarg1, peer_info jarg1_, long jarg2);
public final static native void peer_info_last_request_set(long jarg1, peer_info jarg1_, long jarg2, time_duration jarg2_);
public final static native long peer_info_last_request_get(long jarg1, peer_info jarg1_);
public final static native void peer_info_last_active_set(long jarg1, peer_info jarg1_, long jarg2);
public final static native void peer_info_last_active_set(long jarg1, peer_info jarg1_, long jarg2, time_duration jarg2_);
public final static native long peer_info_last_active_get(long jarg1, peer_info jarg1_);
public final static native void peer_info_download_queue_time_set(long jarg1, peer_info jarg1_, long jarg2);
public final static native void peer_info_download_queue_time_set(long jarg1, peer_info jarg1_, long jarg2, time_duration jarg2_);
public final static native long peer_info_download_queue_time_get(long jarg1, peer_info jarg1_);
public final static native int peer_info_interesting_get();
public final static native int peer_info_choked_get();
Expand Down Expand Up @@ -2988,7 +2982,7 @@ public class libtorrent_jni {
public final static native long new_web_seed_t__SWIG_1(String jarg1, int jarg2, String jarg3, long jarg4, string_string_pair_vector jarg4_);
public final static native long new_web_seed_t__SWIG_2(String jarg1, int jarg2, String jarg3);
public final static native long new_web_seed_t__SWIG_3(String jarg1, int jarg2);
public final static native void web_seed_t_retry_set(long jarg1, web_seed_t jarg1_, long jarg2);
public final static native void web_seed_t_retry_set(long jarg1, web_seed_t jarg1_, long jarg2, ptime jarg2_);
public final static native long web_seed_t_retry_get(long jarg1, web_seed_t jarg1_);
public final static native void web_seed_t_endpoints_set(long jarg1, web_seed_t jarg1_, long jarg2, tcp_endpoint_vector jarg2_);
public final static native long web_seed_t_endpoints_get(long jarg1, web_seed_t jarg1_);
Expand Down Expand Up @@ -3097,7 +3091,7 @@ public class libtorrent_jni {
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);
public final static native long session_wait_for_alert(long jarg1, session jarg1_, long jarg2, time_duration jarg2_);
public final static native int session_udp_get();
public final static native int session_tcp_get();
public final static native int session_add_port_mapping(long jarg1, session jarg1_, int jarg2, int jarg3, int jarg4);
Expand All @@ -3113,7 +3107,7 @@ public class libtorrent_jni {
public final static native void session_dht_announce__SWIG_1(long jarg1, session jarg1_, long jarg2, sha1_hash jarg2_);
public final static native void pool_file_status_file_index_set(long jarg1, pool_file_status jarg1_, int jarg2);
public final static native int pool_file_status_file_index_get(long jarg1, pool_file_status jarg1_);
public final static native void pool_file_status_last_use_set(long jarg1, pool_file_status jarg1_, long jarg2);
public final static native void pool_file_status_last_use_set(long jarg1, pool_file_status jarg1_, long jarg2, ptime jarg2_);
public final static native long pool_file_status_last_use_get(long jarg1, pool_file_status jarg1_);
public final static native void pool_file_status_open_mode_set(long jarg1, pool_file_status jarg1_, int jarg2);
public final static native int pool_file_status_open_mode_get(long jarg1, pool_file_status jarg1_);
Expand Down

0 comments on commit b61b048

Please sign in to comment.