Merge branch 'release-6.6.3-b'

runrevmark · runrevmark · commit 49080e1e32bb · 2014-09-16T14:37:43.000+01:00
diff --git a/docs/notes/bugfix-13354.md b/docs/notes/bugfix-13354.md
@@ -0,0 +1 @@
+# App store no longer allows use of deprecated MPMoviePlayerContentPreloadDidFinishNotification
diff --git a/engine/src/mbliphonevideo.mm b/engine/src/mbliphonevideo.mm
@@ -64,7 +64,7 @@ @interface FullscreenMovieDelegate : NSObject
 	UIControl *m_overlay;
 }
 
-- (id)init;
+- (id)initWithPlayer;
 - (void)dealloc;
 
 - (void)begin: (bool)p_add_overlay;
@@ -80,7 +80,8 @@ - (void)movieWindowTouched: (UIControl*) p_sender;
 
 @implementation FullscreenMovieDelegate
 
-- (id)init
+// AL-2014-09-09: [[ Bug 13354 ]] Replace deprecated MPMoviePlayerContentPreloadDidFinishNotification
+- (id)initWithPlayer: (MPMoviePlayerController *)p_player
 {
 	self = [super init];
 	if (self == nil)
@@ -90,11 +91,11 @@ - (id)init
 											 selector:@selector(movieFinished:)
 												 name:MPMoviePlayerPlaybackDidFinishNotification 
 											   object:nil];
-	
+
 	[[NSNotificationCenter defaultCenter] addObserver:self 
 											 selector:@selector(moviePreloadFinished:)
-												 name:MPMoviePlayerContentPreloadDidFinishNotification 
-											   object:nil];
+												 name:MPMoviePlayerLoadStateDidChangeNotification 
+											   object:p_player];
 	
 	m_running = true;
 	m_overlay = nil;
@@ -159,7 +160,8 @@ - (void)movieFinished: (NSNotification *) p_notification
 
 - (void)moviePreloadFinished: (NSNotification *) p_notification
 {
-	if ([[p_notification userInfo] objectForKey: @"error"] != nil)
+	// AL-2014-09-09: [[ Bug 13354 ]] Replace deprecated MPMoviePlayerContentPreloadDidFinishNotification
+	if ([[p_notification object] loadState] & MPMovieLoadStateUnknown)
 	{
 		m_running = false;
 		
@@ -240,7 +242,7 @@ static void play_fullscreen_movie_prewait(void *p_context)
 	
 	configure_playback_range(ctxt -> movie_player);
 	
-	ctxt -> delegate = [[FullscreenMovieDelegate alloc] init];
+	ctxt -> delegate = [[FullscreenMovieDelegate alloc] initWithPlayer:ctxt -> movie_player];
 	
 	// Present the view controller and get the delegate to setup its overlay
 	// if needed.
diff --git a/version b/version
@@ -1,6 +1,6 @@
-BUILD_REVISION = 4012
+BUILD_REVISION = 4020
 BUILD_MAJOR_VERSION = 6
 BUILD_MINOR_VERSION = 6
-BUILD_POINT_VERSION = 2
-BUILD_SHORT_VERSION = 6.6.2
-BUILD_LONG_VERSION = 6.6.2.4012
+BUILD_POINT_VERSION = 3
+BUILD_SHORT_VERSION = 6.6.3
+BUILD_LONG_VERSION = 6.6.3.4020

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# App store no longer allows use of deprecated MPMoviePlayerContentPreloadDidFinishNotification`