Title: [133733] trunk/Source/WebCore
- Revision
- 133733
- Author
- [email protected]
- Date
- 2012-11-07 02:22:41 -0800 (Wed, 07 Nov 2012)
Log Message
[Qt] Unreviewed trivial build fix adapting to QtMultimedia API changes
The QtMultimedia namespace is now called QMultimedia and
QtMultimedia::MetaData is now QMediaMetaData.
* platform/graphics/qt/MediaPlayerPrivateQt.cpp:
(WebCore::MediaPlayerPrivateQt::supportsType):
(WebCore::MediaPlayerPrivateQt::totalBytes):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133732 => 133733)
--- trunk/Source/WebCore/ChangeLog 2012-11-07 09:45:32 UTC (rev 133732)
+++ trunk/Source/WebCore/ChangeLog 2012-11-07 10:22:41 UTC (rev 133733)
@@ -1,3 +1,14 @@
+2012-11-07 Simon Hausmann <[email protected]>
+
+ [Qt] Unreviewed trivial build fix adapting to QtMultimedia API changes
+
+ The QtMultimedia namespace is now called QMultimedia and
+ QtMultimedia::MetaData is now QMediaMetaData.
+
+ * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+ (WebCore::MediaPlayerPrivateQt::supportsType):
+ (WebCore::MediaPlayerPrivateQt::totalBytes):
+
2012-11-07 Christophe Dumez <[email protected]>
Add replaceWithLiteral() method to WTF::String
Modified: trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp (133732 => 133733)
--- trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp 2012-11-07 09:45:32 UTC (rev 133732)
+++ trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp 2012-11-07 10:22:41 UTC (rev 133733)
@@ -45,6 +45,8 @@
#include <QTimer>
#include <QUrl>
#include <limits>
+#include <qmediametadata.h>
+#include <qmultimedia.h>
#include <wtf/HashSet.h>
#include <wtf/text/CString.h>
@@ -92,7 +94,7 @@
codecListTrimmed.append(codecStrTrimmed);
}
- if (QMediaPlayer::hasSupport(mime, codecListTrimmed) >= QtMultimedia::ProbablySupported)
+ if (QMediaPlayer::hasSupport(mime, codecListTrimmed) >= QMultimedia::ProbablySupported)
return MediaPlayer::IsSupported;
return MediaPlayer::MayBeSupported;
@@ -366,8 +368,8 @@
unsigned MediaPlayerPrivateQt::totalBytes() const
{
- if (m_mediaPlayer->availableMetaData().contains(QtMultimedia::MetaData::Size))
- return m_mediaPlayer->metaData(QtMultimedia::MetaData::Size).toInt();
+ if (m_mediaPlayer->availableMetaData().contains(QMediaMetaData::Size))
+ return m_mediaPlayer->metaData(QMediaMetaData::Size).toInt();
return 100;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
