Did some tinkering, nothing really useful done though. Removed a useless

window from Preferences.nib.
ithinksw · Nov 29, 2003 · 2404965 · 2404965
1 parent c9a2187
commit 2404965
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
diff --git a/MainController.h b/MainController.h
@@ -82,4 +82,6 @@
 - (void)setupHotKeys;
 - (void)closePreferences;
 
+- (void)showCurrentTrackInfo;
+
 @end
diff --git a/MainController.m b/MainController.m
@@ -14,7 +14,6 @@ @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)showCurrentTrackInfo;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end

diff --git a/NetworkController.h b/NetworkController.h
@@ -24,7 +24,7 @@
     NSMutableArray *remoteServices;
 
     NSConnection *serverConnection, *clientConnection;
-    NSSocketPort *serverPort, *clientPort;
+    NSSocketPort *clientPort;
     NSString *remoteHost;
     BOOL serverOn, clientConnected, connectedToServer;
     NSData *serverPass, *clientPass;

diff --git a/NetworkController.m b/NetworkController.m
@@ -69,17 +69,20 @@ - (void)setServerStatus:(BOOL)status
 {
     if (!serverOn && status) {
         NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"];
+        NSPort *serverPort;
         unsigned char buffer;
         NSData *fullPass;
         //Turn on
         NS_DURING
-            serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];
+            serverPort = [[[NSSocketPort alloc] initWithTCPPort:SERVER_PORT] autorelease];
             serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
                                                      sendPort:serverPort];
-            [serverConnection setRootObject:[[NetworkObject alloc] init]];
+            clientProxy = [[NetworkObject alloc] init];
+            [serverConnection setRootObject:[clientProxy autorelease]];
             [serverConnection registerName:@"ITMTPlayerHost"];
         NS_HANDLER
             [[serverConnection rootObject] release];
+            [serverConnection setRootObject:nil];
             [serverConnection release];
             [serverPort release];
             ITDebugLog(@"Error starting server!");
@@ -108,8 +111,8 @@ - (void)setServerStatus:(BOOL)status
         //Turn off
         [service stop];
         [serverConnection registerName:nil];
-        [[serverConnection rootObject] release];
         [serverConnection release];
+        [clientProxy release];
         ITDebugLog(@"Stopped server.");
         serverOn = NO;
     }

diff --git a/NetworkObject.m b/NetworkObject.m
@@ -35,10 +35,11 @@ - (id)init
 
 - (ITMTRemote *)remote
 {
-    if (_authenticated)
+    if (_authenticated) {
         return [[MainController sharedController] currentRemote];
-    else
+    } else {
         return nil;
+    }
 }
 
 - (NSString *)serverName

diff --git a/libValidate.a b/libValidate.a