[Qt] Build with --video-track fails because String(AtomicString) is ambiguous

https://bugs.webkit.org/show_bug.cgi?id=115551

Patch by Brendan Long <b.long@cablelabs.com> on 2013-05-03
Reviewed by Benjamin Poulain.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureTextTrackGroup):
Change String(textTrack->kind()) to textTrack->kind().string(), and same thing with language.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149544 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bed9e9ac
2013-05-03 Brendan Long <b.long@cablelabs.com>
[Qt] Build with --video-track fails because String(AtomicString) is ambiguous
https://bugs.webkit.org/show_bug.cgi?id=115551
Reviewed by Benjamin Poulain.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureTextTrackGroup):
Change String(textTrack->kind()) to textTrack->kind().string(), and same thing with language.
2013-05-03 Xabier Rodriguez Calvar <calvaris@igalia.com>
[GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
......
......@@ -3207,7 +3207,7 @@ void HTMLMediaElement::configureTextTrackGroup(const TrackGroup& group)
currentlyEnabledTracks.append(textTrack);
int trackScore = captionPreferences ? captionPreferences->textTrackSelectionScore(textTrack.get(), this) : 0;
LOG(Media, "HTMLMediaElement::configureTextTrackGroup - '%s' track with language '%s' has score %i", String(textTrack->kind()).utf8().data(), String(textTrack->language()).utf8().data(), trackScore);
LOG(Media, "HTMLMediaElement::configureTextTrackGroup - '%s' track with language '%s' has score %i", textTrack->kind().string().utf8().data(), textTrack->language().string().utf8().data(), trackScore);
if (trackScore) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment