diff --git a/Medianno.xcodeproj/project.pbxproj b/Medianno.xcodeproj/project.pbxproj index 64678c5..826043a 100644 --- a/Medianno.xcodeproj/project.pbxproj +++ b/Medianno.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 95D803AD1403505F000C0779 /* del.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AC1403505F000C0779 /* del.icns */; }; 95D803B0140355E6000C0779 /* custom.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AE140355E6000C0779 /* custom.icns */; }; 95D803B1140355E6000C0779 /* print.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AF140355E6000C0779 /* print.icns */; }; - 95E2027D13FE9BF500369B31 /* MAMovieWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 95E2027C13FE9BF500369B31 /* MAMovieWindow.m */; }; + 95E2027D13FE9BF500369B31 /* MAMovieWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95E2027C13FE9BF500369B31 /* MAMovieWindow.mm */; }; 95E2028113FE9C6C00369B31 /* MAMovie.xib in Resources */ = {isa = PBXBuildFile; fileRef = 95E2027F13FE9C6C00369B31 /* MAMovie.xib */; }; 95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */; }; /* End PBXBuildFile section */ @@ -103,7 +103,7 @@ 95D803AE140355E6000C0779 /* custom.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = custom.icns; path = Resources/custom.icns; sourceTree = ""; }; 95D803AF140355E6000C0779 /* print.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = print.icns; path = Resources/print.icns; sourceTree = ""; }; 95E2027B13FE9BF500369B31 /* MAMovieWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAMovieWindow.h; sourceTree = ""; }; - 95E2027C13FE9BF500369B31 /* MAMovieWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAMovieWindow.m; sourceTree = ""; }; + 95E2027C13FE9BF500369B31 /* MAMovieWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAMovieWindow.mm; sourceTree = ""; }; 95E2028013FE9C6C00369B31 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Medianno/en.lproj/MAMovie.xib; sourceTree = ""; }; 95E8C26513FD72D2004E9839 /* MAColorForURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAColorForURL.h; sourceTree = ""; }; 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAColorForURL.mm; sourceTree = ""; }; @@ -235,7 +235,7 @@ 95CB697614001F26005A0346 /* MAColorForTag.h */, 95CB697714001F26005A0346 /* MAColorForTag.mm */, 95E2027B13FE9BF500369B31 /* MAMovieWindow.h */, - 95E2027C13FE9BF500369B31 /* MAMovieWindow.m */, + 95E2027C13FE9BF500369B31 /* MAMovieWindow.mm */, 95D8038914012D7A000C0779 /* MADragging.h */, 95D8038A14012D7A000C0779 /* MADragging.mm */, 9556F183140426EB00B81D2E /* MAToolbarButton.h */, @@ -336,7 +336,7 @@ 95BCFA2E13F8A3AD000F650F /* MAShortenQTTime.mm in Sources */, 95CA841113FC149B00AE5AC4 /* MATokenFieldCell.mm in Sources */, 95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */, - 95E2027D13FE9BF500369B31 /* MAMovieWindow.m in Sources */, + 95E2027D13FE9BF500369B31 /* MAMovieWindow.mm in Sources */, 95CB69711400112A005A0346 /* MATagWindow.mm in Sources */, 95CB697814001F26005A0346 /* MAColorForTag.mm in Sources */, 95D8038B14012D7A000C0779 /* MADragging.mm in Sources */, @@ -465,7 +465,7 @@ 950BB68B13F1F26200D8E669 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_OBJC_GC = required; + GCC_ENABLE_OBJC_GC = unsupported; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; @@ -479,7 +479,7 @@ 950BB68C13F1F26200D8E669 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_OBJC_GC = required; + GCC_ENABLE_OBJC_GC = unsupported; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; diff --git a/Medianno/MAAddMediaSheet.mm b/Medianno/MAAddMediaSheet.mm index 83ac080..3009435 100644 --- a/Medianno/MAAddMediaSheet.mm +++ b/Medianno/MAAddMediaSheet.mm @@ -40,6 +40,8 @@ } [[self window] orderOut:self]; [self autorelease]; + [media release]; + media = nil; }]; } diff --git a/Medianno/MAAnno.mm b/Medianno/MAAnno.mm index 6603ed7..5f42280 100644 --- a/Medianno/MAAnno.mm +++ b/Medianno/MAAnno.mm @@ -41,6 +41,7 @@ - (void)dealloc { [contents release]; + [super dealloc]; } + (id)arrayWithArray:(NSArray *)array diff --git a/Medianno/MADocWindow.h b/Medianno/MADocWindow.h index f370096..d90f154 100644 --- a/Medianno/MADocWindow.h +++ b/Medianno/MADocWindow.h @@ -26,9 +26,9 @@ QTTime lastMovieTime; } -@property BOOL exportAnnotations; -@property BOOL exportTags; -@property (retain) NSString * searchString; +@property BOOL exportAnnotations; +@property BOOL exportTags; +@property (nonatomic,retain)NSString * searchString; - (IBAction)addMediaFiles:(id)sender; - (IBAction)importText:(id)sender; diff --git a/Medianno/MADocWindow.mm b/Medianno/MADocWindow.mm index 2bf4169..ee17070 100644 --- a/Medianno/MADocWindow.mm +++ b/Medianno/MADocWindow.mm @@ -36,6 +36,13 @@ static const char * kMADocWindowObserver = "MADocWindowObserver"; return self; } +- (void)dealloc +{ + [currentMovie release]; + [searchString release]; + [super dealloc]; +} + - (void)windowDidLoad { [super windowDidLoad]; @@ -47,10 +54,6 @@ static const char * kMADocWindowObserver = "MADocWindowObserver"; [self registerOurDragTypes]; } -- (void)dealloc -{ -} - - (MAMovieWindow *)moviePanel { return [[NSApp delegate] moviePanel]; @@ -93,6 +96,7 @@ static const char * kMADocWindowObserver = "MADocWindowObserver"; // // Current movie changed // + [currentMovie release]; if (MAMedia * currentMedia = [self currentMedia]) { NSURL * mediaURL = [NSURL URLWithString:[currentMedia media]]; currentMovie = [[QTMovie alloc] initWithURL:mediaURL error:nil]; @@ -227,6 +231,7 @@ static const char * kMADocWindowObserver = "MADocWindowObserver"; NSDictionary * attributes = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:QTMovieFlatten]; [exportMovie writeToFile:[url path] withAttributes:attributes]; + [exportMovie release]; } #define kMAAudioTypes @"m4a", @"aiff", @"aif", @"wav", @"caf", @"mp3" @@ -509,7 +514,10 @@ static NSTimeInterval sLastSkip = 0.0; - (void)setSearchString:(NSString *)str { [self willChangeValueForKey:@"searchString"]; - searchString = str; + if (searchString != str) { + [searchString release]; + searchString = [str retain]; + } if (!searchString || [searchString isEqual:@""]) { [mediaController setFilterPredicate:nil]; [annotationController setFilterPredicate:nil]; diff --git a/Medianno/MADocument.mm b/Medianno/MADocument.mm index 4ea55e6..a7c6d27 100644 --- a/Medianno/MADocument.mm +++ b/Medianno/MADocument.mm @@ -31,6 +31,7 @@ { MADocWindow * windowController = [[MADocWindow alloc] initWithWindowNibName:[self windowNibName]]; [self addWindowController:windowController]; + [windowController release]; } + (BOOL)autosavesInPlace diff --git a/Medianno/MAMovieWindow.m b/Medianno/MAMovieWindow.mm similarity index 100% rename from Medianno/MAMovieWindow.m rename to Medianno/MAMovieWindow.mm diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib index 2212a88..cd07e01 100644 --- a/Medianno/en.lproj/MADocument.xib +++ b/Medianno/en.lproj/MADocument.xib @@ -158,12 +158,9 @@ << - + 268 {{0, 14}, {32, 32}} - - - _NS:1491 YES @@ -252,12 +249,9 @@ >> - + 268 {{0, 14}, {32, 32}} - - - _NS:1491 YES @@ -320,12 +314,9 @@ Search - + 268 {{0, 14}, {96, 22}} - - - _NS:123 100 YES diff --git a/Medianno/en.lproj/MATag.xib b/Medianno/en.lproj/MATag.xib index e60cf15..c2d5269 100644 --- a/Medianno/en.lproj/MATag.xib +++ b/Medianno/en.lproj/MATag.xib @@ -158,12 +158,9 @@ Search - + 268 {{0, 14}, {96, 22}} - - - _NS:123 100 YES