Title: [208890] trunk/Source/WebCore
- Revision
- 208890
- Author
- [email protected]
- Date
- 2016-11-18 13:23:41 -0800 (Fri, 18 Nov 2016)
Log Message
Attempt to fix iOS build again.
<rdar://problem/29312689>
Unreviewed build fix.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack):
(WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208889 => 208890)
--- trunk/Source/WebCore/ChangeLog 2016-11-18 20:56:36 UTC (rev 208889)
+++ trunk/Source/WebCore/ChangeLog 2016-11-18 21:23:41 UTC (rev 208890)
@@ -1,3 +1,14 @@
+2016-11-18 Ryan Haddad <[email protected]>
+
+ Attempt to fix iOS build again.
+ <rdar://problem/29312689>
+
+ Unreviewed build fix.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack):
+
2016-11-18 Myles C. Maxfield <[email protected]>
[CSS Font Loading] FontFaceSet.load() promises don't always fire
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (208889 => 208890)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-18 20:56:36 UTC (rev 208889)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-18 21:23:41 UTC (rev 208890)
@@ -2706,7 +2706,10 @@
if (track) {
if (track->textTrackCategory() == InbandTextTrackPrivateAVF::LegacyClosedCaption)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[m_avPlayer.get() setClosedCaptionDisplayEnabled:YES];
+#pragma clang diagnostic pop
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
#if ENABLE(AVF_CAPTIONS)
else if (track->textTrackCategory() == InbandTextTrackPrivateAVF::OutOfBand)
@@ -2719,7 +2722,10 @@
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
[m_avPlayerItem.get() selectMediaOption:0 inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[m_avPlayer.get() setClosedCaptionDisplayEnabled:NO];
+#pragma clang diagnostic pop
}
}
@@ -2735,7 +2741,10 @@
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
// If AVFoundation has an audible group, return the language of the currently selected audible option.
AVMediaSelectionGroupType *audibleGroup = [m_avAsset.get() mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
AVMediaSelectionOptionType *currentlySelectedAudibleOption = [m_avPlayerItem.get() selectedMediaOptionInMediaSelectionGroup:audibleGroup];
+#pragma clang diagnostic pop
if (currentlySelectedAudibleOption) {
m_languageOfPrimaryAudioTrack = [[currentlySelectedAudibleOption locale] localeIdentifier];
LOG(Media, "MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack(%p) - returning language of selected audible option: %s", this, m_languageOfPrimaryAudioTrack.utf8().data());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
