Checking in improvements to the effect availability heuristic.

[MenuTunes.git] / NetworkController.h

diff --git a/NetworkController.h b/NetworkController.h
index de3801b..662e519 100755 (executable)
--- a/NetworkController.h
+++ b/NetworkController.h
@@ -15,7 +15,7 @@
 
 #define SERVER_PORT 5712
 
 
 #define SERVER_PORT 5712
 

-@class ITMTRemote;
+@class NetworkObject;

 
 @interface NetworkController : NSObject
 {
 
 @interface NetworkController : NSObject
 {


@@ -25,8 +25,10 @@
     
     NSConnection *serverConnection, *clientConnection;
     NSSocketPort *serverPort, *clientPort;
     
     NSConnection *serverConnection, *clientConnection;
     NSSocketPort *serverPort, *clientPort;

+    NSString *remoteHost;

     BOOL serverOn, clientConnected, connectedToServer;
     BOOL serverOn, clientConnected, connectedToServer;

-    ITMTRemote *clientProxy;
+    NSData *serverPass, *clientPass;
+    NetworkObject *clientProxy;

 }
 + (NetworkController *)sharedController;
 
 }
 + (NetworkController *)sharedController;
 


@@ -34,12 +36,14 @@
 - (void)stopRemoteServerSearch;
 
 - (void)setServerStatus:(BOOL)status;
 - (void)stopRemoteServerSearch;
 
 - (void)setServerStatus:(BOOL)status;

-- (BOOL)connectToHost:(NSString *)host;
+- (int)connectToHost:(NSString *)host;
+- (BOOL)checkForServerAtHost:(NSString *)host;

 - (BOOL)disconnect;
 - (BOOL)isServerOn;
 - (BOOL)isClientConnected;
 - (BOOL)isConnectedToServer;
 - (BOOL)disconnect;
 - (BOOL)isServerOn;
 - (BOOL)isClientConnected;
 - (BOOL)isConnectedToServer;

+- (NSString *)remoteHost;

 
 

-- (ITMTRemote *)sharedRemote;
+- (NetworkObject *)networkObject;

 - (NSArray *)remoteServices;
 @end
 - (NSArray *)remoteServices;
 @end