@@ -43,6 +43,7 @@ THE SOFTWARE. BOOL _fromYouTube; BOOL _fromFlickr; BOOL _embeddedYouTubeView; + BOOL _youTubeAutoPlay; BOOL _hasH264Version; BOOL _hasHDH264Version; WebView *_webView; Plugin/Plugin.h @@ -119,6 +119,7 @@ BOOL usingMATrackingArea = NO; _hasHDH264Version = NO; _contextMenuIsVisible = NO; _embeddedYouTubeView = NO; + _youTubeAutoPlay = NO; _delayingTimer = nil; defaultWhitelist = [NSArray arrayWithObjects: @"com.apple.frontrow", @"com.apple.dashboard.client", @@ -207,6 +208,16 @@ BOOL usingMATrackingArea = NO; || ([self src] != nil && [[self src] rangeOfString: @"youtube-nocookie.com"].location != NSNotFound ); if (_fromYouTube) { + + // Check wether autoplay is wanted + if ([[self host] isEqualToString:@"www.youtube.com"] + || [[self host] isEqualToString:@"www.youtube-nocookie.com"]) { + _youTubeAutoPlay = YES; + } else { + _youTubeAutoPlay = [[[self _flashVarDictionary:[self src]] objectForKey:@"autoplay"] isEqualToString:@"1"]; + } + + NSString *videoId = [ self flashvarWithName: @"video_id" ]; if (videoId != nil) { [self setVideoId:videoId]; @@ -1339,7 +1350,9 @@ didReceiveResponse:(NSHTTPURLResponse *)response [ element setAttribute: @"src" value: [ self _h264VersionUrl ]]; [ element setAttribute: @"type" value: @"video/mp4" ]; [ element setAttribute: @"scale" value: @"aspect" ]; - [ element setAttribute: @"autoplay" value: @"true" ]; + if (_youTubeAutoPlay) { + [ element setAttribute: @"autoplay" value: @"true" ]; + } [ element setAttribute: @"cache" value: @"false" ]; if( ! [ element hasAttribute: @"width" ] ) @@ -1355,7 +1368,9 @@ didReceiveResponse:(NSHTTPURLResponse *)response { [ element setAttribute: @"src" value: [ self _h264VersionUrl ] ]; [ element setAttribute: @"autobuffer" value:@"autobuffer"]; - [ element setAttribute: @"autoplay" value:@"autoplay"]; + if (_youTubeAutoPlay) { + [ element setAttribute: @"autoplay" value:@"autoplay"]; + } [ element setAttribute: @"controls" value:@"controls"]; DOMElement* container = [self container]; Plugin/Plugin.m 669fb1c4e99949cc9e594109c804082540448967 fppzdd fppzdd@gmail.com http://github.com/rentzsch/clicktoflash/commit/c9e2bfac1492618c4a92da298af4a4d051ef927f c9e2bfac1492618c4a92da298af4a4d051ef927f 2009-10-01T16:38:32-07:00 2009-09-15T12:39:57-07:00 This should fix http://rentzsch.lighthouseapp.com/projects/24342/tickets/276-video-element-always-set-to-autoplay-even-when-youtube-isnt (cherry picked from commit fad0a55b1fa86829bc96eb7f3a49d081a00edba8) 0955fbadbb48e55de47d253e3669d7cc5158c3d3 Simone Manganelli simX@mac.com