git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding initial work on new plugin API. THIS BREAKS MT. We are working to
[MenuTunes.git]
/
MainController.m
diff --git
a/MainController.m
b/MainController.m
index
f91975f
..
eacfd0d
100755
(executable)
--- a/
MainController.m
+++ b/
MainController.m
@@
-142,7
+142,7
@@
static MainController *sharedController;
- (BOOL)songIsPlaying
{
- (BOOL)songIsPlaying
{
- return ( ! ([[currentRemote
currentSong
UniqueIdentifier] isEqualToString:@"0-0"]) );
+ return ( ! ([[currentRemote
playerState
UniqueIdentifier] isEqualToString:@"0-0"]) );
}
- (BOOL)radioIsPlaying
}
- (BOOL)radioIsPlaying
@@
-152,7
+152,7
@@
static MainController *sharedController;
- (BOOL)songChanged
{
- (BOOL)songChanged
{
- return ( ! [[currentRemote
currentSong
UniqueIdentifier] isEqualToString:_latestSongIdentifier] );
+ return ( ! [[currentRemote
playerState
UniqueIdentifier] isEqualToString:_latestSongIdentifier] );
}
- (NSString *)latestSongIdentifier
}
- (NSString *)latestSongIdentifier
@@
-174,7
+174,7
@@
static MainController *sharedController;
( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
if ([self songChanged]) {
( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
if ([self songChanged]) {
- [self setLatestSongIdentifier:[currentRemote
currentSong
UniqueIdentifier]];
+ [self setLatestSongIdentifier:[currentRemote
playerState
UniqueIdentifier]];
latestPlaylistClass = [currentRemote currentPlaylistClass];
[menuController rebuildSubmenus];
latestPlaylistClass = [currentRemote currentPlaylistClass];
[menuController rebuildSubmenus];