From ae89e4683d4f32350fecdddcf0a83a47155268b5 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Wed, 3 Aug 2011 23:40:51 +0000 Subject: [PATCH] add user_data (void *) to the queue callback --- libtransmission/peer-mgr.c | 2 +- libtransmission/torrent.c | 3 ++- libtransmission/torrent.h | 3 ++- libtransmission/transmission.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c index 24ea971a8..445047d80 100644 --- a/libtransmission/peer-mgr.c +++ b/libtransmission/peer-mgr.c @@ -3575,7 +3575,7 @@ queuePulse( tr_session * session, tr_direction dir ) if( tor != NULL ) { tr_torrentStartNow( tor ); if( tor->queue_started_callback != NULL ) - (*tor->queue_started_callback)( tor ); + (*tor->queue_started_callback)( tor, tor->queue_started_user_data ); } } } diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index 846c7477f..45023051d 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -3323,9 +3323,10 @@ torrentSetQueued( tr_torrent * tor, bool queued ) } void -tr_torrentSetQueueStartCallback( tr_torrent * torrent, void (*callback)( tr_torrent * ) ) +tr_torrentSetQueueStartCallback( tr_torrent * torrent, void (*callback)( tr_torrent *, void * ), void * user_data ) { torrent->queue_started_callback = callback; + torrent->queue_started_user_data = user_data; } diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index 306813bba..91e6d72f7 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -236,7 +236,8 @@ struct tr_torrent tr_torrent_idle_limit_hit_func * idle_limit_hit_func; void * idle_limit_hit_func_user_data; - void ( * queue_started_callback )( tr_torrent * ); + void * queue_started_user_data; + void ( * queue_started_callback )( tr_torrent *, void * queue_started_user_data ); bool isRunning; bool isStopping; diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 38827587a..187a3bb4b 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -809,7 +809,7 @@ void tr_sessionSetQueueStalledMinutes( tr_session *, int minutes ); int tr_sessionGetQueueStalledMinutes( const tr_session * ); /** @brief Set a callback that is invoked when the queue starts a torrent */ -void tr_torrentSetQueueStartCallback( tr_torrent * torrent, void (*callback)( tr_torrent * ) ); +void tr_torrentSetQueueStartCallback( tr_torrent * torrent, void (*callback)( tr_torrent *, void * ), void * user_data ); /***