[eyetunes commit] r262 - in EyeTunes/trunk: . MainMenu.nib
codesite...@google.com
Date: Wed Aug 27 23:58:08 2008
New Revision: 262
Modified:
EyeTunes/trunk/DebugController.m
EyeTunes/trunk/ETEyeTunes.h
EyeTunes/trunk/ETEyeTunes.m
EyeTunes/trunk/MainMenu.nib/classes.nib
EyeTunes/trunk/MainMenu.nib/info.nib
EyeTunes/trunk/MainMenu.nib/keyedobjects.nib
Log:
* added addTrack:toPlaylist: call
* fixed test apps nib
* test apps go button puts intended on the test app ui
Modified: EyeTunes/trunk/DebugController.m
==============================================================================
--- EyeTunes/trunk/DebugController.m (original)
+++ EyeTunes/trunk/DebugController.m Wed Aug 27 23:58:08 2008
@@ -122,10 +122,12 @@
NSArray *artworks = [track artwork];
- if ([artworks count] > 0) {
+ if ([artworks count] > 0)
+ {
[self _append:@"Artwork found"];
NSImage *testImage = [artworks objectAtIndex:0];
- [track setArtwork:testImage atIndex:1];
+ [imageView setImage:testImage];
+ //[track setArtwork:testImage atIndex:1];
}
else {
[self _append:@"No artwork found"];
@@ -138,6 +140,9 @@
[self _append:[NSString stringWithFormat:@"database ID: %d", [track
databaseId]]];
[self _append:@"\n"];
+ [trackName setStringValue:[NSString stringWithFormat:@"track
name: %@",[track name]]];
+ [albumName setStringValue:[NSString stringWithFormat:@"album
name: %@",[track album]]];
+ [artistName setStringValue:[NSString stringWithFormat:@"artist
name: %@",[track artist]]];
}
@end
Modified: EyeTunes/trunk/ETEyeTunes.h
==============================================================================
--- EyeTunes/trunk/ETEyeTunes.h (original)
+++ EyeTunes/trunk/ETEyeTunes.h Wed Aug 27 23:58:08 2008
@@ -92,7 +92,8 @@
- (void)rewind;
- (void)stop;
-// TODO: - (id)addTrack:(NSURL *)fromlocation toLocation:(NSURL
*)toLocation;
+- (id)addTrack:(NSURL *)fromLocation toPlaylist:(ETPlaylist *)playlist;
+
// TODO: - (id)convertTrack:(id)trackReference;
// TODO: - (void)refresh:(id)fileTrack;
// TODO: - (void)update:(id)iPod;
Modified: EyeTunes/trunk/ETEyeTunes.m
==============================================================================
--- EyeTunes/trunk/ETEyeTunes.m (original)
+++ EyeTunes/trunk/ETEyeTunes.m Wed Aug 27 23:58:08 2008
@@ -453,6 +453,94 @@
}
+
+- (id)addTrack:(NSURL *)fromLocation toPlaylist:(ETPlaylist *)playlist;
+{
+ OSErr err;
+ AppleEvent getEvent, replyEvent;
+ AEDescList replyList;
+ NSString *gizmo = nil;
+ NSMutableArray *trackList = nil;
+
+ AliasHandle alias = [EyeTunes newAliasHandleWithPath:[fromlocation path]];
+
+ if (!playlist)
+ {
+ gizmo = @"'----':@@";
+ }
+ else
+ {
+ gizmo = [NSString stringWithFormat:@"'----':alis(@@), insh:(@)"];
+ }
+
+ AEBuildError buildError;
+
+ err = AEBuildAppleEvent(iTunesSignature, // class
+ ET_ADD_FILE, // ID
+ typeApplSignature, // address type
+ &iTunesSignature, // address data
+ sizeof(iTunesSignature), // address length
+ kAutoGenerateReturnID, // return ID
+ kAnyTransactionID, //transaction ID
+ &getEvent, // result
+ &buildError, // error
+ [gizmo UTF8String], // params format
+ alias, // ... (var args)
+ [playlist descriptor]);
+
+ DisposeHandle((Handle)alias);
+
+ if (err != noErr) {
+ ETLog(@"Error creating Apple Event: %d", err);
+ return nil;
+ }
+
+ err = AESendMessage(&getEvent, &replyEvent, kAEWaitReply +
kAENeverInteract, kAEDefaultTimeout);
+ if (err != noErr) {
+ ETLog(@"Error sending AppleEvent: %d", err);
+ goto cleanup_get_event;
+ }
+
+ /* Read Results */
+ err = AEGetParamDesc(&replyEvent, keyDirectObject, typeAEList,
&replyList);
+ if (err != noErr) {
+ ETLog(@"Error extracting from reply event: %d", err);
+ goto cleanup_reply_event;
+ }
+
+ long items, i;
+ err = AECountItems(&replyList, &items);
+ if (err != noErr) {
+ ETLog(@"Unable to access Reply List: %d", err);
+ goto cleanup_reply_list;
+ }
+
+ trackList = [NSMutableArray arrayWithCapacity:items];
+ for (i = 1; i < items + 1; i++) {
+ AEDesc trackDesc;
+ err = AEGetNthDesc(&replyList,
+ i,
+ typeWildCard,
+ 0,
+ &trackDesc);
+ if (err != noErr) {
+ ETLog(@"Error rextracting from List: %d", err);
+ goto cleanup_reply_list;
+ }
+ [trackList addObject:[[[ETTrack alloc] initWithDescriptor:&trackDesc]
autorelease]];
+ }
+
+cleanup_reply_list:
+ AEDisposeDesc(&replyList);
+cleanup_reply_event:
+ AEDisposeDesc(&replyEvent);
+cleanup_get_event:
+ AEDisposeDesc(&getEvent);
+
+ return trackList;
+}
+
+
- (NSArray *)selectedTracks
{
OSErr err;
Modified: EyeTunes/trunk/MainMenu.nib/classes.nib
==============================================================================
--- EyeTunes/trunk/MainMenu.nib/classes.nib (original)
+++ EyeTunes/trunk/MainMenu.nib/classes.nib Wed Aug 27 23:58:08 2008
@@ -1,24 +1,61 @@
-{
- IBClasses = (
- {
- ACTIONS = {goButtonPressed = id; next = id; playPause = id;
prev = id; };
- CLASS = DebugController;
- LANGUAGE = ObjC;
- OUTLETS = {
- albumName = NSTextField;
- artistName = NSTextField;
- goButton = NSButton;
- imageView = NSImageView;
- nextButton = NSButton;
- output = NSTextView;
- playButton = NSButton;
- prevButton = NSButton;
- trackName = NSTextField;
- window = NSWindow;
- };
- SUPERCLASS = NSObject;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST
1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>goButtonPressed</key>
+ <string>id</string>
+ <key>next</key>
+ <string>id</string>
+ <key>playPause</key>
+ <string>id</string>
+ <key>prev</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>DebugController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>albumName</key>
+ <string>NSTextField</string>
+ <key>artistName</key>
+ <string>NSTextField</string>
+ <key>goButton</key>
+ <string>NSButton</string>
+ <key>imageView</key>
+ <string>NSImageView</string>
+ <key>nextButton</key>
+ <string>NSButton</string>
+ <key>output</key>
+ <string>NSTextView</string>
+ <key>playButton</key>
+ <string>NSButton</string>
+ <key>prevButton</key>
+ <string>NSButton</string>
+ <key>trackName</key>
+ <string>NSTextField</string>
+ <key>window</key>
+ <string>NSWindow</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: EyeTunes/trunk/MainMenu.nib/info.nib
==============================================================================
--- EyeTunes/trunk/MainMenu.nib/info.nib (original)
+++ EyeTunes/trunk/MainMenu.nib/info.nib Wed Aug 27 23:58:08 2008
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST
1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST
1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>112 13 356 240 0 0 1440 878 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>111 303 338 44 0 0 1440 878 </string>
- </dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>670</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>EyeTunes.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
+ <integer>2</integer>
<integer>29</integer>
- <integer>21</integer>
</array>
<key>IBSystem Version</key>
- <string>8P2137</string>
+ <string>9E17</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Modified: EyeTunes/trunk/MainMenu.nib/keyedobjects.nib
==============================================================================
Binary files. No diff available.