CocoaAndAVFoundation
Fork

(Original repository, No fork origin)

Commit

timeObserver

--- a/testAVFoundation/HMDocument.m

+++ b/testAVFoundation/HMDocument.m

		@@ -17,6 +17,7 @@
17	17	@property (retain, nonatomic) AVURLAsset *asset;
18	18	@property (retain, nonatomic) AVPlayerItem *item;
19	19	@property (retain, nonatomic) AVPlayer *player;
	20	+@property (retain, nonatomic) id timeObserver;
20	21
21	22	@property (retain, nonatomic) CATextLayer *captionLayer;
22	23	@property (copy, nonatomic) NSString *caption;

		@@ -31,6 +32,7 @@
31	32	@synthesize asset = _asset;
32	33	@synthesize item = _item;
33	34	@synthesize player = _player;
	35	+@synthesize timeObserver = _timeObserver;
34	36	@synthesize captionLayer = _captionLayer;
35	37	@synthesize caption = _caption;
36	38

		@@ -136,7 +138,7 @@
136	138	[_asset autorelease];
137	139	_asset = [asset retain];
138	140
139		- [_asset loadValuesAsynchronouslyForKeys:[NSArray arrayWithObject: @"tracks"]
	141	+ [_asset loadValuesAsynchronouslyForKeys:[NSArray arrayWithObject:@"tracks"]
140	142	completionHandler:
141	143	^ {
142	144	dispatch_async(dispatch_get_main_queue(),

		@@ -177,6 +179,8 @@
177	179	if(_player) {
178	180	[_player removeObserver:self forKeyPath:@"rate"];
179	181	[_player pause];
	182	+ [_player removeTimeObserver:self.timeObserver];
	183	+ self.timeObserver = nil;
180	184	}
181	185	[_player autorelease];
182	186	_player = [player retain];

		@@ -187,13 +191,13 @@
187	191	forKeyPath:@"rate"
188	192	options:0
189	193	context:_player];
190		-
191		- [_player addPeriodicTimeObserverForInterval:CMTimeMake(4, 100)
192		- queue:dispatch_get_main_queue()
193		- usingBlock: ^(CMTime time) {
194		- Float64 seconds = CMTimeGetSeconds(time);
195		- self.currentTime = seconds;
196		- }];
	194	+ self.timeObserver = [_player addPeriodicTimeObserverForInterval:CMTimeMake(4, 100)
	195	+ queue:dispatch_get_main_queue()
	196	+ usingBlock:
	197	+ ^(CMTime time) {
	198	+ Float64 seconds = CMTimeGetSeconds(time);
	199	+ self.currentTime = seconds;
	200	+ }];
197	201
198	202	AVPlayerLayer *layer = [AVPlayerLayer playerLayerWithPlayer:_player];
199	203	[_view setWantsLayer:YES];

		@@ -259,6 +263,8 @@
259	263	[_player removeObserver:self forKeyPath:@"rate"];
260	264	[_item removeObserver:self forKeyPath:@"status"];
261	265	[_player pause];
	266	+ [_player removeTimeObserver:self.timeObserver];
	267	+ self.timeObserver = nil;
262	268	}
263	269
264	270	#pragma mark -

		@@ -280,9 +286,10 @@
280	286	}
281	287	- (IBAction)changeCurrentTime:(id)sender
282	288	{
	289	+ CMTime halfSeconds = CMTimeMake(5, 10);
283	290	CGFloat timeValue = [sender doubleValue] * 1000.0;
284	291	CMTime time = CMTimeMake(timeValue, 1000);
285		- [_item seekToTime:time];
	292	+ [_item seekToTime:time toleranceBefore:halfSeconds toleranceAfter:halfSeconds];
286	293	}
287	294	- (IBAction)volumeUp:(id)sender
288	295	{