Tons of changes. Fixed the iPod problem finally. Added composer to

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index e0230ff..940766c 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -588,6 +588,11 @@ static MainController *sharedController;
 //
 //
 
 //
 //
 

+- (MenuController *)menuController
+{
+    return menuController;
+}
+

 - (void)closePreferences
 {
     ITDebugLog(@"Preferences closed.");
 - (void)closePreferences
 {
     ITDebugLog(@"Preferences closed.");


@@ -759,6 +764,7 @@ static MainController *sharedController;
     NSString               *title       = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *title       = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;

+    NSString               *composer    = nil;

     NSString               *time        = nil;
     NSString               *track       = nil;
     NSImage                *art         = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
     NSImage                *art         = nil;


@@ -791,6 +797,14 @@ static MainController *sharedController;
             NS_ENDHANDLER
         }
 
             NS_ENDHANDLER
         }
 

+        if ( [df boolForKey:@"showComposer"] ) {
+            NS_DURING
+                composer = [[self currentRemote] currentSongComposer];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+

         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",
         if ( [df boolForKey:@"showTime"] ) {
             NS_DURING
                 time = [NSString stringWithFormat:@"%@: %@ / %@",


@@ -853,6 +867,7 @@ static MainController *sharedController;
                                                    title:title
                                                    album:album
                                                   artist:artist
                                                    title:title
                                                    album:album
                                                   artist:artist

+                                                composer:composer

                                                     time:time
                                                    track:track
                                                   rating:rating
                                                     time:time
                                                    track:track
                                                   rating:rating