git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ITFoundation launch at login, but it doesn'ty work. Other small fixes for netwo...
[MenuTunes.git]
/
MainController.m
diff --git
a/MainController.m
b/MainController.m
index
9d2e3cc
..
ad6f2e1
100755
(executable)
--- a/
MainController.m
+++ b/
MainController.m
@@
-334,10
+334,6
@@
static MainController *sharedController;
- (void)timerUpdate
{
- (void)timerUpdate
{
- if ([networkController isConnectedToServer]) {
- [statusItem setMenu:[menuController menu]];
- }
-
if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
ITDebugLog(@"The song changed.");
if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
ITDebugLog(@"The song changed.");
@@
-358,6
+354,7
@@
static MainController *sharedController;
}
timerUpdating = YES;
}
timerUpdating = YES;
+ [statusItem setEnabled:NO];
NS_DURING
latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
NS_DURING
latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
@@
-391,6
+388,11
@@
static MainController *sharedController;
NS_ENDHANDLER
timerUpdating = NO;
NS_ENDHANDLER
timerUpdating = NO;
+ [statusItem setEnabled:YES];
+ }
+
+ if ([networkController isConnectedToServer]) {
+ [statusItem setMenu:[menuController menu]];
}
}
}
}
@@
-1089,6
+1091,11
@@
static MainController *sharedController;
if (result == 1) {
[[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
currentRemote = [[[networkController networkObject] remote] retain];
if (result == 1) {
[[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
currentRemote = [[[networkController networkObject] remote] retain];
+
+ [self setupHotKeys];
+ //playerRunningState = ITMTRemotePlayerRunning;
+ playerRunningState = [[self currentRemote] playerRunningState];
+
[refreshTimer invalidate];
refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
target:self
[refreshTimer invalidate];
refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
target:self
@@
-1117,6
+1124,12
@@
static MainController *sharedController;
[currentRemote release];
currentRemote = [remoteArray objectAtIndex:0];
[networkController disconnect];
[currentRemote release];
currentRemote = [remoteArray objectAtIndex:0];
[networkController disconnect];
+
+ if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+ [self applicationLaunched:nil];
+ } else {
+ [self applicationTerminated:nil];
+ }
[self timerUpdate];
return YES;
}
[self timerUpdate];
return YES;
}
@@
-1174,7
+1187,7
@@
static MainController *sharedController;
- (void)applicationLaunched:(NSNotification *)note
{
NS_DURING
- (void)applicationLaunched:(NSNotification *)note
{
NS_DURING
- if (!note ||
[[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]
) {
+ if (!note ||
([[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer])
) {
ITDebugLog(@"Remote application launched.");
playerRunningState = ITMTRemotePlayerRunning;
[[self currentRemote] begin];
ITDebugLog(@"Remote application launched.");
playerRunningState = ITMTRemotePlayerRunning;
[[self currentRemote] begin];