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

Make media time reflect selected annotation

Browse Source
This commit is contained in:
Matthias Neeracher 2011-08-14 01:57:32 +02:00
parent 454adfb9d1
commit 0f02a397de
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Medianno/MADocWindow.h
View File

@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface MADocWindow : NSWindowController <NSTokenFieldCellDelegate> { @interface MADocWindow : NSWindowController <NSTokenFieldCellDelegate,NSTableViewDelegate> {
IBOutlet NSArrayController* mediaController; IBOutlet NSArrayController* mediaController;
IBOutlet NSArrayController* annotationController; IBOutlet NSArrayController* annotationController;
IBOutlet QTMovieView * movieView; IBOutlet QTMovieView * movieView;

11
Medianno/MADocWindow.mm
View File

@ -11,6 +11,7 @@
#import "MADocWindow.h" #import "MADocWindow.h"
#import "MAAddMediaSheet.h" #import "MAAddMediaSheet.h"
#import "MADocument.h" #import "MADocument.h"
#import "MAAnno.h"
@implementation MADocWindow @implementation MADocWindow
@ -206,6 +207,16 @@ static NSTimeInterval sLastSkip = 0.0;
return subview != [[splitView subviews] objectAtIndex:0]; return subview != [[splitView subviews] objectAtIndex:0];
} }
#pragma mark Annotation Table
- (void)tableViewSelectionDidChange:(NSNotification *)notification
{
NSArray * selection = [annotationController selectedObjects];
if ([selection count])
if (MAAnno * firstSelectedAnno = [selection objectAtIndex:0])
[[movieView movie] setCurrentTime:QTTimeFromString([firstSelectedAnno location])];
}
@end @end
@implementation MADocumentWindow @implementation MADocumentWindow

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

@ -644,7 +644,7 @@
</object> </object>
<reference key="NSContentView" ref="1058980817"/> <reference key="NSContentView" ref="1058980817"/>
<int key="NSBorderType">0</int> <int key="NSBorderType">0</int>
<int key="NSBoxType">0</int> <int key="NSBoxType">4</int>
<int key="NSTitlePosition">0</int> <int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool> <bool key="NSTransparent">NO</bool>
<real value="0.0" key="NSBorderWidth2"/> <real value="0.0" key="NSBorderWidth2"/>
@ -1077,6 +1077,14 @@
</object> </object>
<int key="connectionID">100180</int> <int key="connectionID">100180</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="620291245"/>
<reference key="destination" ref="512844837"/>
</object>
<int key="connectionID">100181</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
@ -1468,7 +1476,7 @@
<reference key="dict.values" ref="0"/> <reference key="dict.values" ref="0"/>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">100180</int> <int key="maxID">100181</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">