From 1e64b5d75911f02ab001d77a2036b9812cc9125a Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Mon, 2 Dec 2002 00:45:25 +0000 Subject: [PATCH] Played around with some things. There is a massive mem leak in runScriptAndReturnResult... --- English.lproj/Preferences.nib/classes.nib | 1 + English.lproj/Preferences.nib/objects.nib | Bin 16368 -> 10326 bytes MenuTunes.m | 6 ++++++ PreferencesController.h | 1 + PreferencesController.m | 11 +++++++++++ 5 files changed, 19 insertions(+) diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib index 10e4f8f..1a160da 100755 --- a/English.lproj/Preferences.nib/classes.nib +++ b/English.lproj/Preferences.nib/classes.nib @@ -22,6 +22,7 @@ albumCheckbox = NSButton; allTableView = NSTableView; artistCheckbox = NSButton; + hotKeyTextField = NSTextField; keyComboField = NSTextField; keyComboPanel = NSPanel; launchAtLoginCheckbox = NSButton; diff --git a/English.lproj/Preferences.nib/objects.nib b/English.lproj/Preferences.nib/objects.nib index d14359cc7b25af24d1c9d42469c35b924c57db9f..b5577cf99facc356661c359644d50f590437d573 100755 GIT binary patch literal 10326 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 diff --git a/MenuTunes.m b/MenuTunes.m index 0227042..ad39b32 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -15,6 +15,9 @@ Things to do: - going to need a different way of defining key combos ¥ Optimize, this thing is big and slow :( ¥ Apple Events! Apple Events! Apple Events! + +¥ I think I found a slight memory leak: + 425 MenuTunes 7.8% 8:29.87 1 56 4827 215M+ 3.14M 135M- 599M+ */ #import "MenuTunes.h" @@ -400,6 +403,8 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; buffer = malloc(length); AEGetDescData(&resultDesc, buffer, length); + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); result = [NSString stringWithCString:buffer length:length]; if (![result isEqualToString:@""] && ([result characterAtIndex:0] == '\"') && @@ -407,6 +412,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; { result = [result substringWithRange:NSMakeRange(1, [result length] - 2)]; } + [script release]; free(buffer); buffer = NULL; return result; diff --git a/PreferencesController.h b/PreferencesController.h index e03a1c8..faf4ad1 100755 --- a/PreferencesController.h +++ b/PreferencesController.h @@ -9,6 +9,7 @@ IBOutlet NSButton *albumCheckbox; IBOutlet NSTableView *allTableView; IBOutlet NSButton *artistCheckbox; + IBOutlet NSTextField *hotKeyTextField; IBOutlet NSTextField *keyComboField; IBOutlet NSPanel *keyComboPanel; IBOutlet NSButton *launchAtLoginCheckbox; diff --git a/PreferencesController.m b/PreferencesController.m index 4a2d389..7384be5 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -465,6 +465,17 @@ [keyComboField setStringValue:string]; } +// +// +// Text Field Delegate +// +// + +- (void)controlTextDidChange:(NSNotification *)note +{ + NSLog(@"%@", [note userInfo]); +} + // // // Table View Datasource Methods -- 2.20.1