microtherion/Medianno
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch back to reference counted memory

Browse Source
This commit is contained in:
Matthias Neeracher 2011-08-24 05:33:22 +02:00
parent b121d4f4ed
commit 0c2fc028df
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Medianno.xcodeproj/project.pbxproj
View File

@ -43,7 +43,7 @@
95D803AD1403505F000C0779 /* del.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AC1403505F000C0779 /* del.icns */; }; 95D803AD1403505F000C0779 /* del.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AC1403505F000C0779 /* del.icns */; };
95D803B0140355E6000C0779 /* custom.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AE140355E6000C0779 /* custom.icns */; }; 95D803B0140355E6000C0779 /* custom.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AE140355E6000C0779 /* custom.icns */; };
95D803B1140355E6000C0779 /* print.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AF140355E6000C0779 /* print.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 */; }; 95E2028113FE9C6C00369B31 /* MAMovie.xib in Resources */ = {isa = PBXBuildFile; fileRef = 95E2027F13FE9C6C00369B31 /* MAMovie.xib */; };
95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */; }; 95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -103,7 +103,7 @@
95D803AE140355E6000C0779 /* custom.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = custom.icns; path = Resources/custom.icns; sourceTree = "<group>"; }; 95D803AE140355E6000C0779 /* custom.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = custom.icns; path = Resources/custom.icns; sourceTree = "<group>"; };
95D803AF140355E6000C0779 /* print.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = print.icns; path = Resources/print.icns; sourceTree = "<group>"; }; 95D803AF140355E6000C0779 /* print.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = print.icns; path = Resources/print.icns; sourceTree = "<group>"; };
95E2027B13FE9BF500369B31 /* MAMovieWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAMovieWindow.h; sourceTree = "<group>"; }; 95E2027B13FE9BF500369B31 /* MAMovieWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAMovieWindow.h; sourceTree = "<group>"; };
95E2027C13FE9BF500369B31 /* MAMovieWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAMovieWindow.m; sourceTree = "<group>"; }; 95E2027C13FE9BF500369B31 /* MAMovieWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAMovieWindow.mm; sourceTree = "<group>"; };
95E2028013FE9C6C00369B31 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Medianno/en.lproj/MAMovie.xib; sourceTree = "<group>"; }; 95E2028013FE9C6C00369B31 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Medianno/en.lproj/MAMovie.xib; sourceTree = "<group>"; };
95E8C26513FD72D2004E9839 /* MAColorForURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAColorForURL.h; sourceTree = "<group>"; }; 95E8C26513FD72D2004E9839 /* MAColorForURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAColorForURL.h; sourceTree = "<group>"; };
95E8C26613FD72D2004E9839 /* MAColorForURL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAColorForURL.mm; sourceTree = "<group>"; }; 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAColorForURL.mm; sourceTree = "<group>"; };
@ -235,7 +235,7 @@
95CB697614001F26005A0346 /* MAColorForTag.h */, 95CB697614001F26005A0346 /* MAColorForTag.h */,
95CB697714001F26005A0346 /* MAColorForTag.mm */, 95CB697714001F26005A0346 /* MAColorForTag.mm */,
95E2027B13FE9BF500369B31 /* MAMovieWindow.h */, 95E2027B13FE9BF500369B31 /* MAMovieWindow.h */,
95E2027C13FE9BF500369B31 /* MAMovieWindow.m */, 95E2027C13FE9BF500369B31 /* MAMovieWindow.mm */,
95D8038914012D7A000C0779 /* MADragging.h */, 95D8038914012D7A000C0779 /* MADragging.h */,
95D8038A14012D7A000C0779 /* MADragging.mm */, 95D8038A14012D7A000C0779 /* MADragging.mm */,
9556F183140426EB00B81D2E /* MAToolbarButton.h */, 9556F183140426EB00B81D2E /* MAToolbarButton.h */,
@ -336,7 +336,7 @@
95BCFA2E13F8A3AD000F650F /* MAShortenQTTime.mm in Sources */, 95BCFA2E13F8A3AD000F650F /* MAShortenQTTime.mm in Sources */,
95CA841113FC149B00AE5AC4 /* MATokenFieldCell.mm in Sources */, 95CA841113FC149B00AE5AC4 /* MATokenFieldCell.mm in Sources */,
95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */, 95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */,
95E2027D13FE9BF500369B31 /* MAMovieWindow.m in Sources */, 95E2027D13FE9BF500369B31 /* MAMovieWindow.mm in Sources */,
95CB69711400112A005A0346 /* MATagWindow.mm in Sources */, 95CB69711400112A005A0346 /* MATagWindow.mm in Sources */,
95CB697814001F26005A0346 /* MAColorForTag.mm in Sources */, 95CB697814001F26005A0346 /* MAColorForTag.mm in Sources */,
95D8038B14012D7A000C0779 /* MADragging.mm in Sources */, 95D8038B14012D7A000C0779 /* MADragging.mm in Sources */,
@ -465,7 +465,7 @@
950BB68B13F1F26200D8E669 /* Debug */ = { 950BB68B13F1F26200D8E669 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
GCC_ENABLE_OBJC_GC = required; GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist";
@ -479,7 +479,7 @@
950BB68C13F1F26200D8E669 /* Release */ = { 950BB68C13F1F26200D8E669 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
GCC_ENABLE_OBJC_GC = required; GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist";

2
Medianno/MAAddMediaSheet.mm
View File

@ -40,6 +40,8 @@
} }
[[self window] orderOut:self]; [[self window] orderOut:self];
[self autorelease]; [self autorelease];
[media release];
media = nil;
}]; }];
} }

1
Medianno/MAAnno.mm
View File

@ -41,6 +41,7 @@
- (void)dealloc - (void)dealloc
{ {
[contents release]; [contents release];
[super dealloc];
} }
+ (id)arrayWithArray:(NSArray *)array + (id)arrayWithArray:(NSArray *)array

2
Medianno/MADocWindow.h
View File

@ -28,7 +28,7 @@
@property BOOL exportAnnotations; @property BOOL exportAnnotations;
@property BOOL exportTags; @property BOOL exportTags;
@property (retain) NSString * searchString; @property (nonatomic,retain)NSString * searchString;
- (IBAction)addMediaFiles:(id)sender; - (IBAction)addMediaFiles:(id)sender;
- (IBAction)importText:(id)sender; - (IBAction)importText:(id)sender;

18
Medianno/MADocWindow.mm
View File

@ -36,6 +36,13 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
return self; return self;
} }
- (void)dealloc
{
[currentMovie release];
[searchString release];
[super dealloc];
}
- (void)windowDidLoad - (void)windowDidLoad
{ {
[super windowDidLoad]; [super windowDidLoad];
@ -47,10 +54,6 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
[self registerOurDragTypes]; [self registerOurDragTypes];
} }
- (void)dealloc
{
}
- (MAMovieWindow *)moviePanel - (MAMovieWindow *)moviePanel
{ {
return [[NSApp delegate] moviePanel]; return [[NSApp delegate] moviePanel];
@ -93,6 +96,7 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
// //
// Current movie changed // Current movie changed
// //
[currentMovie release];
if (MAMedia * currentMedia = [self currentMedia]) { if (MAMedia * currentMedia = [self currentMedia]) {
NSURL * mediaURL = [NSURL URLWithString:[currentMedia media]]; NSURL * mediaURL = [NSURL URLWithString:[currentMedia media]];
currentMovie = [[QTMovie alloc] initWithURL:mediaURL error:nil]; currentMovie = [[QTMovie alloc] initWithURL:mediaURL error:nil];
@ -227,6 +231,7 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
NSDictionary * attributes = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] NSDictionary * attributes = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES]
forKey:QTMovieFlatten]; forKey:QTMovieFlatten];
[exportMovie writeToFile:[url path] withAttributes:attributes]; [exportMovie writeToFile:[url path] withAttributes:attributes];
[exportMovie release];
} }
#define kMAAudioTypes @"m4a", @"aiff", @"aif", @"wav", @"caf", @"mp3" #define kMAAudioTypes @"m4a", @"aiff", @"aif", @"wav", @"caf", @"mp3"
@ -509,7 +514,10 @@ static NSTimeInterval sLastSkip = 0.0;
- (void)setSearchString:(NSString *)str - (void)setSearchString:(NSString *)str
{ {
[self willChangeValueForKey:@"searchString"]; [self willChangeValueForKey:@"searchString"];
searchString = str; if (searchString != str) {
[searchString release];
searchString = [str retain];
}
if (!searchString || [searchString isEqual:@""]) { if (!searchString || [searchString isEqual:@""]) {
[mediaController setFilterPredicate:nil]; [mediaController setFilterPredicate:nil];
[annotationController setFilterPredicate:nil]; [annotationController setFilterPredicate:nil];

1
Medianno/MADocument.mm
View File

@ -31,6 +31,7 @@
{ {
MADocWindow * windowController = [[MADocWindow alloc] initWithWindowNibName:[self windowNibName]]; MADocWindow * windowController = [[MADocWindow alloc] initWithWindowNibName:[self windowNibName]];
[self addWindowController:windowController]; [self addWindowController:windowController];
[windowController release];
} }
+ (BOOL)autosavesInPlace + (BOOL)autosavesInPlace

0
Medianno/MAMovieWindow.m → Medianno/MAMovieWindow.mm
View File

15
Medianno/en.lproj/MADocument.xib
View File

@ -158,12 +158,9 @@
<string key="NSToolbarItemPaletteLabel">&lt;&lt;</string> <string key="NSToolbarItemPaletteLabel">&lt;&lt;</string>
<nil key="NSToolbarItemToolTip"/> <nil key="NSToolbarItemToolTip"/>
<object class="NSButton" key="NSToolbarItemView" id="401296146"> <object class="NSButton" key="NSToolbarItemView" id="401296146">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {32, 32}}</string> <string key="NSFrame">{{0, 14}, {32, 32}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:1491</string> <string key="NSReuseIdentifierKey">_NS:1491</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="135304652"> <object class="NSButtonCell" key="NSCell" id="135304652">
@ -252,12 +249,9 @@
<string key="NSToolbarItemPaletteLabel">&gt;&gt;</string> <string key="NSToolbarItemPaletteLabel">&gt;&gt;</string>
<nil key="NSToolbarItemToolTip"/> <nil key="NSToolbarItemToolTip"/>
<object class="NSButton" key="NSToolbarItemView" id="734900919"> <object class="NSButton" key="NSToolbarItemView" id="734900919">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {32, 32}}</string> <string key="NSFrame">{{0, 14}, {32, 32}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:1491</string> <string key="NSReuseIdentifierKey">_NS:1491</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="272029418"> <object class="NSButtonCell" key="NSCell" id="272029418">
@ -320,12 +314,9 @@
<string key="NSToolbarItemPaletteLabel">Search</string> <string key="NSToolbarItemPaletteLabel">Search</string>
<nil key="NSToolbarItemToolTip"/> <nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="891639952"> <object class="NSSearchField" key="NSToolbarItemView" id="891639952">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {96, 22}}</string> <string key="NSFrame">{{0, 14}, {96, 22}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:123</string> <string key="NSReuseIdentifierKey">_NS:123</string>
<int key="NSTag">100</int> <int key="NSTag">100</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>

5
Medianno/en.lproj/MATag.xib
View File

@ -158,12 +158,9 @@
<string key="NSToolbarItemPaletteLabel">Search</string> <string key="NSToolbarItemPaletteLabel">Search</string>
<nil key="NSToolbarItemToolTip"/> <nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="1017784973"> <object class="NSSearchField" key="NSToolbarItemView" id="1017784973">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {96, 22}}</string> <string key="NSFrame">{{0, 14}, {96, 22}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:123</string> <string key="NSReuseIdentifierKey">_NS:123</string>
<int key="NSTag">100</int> <int key="NSTag">100</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>