r1434 - in trunk: CompactDisc Controllers CueSheet FileConversion Rippers Tasks/RipperTasks
noti...@svn.sbooth.org
Date: 2011-01-12 13:47:23 -0800 (Wed, 12 Jan 2011)
New Revision: 1434
Modified:
trunk/CompactDisc/CompactDiscDocumentToolbar.m
trunk/Controllers/ApplicationController.m
trunk/Controllers/EncoderController.m
trunk/Controllers/RipperController.m
trunk/CueSheet/CueSheetDocumentToolbar.m
trunk/FileConversion/FileArrayController.m
trunk/FileConversion/FileConversionController.m
trunk/FileConversion/FileConversionToolbar.m
trunk/Rippers/BasicRipper.m
trunk/Rippers/ComparisonRipper.m
trunk/Rippers/ParanoiaRipper.m
trunk/Tasks/RipperTasks/RipperTask.m
Log:
Updated loops to use fast enumeration
Modified: trunk/CompactDisc/CompactDiscDocumentToolbar.m
===================================================================
--- trunk/CompactDisc/CompactDiscDocumentToolbar.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/CompactDisc/CompactDiscDocumentToolbar.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -49,10 +49,8 @@
{
NSArray *visibleItems = [self visibleItems];
NSToolbarItem *item;
- NSEnumerator *enumerator;
- enumerator = [visibleItems objectEnumerator];
- while((item = [enumerator nextObject])) {
+ for(item in visibleItems) {
if([item action] == @selector(encode:))
[item setEnabled:[_document encodeAllowed]];
if([item action] == @selector(queryMusicBrainz:))
Modified: trunk/Controllers/ApplicationController.m
===================================================================
--- trunk/Controllers/ApplicationController.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Controllers/ApplicationController.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -233,8 +233,7 @@
[[FileConversionController sharedController] showWindow:self];
- enumerator = [filenames objectEnumerator];
- while((filename = [enumerator nextObject])) {
+ for(filename in filenames) {
[[FileConversionController sharedController] addFile:filename];
}
}
@@ -360,13 +359,11 @@
NSArray *urlArray;
NSURL *url;
NSMutableArray *filenamesArray;
- NSEnumerator *enumerator;
urlArray = (NSArray *)directParameter;
filenamesArray = [NSMutableArray arrayWithCapacity:[urlArray count]];
- enumerator = [urlArray objectEnumerator];
- while((url = [enumerator nextObject])) {
+ for(url in urlArray) {
if([url isFileURL]) {
[filenamesArray addObject:[url path]];
}
Modified: trunk/Controllers/EncoderController.m
===================================================================
--- trunk/Controllers/EncoderController.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Controllers/EncoderController.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -187,11 +187,9 @@
- (BOOL) documentHasEncoderTasks:(CompactDiscDocument *)document
{
- NSEnumerator *enumerator;
EncoderTask *current;
- enumerator = [_tasks objectEnumerator];
- while((current = [enumerator nextObject])) {
+ for(current in _tasks) {
if([document isEqual:[[[[current taskInfo] inputTracks] objectAtIndex:0] document]])
return YES;
}
Modified: trunk/Controllers/RipperController.m
===================================================================
--- trunk/Controllers/RipperController.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Controllers/RipperController.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -157,11 +157,9 @@
}
// Create one RipperTask per track
else {
- NSEnumerator *enumerator;
Track *track;
- enumerator = [tracks objectEnumerator];
- while((track = [enumerator nextObject])) {
+ for(track in tracks) {
switch(selectedRipper) {
case kBasicRipper: ripperTask = [[BasicRipperTask alloc] initWithTracks:[NSArray arrayWithObject:track]]; break;
case kComparisonRipper: ripperTask = [[ComparisonRipperTask alloc] initWithTracks:[NSArray arrayWithObject:track]]; break;
@@ -188,11 +186,9 @@
- (BOOL) documentHasRipperTasks:(CompactDiscDocument *)document
{
- NSEnumerator *enumerator;
RipperTask *current;
- enumerator = [_tasks objectEnumerator];
- while((current = [enumerator nextObject])) {
+ for(current in _tasks) {
if([document isEqual:[[current objectInTracksAtIndex:0] document]]) {
return YES;
}
@@ -360,8 +356,7 @@
}
// Iterate through a second time and spawn threads for non-active devices
- enumerator = [_tasks objectEnumerator];
- while((task = [enumerator nextObject])) {
+ for(task in _tasks) {
deviceName = [task deviceName];
if(NO == [task started] && NO == [activeDrives containsObject:deviceName]) {
[activeDrives addObject:deviceName];
Modified: trunk/CueSheet/CueSheetDocumentToolbar.m
===================================================================
--- trunk/CueSheet/CueSheetDocumentToolbar.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/CueSheet/CueSheetDocumentToolbar.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -48,10 +48,8 @@
{
NSArray *visibleItems = [self visibleItems];
NSToolbarItem *item;
- NSEnumerator *enumerator;
- enumerator = [visibleItems objectEnumerator];
- while((item = [enumerator nextObject])) {
+ for(item in visibleItems) {
if([item action] == @selector(encode:))
[item setEnabled:[_document encodeAllowed]];
else if([item action] == @selector(queryMusicBrainz:))
Modified: trunk/FileConversion/FileArrayController.m
===================================================================
--- trunk/FileConversion/FileArrayController.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/FileConversion/FileArrayController.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -194,13 +194,12 @@
- (NSIndexSet *) indexSetForRows:(NSArray *)rows
{
NSArray *arrangedObjects = [self arrangedObjects];
- NSEnumerator *rowEnumerator = [rows objectEnumerator];
NSEnumerator *enumerator = nil;
NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet];
id object;
NSString *filename;
- while((filename = [rowEnumerator nextObject])) {
+ for(filename in rows) {
enumerator = [arrangedObjects objectEnumerator];
while((object = [enumerator nextObject])) {
if([[object valueForKey:@"filename"] isEqualToString:filename]) {
Modified: trunk/FileConversion/FileConversionController.m
===================================================================
--- trunk/FileConversion/FileConversionController.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/FileConversion/FileConversionController.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -351,7 +351,6 @@
NSArray *subpaths;
BOOL isDir;
NSString *subpath;
- NSEnumerator *enumerator;
NSString *composedPath;
BOOL result;
BOOL success = YES;
@@ -364,8 +363,7 @@
if(isDir) {
subpaths = [manager subpathsAtPath:filename];
- enumerator = [subpaths objectEnumerator];
- while((subpath = [enumerator nextObject])) {
+ for(subpath in subpaths) {
loopPool = [[NSAutoreleasePool alloc] init];
composedPath = [NSString stringWithFormat:@"%@/%@", filename, subpath];
Modified: trunk/FileConversion/FileConversionToolbar.m
===================================================================
--- trunk/FileConversion/FileConversionToolbar.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/FileConversion/FileConversionToolbar.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -38,10 +38,8 @@
{
NSArray *visibleItems = [self visibleItems];
NSToolbarItem *item;
- NSEnumerator *enumerator;
- enumerator = [visibleItems objectEnumerator];
- while((item = [enumerator nextObject])) {
+ for(item in visibleItems) {
if([item action] == @selector(encode:))
[item setEnabled:[[FileConversionController sharedController] encodeAllowed]];
// if([item action] == @selector(queryMusicBrainz:))
Modified: trunk/Rippers/BasicRipper.m
===================================================================
--- trunk/Rippers/BasicRipper.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Rippers/BasicRipper.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -66,7 +66,6 @@
AudioFileID audioFile;
ExtAudioFileRef extAudioFileRef;
AudioStreamBasicDescription outputASBD;
- NSEnumerator *enumerator;
SectorRange *range;
// Tell our owner we are starting
@@ -99,8 +98,7 @@
err = ExtAudioFileWrapAudioFileID(audioFile, YES, &extAudioFileRef);
NSAssert2(noErr == err, NSLocalizedStringFromTable(@"The call to %@ failed.", @"Exceptions", @""), @"ExtAudioFileWrapAudioFileID", UTCreateStringForOSType(err));
- enumerator = [_sectors objectEnumerator];
- while((range = [enumerator nextObject])) {
+ for(range in _sectors) {
[self ripSectorRange:range toFile:extAudioFileRef];
_sectorsRead += [range length];
}
Modified: trunk/Rippers/ComparisonRipper.m
===================================================================
--- trunk/Rippers/ComparisonRipper.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Rippers/ComparisonRipper.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -131,7 +131,6 @@
AudioFileID audioFile;
ExtAudioFileRef extAudioFileRef;
AudioStreamBasicDescription outputASBD;
- NSEnumerator *enumerator;
SectorRange *range;
uint16_t driveSpeed;
@@ -168,8 +167,7 @@
driveSpeed = [_drive speed];
// Process each sector range
- enumerator = [_sectors objectEnumerator];
- while((range = [enumerator nextObject])) {
+ for(range in _sectors) {
[self ripSectorRange:range toFile:extAudioFileRef];
_sectorsRead += [range length];
}
Modified: trunk/Rippers/ParanoiaRipper.m
===================================================================
--- trunk/Rippers/ParanoiaRipper.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Rippers/ParanoiaRipper.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -166,7 +166,6 @@
AudioFileID audioFile;
ExtAudioFileRef extAudioFileRef;
AudioStreamBasicDescription outputASBD;
- NSEnumerator *enumerator;
SectorRange *range;
@try {
@@ -199,8 +198,7 @@
err = ExtAudioFileWrapAudioFileID(audioFile, YES, &extAudioFileRef);
NSAssert2(noErr == err, NSLocalizedStringFromTable(@"The call to %@ failed.", @"Exceptions", @""), @"ExtAudioFileWrapAudioFileID", UTCreateStringForOSType(err));
- enumerator = [_sectors objectEnumerator];
- while((range = [enumerator nextObject])) {
+ for(range in _sectors) {
[self ripSectorRange:range toFile:extAudioFileRef];
_sectorsRead = [NSNumber numberWithUnsignedLong:[_sectorsRead unsignedLongValue] + [range length]];
}
Modified: trunk/Tasks/RipperTasks/RipperTask.m
===================================================================
--- trunk/Tasks/RipperTasks/RipperTask.m 2011-01-12 21:43:22 UTC (rev 1433)
+++ trunk/Tasks/RipperTasks/RipperTask.m 2011-01-12 21:47:23 UTC (rev 1434)
@@ -37,7 +37,6 @@
- (id) initWithTracks:(NSArray *)tracks
{
Track *track;
- NSEnumerator *enumerator;
NSParameterAssert(nil != tracks);
NSParameterAssert(0 != [tracks count]);
@@ -50,8 +49,7 @@
_deviceName = [[[[_tracks objectAtIndex:0] document] disc] deviceName];
_sectors = [[NSMutableArray alloc] initWithCapacity:[tracks count]];
- enumerator = [_tracks objectEnumerator];
- while((track = [enumerator nextObject])) {
+ for(track in _tracks) {
// Don't try to rip data tracks
if([track dataTrack]) {
@@ -118,15 +116,13 @@
- (void) setStopped :(BOOL)stopped
{
Track *track;
- NSEnumerator *enumerator;
[super setStopped:stopped];
// Once we're stopped, invalidate the connection
[_connection invalidate];
- enumerator = [_tracks objectEnumerator];
- while((track = [enumerator nextObject])) {
+ for(track in _tracks) {
[track setRipInProgress:NO];
}
@@ -138,15 +134,13 @@
- (void) setCompleted:(BOOL)completed
{
Track *track;
- NSEnumerator *enumerator;
[super setCompleted:completed];
// Once we're complete, invalidate the connection
[_connection invalidate];
- enumerator = [_tracks objectEnumerator];
- while((track = [enumerator nextObject])) {
+ for(track in _tracks) {
[track setRipInProgress:NO];
}