Changeset 5858

Timestamp:

May 20, 2008, 3:16:34 PM (15 years ago)

Author:

livings124

Message:

a little progress on setting up the rpc callback (no new actual functionality yet)

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (5 diffs)
• macosx/Torrent.h (modified) (2 diffs)
• macosx/Torrent.m (modified) (3 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -342 +342 @@
                         containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
                         proxyType = 1;
-                        remoteGlobalIDString = A2AAB6BA0DE0D55D00E04DDA /* shttpd */;
+                        remoteGlobalIDString = A2AAB6BA0DE0D55D00E04DDA;
                         remoteInfo = shttpd;
                 };

trunk/macosx/Controller.h

@@ -231 +231 @@
 - (void) beginCreateFile: (NSNotification *) notification;
 
-- (void) sleepCallBack: (natural_t) messageType argument: (void *) messageArgument;
+- (void) sleepCallback: (natural_t) messageType argument: (void *) messageArgument;
 
 - (void) torrentTableViewSelectionDidChange: (NSNotification *) notification;
@@ -262 +262 @@
 - (void) prepareForUpdate:  (NSNotification *) notification;
 
+- (void) rpcCallback: (tr_rpc_callback_type) type forTorrentStruct: (struct tr_torrent *) torrentStruct;
+
 @end

trunk/macosx/Controller.m

@@ -139 +139 @@
 #define DONATE_URL  @"http://www.transmissionbt.com/donate.php"
 
-void sleepCallBack(void * controller, io_service_t y, natural_t messageType, void * messageArgument)
-{
-    [(Controller *)controller sleepCallBack: messageType argument: messageArgument];
+static void rpcCallback(tr_handle * handle UNUSED, tr_rpc_callback_type type, struct tr_torrent * torrentStruct, void * controller)
+{
+    [(Controller *)controller rpcCallback: type forTorrentStruct: torrentStruct];
+}
+
+static void sleepCallback(void * controller, io_service_t y, natural_t messageType, void * messageArgument)
+{
+    [(Controller *)controller sleepCallback: messageType argument: messageArgument];
 }
 
@@ -228 +233 @@
         fSoundPlaying = NO;
         
+        tr_sessionSetRPCCallback(fLib, rpcCallback, self);
+        
         [GrowlApplicationBridge setGrowlDelegate: self];
         [[UKKQueue sharedFileWatcher] setDelegate: self];
@@ -336 +343 @@
     IONotificationPortRef notify;
     io_object_t iterator;
-    if ((fRootPort = IORegisterForSystemPower(self, & notify, sleepCallBack, &iterator)))
+    if ((fRootPort = IORegisterForSystemPower(self, & notify, sleepCallback, &iterator)))
         CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notify), kCFRunLoopCommonModes);
     else
@@ -3759 +3766 @@
 }
 
-- (void) sleepCallBack: (natural_t) messageType argument: (void *) messageArgument
+- (void) sleepCallback: (natural_t) messageType argument: (void *) messageArgument
 {
     NSEnumerator * enumerator;
@@ -4047 +4054 @@
 }
 
+- (void) rpcCallback: (tr_rpc_callback_type) type forTorrentStruct: (struct tr_torrent *) torrentStruct
+{
+    //get the torrent
+    if (torrentStruct != NULL)
+    {
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        Torrent * torrent;
+        while ((torrent = [enumerator nextObject]))
+            if (torrentStruct == [torrent torrentStruct])
+                break;
+        
+        if (!torrent)
+        {
+            NSLog(@"No torrent found matching torrent struct given in RPC callback!");
+            return;
+        }
+    }
+    
+    switch (type)
+    {
+        case TR_RPC_TORRENT_ADDED:
+            break;
+        case TR_RPC_TORRENT_STARTED:
+            break;
+        case TR_RPC_TORRENT_STOPPED:
+            break;
+        case TR_RPC_TORRENT_CLOSING:
+            break;
+        case TR_RPC_TORRENT_CHANGED:
+            break;
+        case TR_RPC_SESSION_CHANGED:
+            break;
+    }
+}
+
 /*- (void) ipcQuit
 {

trunk/macosx/Torrent.h

@@ -40 +40 @@
     const tr_info * fInfo;
     const tr_stat * fStat;
-    
-    int fID;
     
     BOOL fResumeOnWake;
@@ -252 +250 @@
 - (NSNumber *) stateSortKey;
 
-- (int) torrentID;
 - (tr_torrent *) torrentStruct;
 

trunk/macosx/Torrent.m

@@ -27 +27 @@
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-
-static int static_lastid = 0;
 
 @interface Torrent (Private)
@@ -1518 +1516 @@
 }
 
-- (int) torrentID
-{
-    return fID;
-}
-
 - (tr_torrent *) torrentStruct
 {
@@ -1545 +1538 @@
     if (!(self = [super init]))
         return nil;
-    
-    static_lastid++;
-    fID = static_lastid;
     
     fDefaults = [NSUserDefaults standardUserDefaults];