HDCD Indicator: Made this less janky too
parent
391fc474f3
commit
a743f914e9
|
@ -42,7 +42,6 @@ extern NSDictionary * makeRGInfo(PlaylistEntry *pe);
|
||||||
IBOutlet NSArrayController *outputDevices;
|
IBOutlet NSArrayController *outputDevices;
|
||||||
|
|
||||||
NSTimer *positionTimer;
|
NSTimer *positionTimer;
|
||||||
NSTimer *hdcdLogoTimer;
|
|
||||||
|
|
||||||
AudioPlayer *audioPlayer;
|
AudioPlayer *audioPlayer;
|
||||||
|
|
||||||
|
|
|
@ -117,12 +117,6 @@ NSString *CogPlaybackDidStopNotficiation = @"CogPlaybackDidStopNotficiation";
|
||||||
[self setPlaybackStatus: CogStatusPaused];
|
[self setPlaybackStatus: CogStatusPaused];
|
||||||
|
|
||||||
[self sendMetaData];
|
[self sendMetaData];
|
||||||
|
|
||||||
if (hdcdLogoTimer)
|
|
||||||
{
|
|
||||||
[hdcdLogoTimer invalidate];
|
|
||||||
hdcdLogoTimer = nil;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)resume:(id)sender
|
- (IBAction)resume:(id)sender
|
||||||
|
@ -778,6 +772,8 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
|
||||||
|
|
||||||
[self setPosition:0];
|
[self setPosition:0];
|
||||||
|
|
||||||
|
[self removeHDCD:nil];
|
||||||
|
|
||||||
[[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidBeginNotficiation object:pe];
|
[[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidBeginNotficiation object:pe];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -854,14 +850,6 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
|
||||||
[mainWindow showHDCDLogo:YES];
|
[mainWindow showHDCDLogo:YES];
|
||||||
MiniWindow * miniWindow = (MiniWindow *) appController.miniWindow;
|
MiniWindow * miniWindow = (MiniWindow *) appController.miniWindow;
|
||||||
[miniWindow showHDCDLogo:YES];
|
[miniWindow showHDCDLogo:YES];
|
||||||
|
|
||||||
if (hdcdLogoTimer)
|
|
||||||
{
|
|
||||||
[hdcdLogoTimer invalidate];
|
|
||||||
hdcdLogoTimer = nil;
|
|
||||||
}
|
|
||||||
|
|
||||||
hdcdLogoTimer = [NSTimer timerWithTimeInterval:10.0 target:self selector:@selector(removeHDCD:) userInfo:nil repeats:NO];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)removeHDCD:(id)sender
|
- (void)removeHDCD:(id)sender
|
||||||
|
@ -870,8 +858,6 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
|
||||||
[mainWindow showHDCDLogo:NO];
|
[mainWindow showHDCDLogo:NO];
|
||||||
MiniWindow * miniWindow = (MiniWindow *) appController.miniWindow;
|
MiniWindow * miniWindow = (MiniWindow *) appController.miniWindow;
|
||||||
[miniWindow showHDCDLogo:NO];
|
[miniWindow showHDCDLogo:NO];
|
||||||
[hdcdLogoTimer invalidate];
|
|
||||||
hdcdLogoTimer = nil;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)playlistDidChange:(PlaylistController *)p
|
- (void)playlistDidChange:(PlaylistController *)p
|
||||||
|
|
Loading…
Reference in New Issue