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

Merge pull request #242 from jpetso/master 

Build fixes
This commit is contained in:
Arvid Norberg 2015-11-02 18:37:51 -05:00
parent 1046f0c121 a3316ec49d
commit cd358aa5a9
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bindings/c/library.cpp
View File

@ -31,11 +31,13 @@ POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "libtorrent/session.hpp" #include "libtorrent/session.hpp"
#include "libtorrent/session_status.hpp"
#include "libtorrent/magnet_uri.hpp" #include "libtorrent/magnet_uri.hpp"
#include "libtorrent/torrent_handle.hpp" #include "libtorrent/torrent_handle.hpp"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <libtorrent.h> #include <libtorrent.h>
#include <stdarg.h>
namespace namespace
{ {
@ -186,7 +188,7 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...)
switch (tag) switch (tag)
{ {
case TOR_FILENAME: case TOR_FILENAME:
params.ti = new (std::nothrow) torrent_info(va_arg(lp, char const*), ec); params.ti.reset(new (std::nothrow) torrent_info(va_arg(lp, char const*), ec));
break; break;
case TOR_TORRENT: case TOR_TORRENT:
torrent_data = va_arg(lp, char const*); torrent_data = va_arg(lp, char const*);
@ -195,13 +197,13 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...)
torrent_size = va_arg(lp, int); torrent_size = va_arg(lp, int);
break; break;
case TOR_INFOHASH: case TOR_INFOHASH:
params.ti = new (std::nothrow) torrent_info(sha1_hash(va_arg(lp, char const*))); params.ti.reset(new (std::nothrow) torrent_info(sha1_hash(va_arg(lp, char const*))));
break; break;
case TOR_INFOHASH_HEX: case TOR_INFOHASH_HEX:
{ {
sha1_hash ih; sha1_hash ih;
from_hex(va_arg(lp, char const*), 40, (char*)&ih[0]); from_hex(va_arg(lp, char const*), 40, (char*)&ih[0]);
params.ti = new (std::nothrow) torrent_info(ih); params.ti.reset(new (std::nothrow) torrent_info(ih));
break; break;
} }
case TOR_MAGNETLINK: case TOR_MAGNETLINK:
@ -253,13 +255,12 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...)
} }
if (!params.ti && torrent_data && torrent_size) if (!params.ti && torrent_data && torrent_size)
params.ti = new (std::nothrow) torrent_info(torrent_data, torrent_size); params.ti.reset(new (std::nothrow) torrent_info(torrent_data, torrent_size));
std::vector<char> rd; std::vector<char> rd;
if (resume_data && resume_size) if (resume_data && resume_size)
{ {
rd.assign(resume_data, resume_data + resume_size); params.resume_data.assign(resume_data, resume_data + resume_size);
params.resume_data = &rd;
} }
torrent_handle h; torrent_handle h;
if (!params.ti && magnet_url) if (!params.ti && magnet_url)
@ -490,8 +491,8 @@ TORRENT_EXPORT int torrent_get_status(int tor, torrent_status* s, int struct_siz
s->paused = ts.paused; s->paused = ts.paused;
s->progress = ts.progress; s->progress = ts.progress;
strncpy(s->error, ts.error.c_str(), 1025); strncpy(s->error, ts.error.c_str(), 1025);
s->next_announce = ts.next_announce.total_seconds(); s->next_announce = libtorrent::total_seconds(ts.next_announce);
s->announce_interval = ts.announce_interval.total_seconds(); s->announce_interval = libtorrent::total_seconds(ts.announce_interval);
strncpy(s->current_tracker, ts.current_tracker.c_str(), 512); strncpy(s->current_tracker, ts.current_tracker.c_str(), 512);
s->total_download = ts.total_download = ts.total_download = ts.total_download; s->total_download = ts.total_download = ts.total_download = ts.total_download;
s->total_upload = ts.total_upload = ts.total_upload = ts.total_upload; s->total_upload = ts.total_upload = ts.total_upload = ts.total_upload;
@ -530,7 +531,6 @@ TORRENT_EXPORT int torrent_get_status(int tor, torrent_status* s, int struct_siz
s->seed_rank = ts.seed_rank; s->seed_rank = ts.seed_rank;
s->last_scrape = ts.last_scrape; s->last_scrape = ts.last_scrape;
s->has_incoming = ts.has_incoming; s->has_incoming = ts.has_incoming;
s->sparse_regions = ts.sparse_regions;
s->seed_mode = ts.seed_mode; s->seed_mode = ts.seed_mode;
return 0; return 0;
} }

1
bindings/c/libtorrent.h
View File

@ -195,7 +195,6 @@ struct torrent_status
int seed_rank; int seed_rank;
int last_scrape; int last_scrape;
int has_incoming; int has_incoming;
int sparse_regions;
int seed_mode; int seed_mode;
}; };

6
examples/cmake/FindLibtorrentRasterbar.cmake
View File

@ -39,11 +39,9 @@ else()
-DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64) -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
endif() endif()
if(LibtorrentRasterbar_USE_STATIC_LIBS) if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
list(APPEND LibtorrentRasterbar_DEFINITIONS -DBOOST_ASIO_SEPARATE_COMPILATION)
else()
list(APPEND LibtorrentRasterbar_DEFINITIONS list(APPEND LibtorrentRasterbar_DEFINITIONS
-DTORRENT_LINKING_SHARED -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED
-DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK) -DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK)
endif() endif()
endif() endif()