Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / ITMTRemote.m

diff --git a/ITMTRemote.m b/ITMTRemote.m
index 950e3d6..9a720c4 100755 (executable)
--- a/ITMTRemote.m
+++ b/ITMTRemote.m
@@ -22,14 +22,6 @@
     return nil;
 }
 
     return nil;
 }
 

-- (NSString *)sharedRemoteName
-{
-    NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"];
-    if (!name)
-        name = @"MenuTunes Shared Player";
-    return name;
-}
-

 - (BOOL)begin
 {
     return NO;
 - (BOOL)begin
 {
     return NO;


@@ -74,12 +66,12 @@
 
 - (ITMTRemotePlayerRunningState)playerRunningState
 {
 
 - (ITMTRemotePlayerRunningState)playerRunningState
 {

-    return nil;
+    return ITMTRemotePlayerNotRunning;

 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {

-    return nil;
+    return ITMTRemotePlayerStopped;

 }
 
 - (NSArray *)playlists
 }
 
 - (NSArray *)playlists


@@ -87,24 +79,44 @@
     return nil;
 }
 
     return nil;
 }
 

-- (int)numberOfSongsInPlaylistAtIndex:(int)index
+- (NSArray *)artists

 {
     return nil;
 }
 
 {
     return nil;
 }
 

-- (ITMTRemotePlayerSource)currentSource
+- (NSArray *)albums

 {
     return nil;
 }
 
 {
     return nil;
 }
 

+- (int)numberOfSources
+{
+    return -1;
+}
+
+- (int)numberOfSongsInPlaylistAtIndex:(int)index
+{
+    return -1;
+}
+
+- (ITMTRemotePlayerSource)currentSource
+{
+    return ITMTRemoteLibrarySource;
+}
+
+- (int)currentSourceIndex
+{
+    return -1;
+}
+

 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {

-    return nil;
+    return ITMTRemotePlayerLibraryPlaylist;

 }
 
 - (int)currentPlaylistIndex
 {
 }
 
 - (int)currentPlaylistIndex
 {

-    return nil;
+    return -1;

 }
 
 - (NSString *)songTitleAtIndex:(int)index
 }
 
 - (NSString *)songTitleAtIndex:(int)index


@@ -112,14 +124,19 @@
     return nil;
 }
 
     return nil;
 }
 

+- (BOOL)songEnabledAtIndex:(int)index
+{
+       return NO;
+}
+

 - (int)currentAlbumTrackCount
 {
 - (int)currentAlbumTrackCount
 {

-    return nil;
+    return -1;

 }
 
 - (int)currentSongTrack
 {
 }
 
 - (int)currentSongTrack
 {

-    return nil;
+    return -1;

 }
 
 - (NSString *)playerStateUniqueIdentifier
 }
 
 - (NSString *)playerStateUniqueIdentifier


@@ -129,7 +146,7 @@
 
 - (int)currentSongIndex
 {
 
 - (int)currentSongIndex
 {

-    return nil;
+    return -1;

 }
 
 - (NSString *)currentSongTitle
 }
 
 - (NSString *)currentSongTitle


@@ -142,6 +159,11 @@
     return nil;
 }
 
     return nil;
 }
 

+- (NSString *)currentSongComposer
+{
+    return nil;
+}
+

 - (NSString *)currentSongAlbum
 {
     return nil;
 - (NSString *)currentSongAlbum
 {
     return nil;


@@ -157,6 +179,16 @@
     return nil;
 }
 
     return nil;
 }
 

+- (int)currentSongPlayed
+{
+       return -1;
+}
+
+- (int)currentSongDuration
+{
+       return -1;
+}
+

 - (NSString *)currentSongRemaining
 {
     return nil;
 - (NSString *)currentSongRemaining
 {
     return nil;


@@ -172,9 +204,14 @@
     return nil;
 }
 
     return nil;
 }
 

+- (int)currentSongPlayCount
+{
+    return 0;
+}
+

 - (float)currentSongRating
 {
 - (float)currentSongRating
 {

-    return nil;
+    return 0;

 }
 
 - (BOOL)setCurrentSongRating:(float)rating
 }
 
 - (BOOL)setCurrentSongRating:(float)rating


@@ -182,7 +219,17 @@
     return NO;
 }
 
     return NO;
 }
 

-/* - (BOOL)equalizerEnabled
+- (BOOL)currentSongShufflable
+{
+       return NO;
+}
+
+- (BOOL)setCurrentSongShufflable:(BOOL)shufflable
+{
+       return NO;
+}
+
+- (BOOL)equalizerEnabled

 {
     return NO;
 }
 {
     return NO;
 }


@@ -190,7 +237,7 @@
 - (BOOL)setEqualizerEnabled:(BOOL)enabled
 {
     return NO;
 - (BOOL)setEqualizerEnabled:(BOOL)enabled
 {
     return NO;

-} */
+}

 
 - (NSArray *)eqPresets
 {
 
 - (NSArray *)eqPresets
 {


@@ -199,12 +246,12 @@
 
 - (int)currentEQPresetIndex
 {
 
 - (int)currentEQPresetIndex
 {

-    return nil;
+    return 0;

 }
 
 - (float)volume
 {
 }
 
 - (float)volume
 {

-    return nil;
+    return 0;

 }
 
 - (BOOL)setVolume:(float)volume
 }
 
 - (BOOL)setVolume:(float)volume


@@ -267,6 +314,11 @@
     return NO;
 }
 
     return NO;
 }
 

+- (BOOL)switchToPlaylistAtIndex:(int)index ofSourceAtIndex:(int)index2
+{
+    return NO;
+}
+

 - (BOOL)switchToSongAtIndex:(int)index
 {
     return NO;
 - (BOOL)switchToSongAtIndex:(int)index
 {
     return NO;


@@ -277,4 +329,9 @@
     return NO;
 }
 
     return NO;
 }
 

+- (BOOL)makePlaylistWithTerm:(NSString *)term ofType:(int)type
+{
+    return NO;
+}
+

 @end
 @end