Skip to content

Commit e03c375

Browse files
Simone ManganelliSimone Manganelli
Simone Manganelli
authored and
Simone Manganelli
committed
HD H.264 support added; also, ClickToFlash now reliably detects H.264 and HD H.264 versions by actually testing the URLs instead of relying on YouTube's flash vars
1 parent bef1699 commit e03c375

File tree

3 files changed

+216
-44
lines changed

3 files changed

+216
-44
lines changed

‎Plugin/English.lproj/WhitelistPanel.xib

+102-33
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<string key="IBDocument.HIToolboxVersion">353.00</string>
99
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1010
<bool key="EncodedWithXMLCoder">YES</bool>
11+
<integer value="42"/>
1112
</object>
1213
<object class="NSArray" key="IBDocument.PluginDependencies">
1314
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,15 +38,15 @@
3738
<object class="NSWindowTemplate" id="1005">
3839
<int key="NSWindowStyleMask">15</int>
3940
<int key="NSWindowBacking">2</int>
40-
<string key="NSWindowRect">{{80, 209}, {527, 494}}</string>
41+
<string key="NSWindowRect">{{80, 187}, {527, 516}}</string>
4142
<int key="NSWTFlags">-534248448</int>
4243
<string type="base64-UTF8" key="NSWindowTitle">Q2xpY2sgdG8gRmxhc2gg4oCUIFNldHRpbmdzA</string>
4344
<string key="NSWindowClass">NSPanel</string>
4445
<nil key="NSViewClass"/>
4546
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
4647
<string key="NSWindowContentMinSize">{420, 400}</string>
4748
<object class="NSView" key="NSWindowView" id="1006">
48-
<nil key="NSNextResponder"/>
49+
<reference key="NSNextResponder"/>
4950
<int key="NSvFlags">274</int>
5051
<object class="NSMutableArray" key="NSSubviews">
5152
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -287,7 +288,7 @@
287288
<object class="NSButton" id="619486495">
288289
<reference key="NSNextResponder" ref="235344690"/>
289290
<int key="NSvFlags">268</int>
290-
<string key="NSFrame">{{93, 194}, {286, 18}}</string>
291+
<string key="NSFrame">{{93, 216}, {286, 18}}</string>
291292
<reference key="NSSuperview" ref="235344690"/>
292293
<bool key="NSEnabled">YES</bool>
293294
<object class="NSButtonCell" key="NSCell" id="356052318">
@@ -315,6 +316,28 @@
315316
<int key="NSPeriodicInterval">25</int>
316317
</object>
317318
</object>
319+
<object class="NSButton" id="499897961">
320+
<reference key="NSNextResponder" ref="235344690"/>
321+
<int key="NSvFlags">268</int>
322+
<string key="NSFrame">{{120, 196}, {259, 18}}</string>
323+
<reference key="NSSuperview" ref="235344690"/>
324+
<bool key="NSEnabled">YES</bool>
325+
<object class="NSButtonCell" key="NSCell" id="471351824">
326+
<int key="NSCellFlags">-2080244224</int>
327+
<int key="NSCellFlags2">0</int>
328+
<string key="NSContents">Load HD videos</string>
329+
<reference key="NSSupport" ref="906693409"/>
330+
<reference key="NSControlView" ref="499897961"/>
331+
<int key="NSButtonFlags">1211912703</int>
332+
<int key="NSButtonFlags2">130</int>
333+
<reference key="NSNormalImage" ref="1064838318"/>
334+
<reference key="NSAlternateImage" ref="664243181"/>
335+
<string key="NSAlternateContents"/>
336+
<string key="NSKeyEquivalent"/>
337+
<int key="NSPeriodicDelay">200</int>
338+
<int key="NSPeriodicInterval">25</int>
339+
</object>
340+
</object>
318341
<object class="NSButton" id="90714319">
319342
<reference key="NSNextResponder" ref="235344690"/>
320343
<int key="NSvFlags">268</int>
@@ -340,7 +363,7 @@
340363
<object class="NSTextField" id="972818591">
341364
<reference key="NSNextResponder" ref="235344690"/>
342365
<int key="NSvFlags">268</int>
343-
<string key="NSFrame">{{17, 215}, {67, 17}}</string>
366+
<string key="NSFrame">{{17, 237}, {67, 17}}</string>
344367
<reference key="NSSuperview" ref="235344690"/>
345368
<bool key="NSEnabled">YES</bool>
346369
<object class="NSTextFieldCell" key="NSCell" id="1061234246">
@@ -717,7 +740,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
717740
<object class="NSButton" id="596693856">
718741
<reference key="NSNextResponder" ref="235344690"/>
719742
<int key="NSvFlags">268</int>
720-
<string key="NSFrame">{{93, 214}, {286, 18}}</string>
743+
<string key="NSFrame">{{93, 236}, {286, 18}}</string>
721744
<reference key="NSSuperview" ref="235344690"/>
722745
<bool key="NSEnabled">YES</bool>
723746
<object class="NSButtonCell" key="NSCell" id="410759951">
@@ -757,7 +780,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
757780
</object>
758781
</object>
759782
</object>
760-
<string key="NSFrame">{{65, 246}, {397, 252}}</string>
783+
<string key="NSFrame">{{65, 246}, {397, 274}}</string>
761784
<reference key="NSSuperview" ref="1006"/>
762785
<string key="NSClassName">NSView</string>
763786
</object>
@@ -778,7 +801,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
778801
</object>
779802
</object>
780803
</object>
781-
<string key="NSFrameSize">{527, 494}</string>
804+
<string key="NSFrameSize">{527, 516}</string>
805+
<reference key="NSSuperview"/>
782806
</object>
783807
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
784808
<string key="NSMinSize">{420, 422}</string>
@@ -812,6 +836,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
812836
<string>sifrMode</string>
813837
<string>checkForUpdatesOnFirstLoad</string>
814838
<string>siteInfo</string>
839+
<string>useYouTubeHDH264</string>
815840
</object>
816841
<bool key="NSAppliesImmediately">YES</bool>
817842
</object>
@@ -1304,22 +1329,6 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
13041329
</object>
13051330
<int key="connectionID">178</int>
13061331
</object>
1307-
<object class="IBConnectionRecord">
1308-
<object class="IBBindingConnection" key="connection">
1309-
<string key="label">value: values.useYouTubeH264</string>
1310-
<reference key="source" ref="619486495"/>
1311-
<reference key="destination" ref="961452516"/>
1312-
<object class="NSNibBindingConnector" key="connector">
1313-
<reference key="NSSource" ref="619486495"/>
1314-
<reference key="NSDestination" ref="961452516"/>
1315-
<string key="NSLabel">value: values.useYouTubeH264</string>
1316-
<string key="NSBinding">value</string>
1317-
<string key="NSKeyPath">values.useYouTubeH264</string>
1318-
<int key="NSNibBindingConnectorVersion">2</int>
1319-
</object>
1320-
</object>
1321-
<int key="connectionID">179</int>
1322-
</object>
13231332
<object class="IBConnectionRecord">
13241333
<object class="IBBindingConnection" key="connection">
13251334
<string key="label">value: values.autoLoadInvisibleViews</string>
@@ -1452,6 +1461,38 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
14521461
</object>
14531462
<int key="connectionID">239</int>
14541463
</object>
1464+
<object class="IBConnectionRecord">
1465+
<object class="IBBindingConnection" key="connection">
1466+
<string key="label">value: values.useYouTubeHDH264</string>
1467+
<reference key="source" ref="499897961"/>
1468+
<reference key="destination" ref="961452516"/>
1469+
<object class="NSNibBindingConnector" key="connector">
1470+
<reference key="NSSource" ref="499897961"/>
1471+
<reference key="NSDestination" ref="961452516"/>
1472+
<string key="NSLabel">value: values.useYouTubeHDH264</string>
1473+
<string key="NSBinding">value</string>
1474+
<string key="NSKeyPath">values.useYouTubeHDH264</string>
1475+
<int key="NSNibBindingConnectorVersion">2</int>
1476+
</object>
1477+
</object>
1478+
<int key="connectionID">245</int>
1479+
</object>
1480+
<object class="IBConnectionRecord">
1481+
<object class="IBBindingConnection" key="connection">
1482+
<string key="label">value: values.useYouTubeH264</string>
1483+
<reference key="source" ref="619486495"/>
1484+
<reference key="destination" ref="961452516"/>
1485+
<object class="NSNibBindingConnector" key="connector">
1486+
<reference key="NSSource" ref="619486495"/>
1487+
<reference key="NSDestination" ref="961452516"/>
1488+
<string key="NSLabel">value: values.useYouTubeH264</string>
1489+
<string key="NSBinding">value</string>
1490+
<string key="NSKeyPath">values.useYouTubeH264</string>
1491+
<int key="NSNibBindingConnectorVersion">2</int>
1492+
</object>
1493+
</object>
1494+
<int key="connectionID">251</int>
1495+
</object>
14551496
</object>
14561497
<object class="IBMutableOrderedSet" key="objectRecords">
14571498
<object class="NSArray" key="orderedObjects">
@@ -1608,17 +1649,18 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
16081649
<reference key="object" ref="235344690"/>
16091650
<object class="NSMutableArray" key="children">
16101651
<bool key="EncodedWithXMLCoder">YES</bool>
1611-
<reference ref="90714319"/>
1612-
<reference ref="1020124743"/>
1613-
<reference ref="211748724"/>
16141652
<reference ref="972818591"/>
16151653
<reference ref="619486495"/>
1654+
<reference ref="596693856"/>
1655+
<reference ref="499897961"/>
1656+
<reference ref="90714319"/>
1657+
<reference ref="211748724"/>
1658+
<reference ref="1020124743"/>
16161659
<reference ref="800069556"/>
1617-
<reference ref="912083957"/>
1660+
<reference ref="48241452"/>
16181661
<reference ref="124868638"/>
1619-
<reference ref="596693856"/>
1662+
<reference ref="912083957"/>
16201663
<reference ref="138907006"/>
1621-
<reference ref="48241452"/>
16221664
</object>
16231665
<reference key="parent" ref="1006"/>
16241666
</object>
@@ -2068,6 +2110,20 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
20682110
<reference key="object" ref="870402495"/>
20692111
<reference key="parent" ref="209359137"/>
20702112
</object>
2113+
<object class="IBObjectRecord">
2114+
<int key="objectID">240</int>
2115+
<reference key="object" ref="499897961"/>
2116+
<object class="NSMutableArray" key="children">
2117+
<bool key="EncodedWithXMLCoder">YES</bool>
2118+
<reference ref="471351824"/>
2119+
</object>
2120+
<reference key="parent" ref="235344690"/>
2121+
</object>
2122+
<object class="IBObjectRecord">
2123+
<int key="objectID">241</int>
2124+
<reference key="object" ref="471351824"/>
2125+
<reference key="parent" ref="499897961"/>
2126+
</object>
20712127
</object>
20722128
</object>
20732129
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2190,6 +2246,9 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
21902246
<string>232.IBPluginDependency</string>
21912247
<string>233.IBPluginDependency</string>
21922248
<string>234.IBPluginDependency</string>
2249+
<string>240.IBAttributePlaceholdersKey</string>
2250+
<string>240.IBPluginDependency</string>
2251+
<string>241.IBPluginDependency</string>
21932252
<string>31.IBPluginDependency</string>
21942253
<string>32.IBPluginDependency</string>
21952254
<string>36.IBAttributePlaceholdersKey</string>
@@ -2208,9 +2267,9 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
22082267
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
22092268
<string>com.apple.InterfaceBuilderKit</string>
22102269
<string>com.apple.InterfaceBuilderKit</string>
2211-
<string>{{12, 251}, {527, 494}}</string>
2212-
<reference ref="8"/>
2213-
<string>{{12, 251}, {527, 494}}</string>
2270+
<string>{{186, 118}, {527, 516}}</string>
2271+
<reference ref="5"/>
2272+
<string>{{186, 118}, {527, 516}}</string>
22142273
<integer value="1" id="9"/>
22152274
<string>{196, 240}</string>
22162275
<string>{{202, 428}, {480, 270}}</string>
@@ -2363,6 +2422,16 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
23632422
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23642423
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23652424
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2425+
<object class="NSMutableDictionary">
2426+
<string key="NS.key.0">ToolTip</string>
2427+
<object class="IBToolTipAttribute" key="NS.object.0">
2428+
<string key="name">ToolTip</string>
2429+
<reference key="object" ref="499897961"/>
2430+
<string key="toolTip">Loads HD versions of the movie, if possible.</string>
2431+
</object>
2432+
</object>
2433+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2434+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23662435
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23672436
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
23682437
<object class="NSMutableDictionary">
@@ -2404,7 +2473,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4</string>
24042473
</object>
24052474
</object>
24062475
<nil key="sourceID"/>
2407-
<int key="maxID">239</int>
2476+
<int key="maxID">251</int>
24082477
</object>
24092478
<object class="IBClassDescriber" key="IBDocument.Classes">
24102479
<object class="NSMutableArray" key="referencedPartialClassDescriptions">

‎Plugin/Plugin.h

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ THE SOFTWARE.
3939
BOOL mouseInside;
4040
BOOL _isLoadingFromWhitelist;
4141
BOOL _fromYouTube;
42+
BOOL _hasH264Version;
43+
BOOL _hasHDH264Version;
4244
WebView *_webView;
4345
NSUInteger _sifrVersion;
4446
NSString *_baseURL;

0 commit comments

Comments
 (0)