[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
vestbo at webkit.org
vestbo at webkit.org
Wed Dec 22 13:52:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cd4655821b89d6d7d9bcdef05f4680b0ac9f03ca
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 28 16:21:31 2010 +0000
[Qt] Rename MediaPlayerPrivate to MediaPlayerPrivateQt/Phonon
Reviewed by Andreas Kling.
https://bugs.webkit.org/show_bug.cgi?id=36663
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/qt/MediaPlayerPrivateQt.cpp:
* platform/graphics/qt/MediaPlayerPrivateQt.h:
* platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
* platform/graphics/qt/MediaPlayerPrivatePhonon.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68526 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5901dac..3054ee7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-28 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Rename MediaPlayerPrivate to MediaPlayerPrivateQt/Phonon
+
+ https://bugs.webkit.org/show_bug.cgi?id=36663
+
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+ * platform/graphics/qt/MediaPlayerPrivateQt.h:
+ * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+ * platform/graphics/qt/MediaPlayerPrivatePhonon.h:
+
2010-09-28 Andras Becsi <abecsi at webkit.org>
Reviewed by Csaba Osztrogonác.
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 947fcd7..2a9e64e 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -171,6 +171,12 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
#if PLATFORM(WIN)
MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
+#elif PLATFORM(QT)
+#if USE(QT_MULTIMEDIA)
+ MediaPlayerPrivateQt::registerMediaEngine(addMediaEngine);
+#else
+ MediaPlayerPrivatePhonon::registerMediaEngine(addMediaEngine);
+#endif
#elif !PLATFORM(GTK) && !PLATFORM(EFL)
// FIXME: currently all the MediaEngines are named
// MediaPlayerPrivate. This code will need an update when bug
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
index 08eb816..3c75998 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
@@ -84,7 +84,7 @@ using namespace WTF;
namespace WebCore {
-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
+MediaPlayerPrivatePhonon::MediaPlayerPrivatePhonon(MediaPlayer* player)
: m_player(player)
, m_networkState(MediaPlayer::Empty)
, m_readyState(MediaPlayer::HaveNothing)
@@ -118,19 +118,19 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
connect(m_mediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(totalTimeChanged(qint64)));
}
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
+MediaPlayerPrivateInterface* MediaPlayerPrivatePhonon::create(MediaPlayer* player)
{
- return new MediaPlayerPrivate(player);
+ return new MediaPlayerPrivatePhonon(player);
}
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+void MediaPlayerPrivatePhonon::registerMediaEngine(MediaEngineRegistrar registrar)
{
if (isAvailable())
registrar(create, getSupportedTypes, supportsType);
}
-MediaPlayerPrivate::~MediaPlayerPrivate()
+MediaPlayerPrivatePhonon::~MediaPlayerPrivatePhonon()
{
LOG(Media, "MediaPlayerPrivatePhonon::dtor deleting videowidget");
m_videoWidget->close();
@@ -146,7 +146,7 @@ MediaPlayerPrivate::~MediaPlayerPrivate()
m_mediaObject = 0;
}
-HashSet<String>& MediaPlayerPrivate::supportedTypesCache()
+HashSet<String>& MediaPlayerPrivatePhonon::supportedTypesCache()
{
static HashSet<String> supportedTypes;
if (!supportedTypes.isEmpty())
@@ -190,12 +190,12 @@ HashSet<String>& MediaPlayerPrivate::supportedTypesCache()
return supportedTypes;
}
-void MediaPlayerPrivate::getSupportedTypes(HashSet<String>& types)
+void MediaPlayerPrivatePhonon::getSupportedTypes(HashSet<String>& types)
{
types = supportedTypesCache();
}
-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, const String& codecs)
+MediaPlayer::SupportsType MediaPlayerPrivatePhonon::supportsType(const String& type, const String& codecs)
{
if (type.isEmpty())
return MediaPlayer::IsNotSupported;
@@ -205,14 +205,14 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, c
return MediaPlayer::IsNotSupported;
}
-bool MediaPlayerPrivate::hasVideo() const
+bool MediaPlayerPrivatePhonon::hasVideo() const
{
bool hasVideo = m_mediaObject->hasVideo();
LOG(Media, "MediaPlayerPrivatePhonon::hasVideo() -> %s", hasVideo ? "true" : "false");
return hasVideo;
}
-bool MediaPlayerPrivate::hasAudio() const
+bool MediaPlayerPrivatePhonon::hasAudio() const
{
// FIXME: Phonon::MediaObject does not have such a hasAudio() function
bool hasAudio = true;
@@ -220,7 +220,7 @@ bool MediaPlayerPrivate::hasAudio() const
return hasAudio;
}
-void MediaPlayerPrivate::load(const String& url)
+void MediaPlayerPrivatePhonon::load(const String& url)
{
LOG(Media, "MediaPlayerPrivatePhonon::load(\"%s\")", url.utf8().data());
@@ -241,33 +241,33 @@ void MediaPlayerPrivate::load(const String& url)
setVisible(m_player->visible());
}
-void MediaPlayerPrivate::cancelLoad()
+void MediaPlayerPrivatePhonon::cancelLoad()
{
notImplemented();
}
-void MediaPlayerPrivate::play()
+void MediaPlayerPrivatePhonon::play()
{
LOG(Media, "MediaPlayerPrivatePhonon::play()");
m_mediaObject->play();
}
-void MediaPlayerPrivate::pause()
+void MediaPlayerPrivatePhonon::pause()
{
LOG(Media, "MediaPlayerPrivatePhonon::pause()");
m_mediaObject->pause();
}
-bool MediaPlayerPrivate::paused() const
+bool MediaPlayerPrivatePhonon::paused() const
{
bool paused = m_mediaObject->state() == Phonon::PausedState;
LOG(Media, "MediaPlayerPrivatePhonon::paused() --> %s", paused ? "true" : "false");
return paused;
}
-void MediaPlayerPrivate::seek(float position)
+void MediaPlayerPrivatePhonon::seek(float position)
{
LOG(Media, "MediaPlayerPrivatePhonon::seek(%f)", position);
@@ -280,12 +280,12 @@ void MediaPlayerPrivate::seek(float position)
m_mediaObject->seek(position * 1000.0f);
}
-bool MediaPlayerPrivate::seeking() const
+bool MediaPlayerPrivatePhonon::seeking() const
{
return false;
}
-float MediaPlayerPrivate::duration() const
+float MediaPlayerPrivatePhonon::duration() const
{
if (m_readyState < MediaPlayer::HaveMetadata)
return 0.0f;
@@ -299,7 +299,7 @@ float MediaPlayerPrivate::duration() const
return duration;
}
-float MediaPlayerPrivate::currentTime() const
+float MediaPlayerPrivatePhonon::currentTime() const
{
float currentTime = m_mediaObject->currentTime() / 1000.0f;
@@ -307,48 +307,48 @@ float MediaPlayerPrivate::currentTime() const
return currentTime;
}
-PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
+PassRefPtr<TimeRanges> MediaPlayerPrivatePhonon::buffered() const
{
notImplemented();
return TimeRanges::create();
}
-float MediaPlayerPrivate::maxTimeSeekable() const
+float MediaPlayerPrivatePhonon::maxTimeSeekable() const
{
notImplemented();
return 0.0f;
}
-unsigned MediaPlayerPrivate::bytesLoaded() const
+unsigned MediaPlayerPrivatePhonon::bytesLoaded() const
{
notImplemented();
return 0;
}
-unsigned MediaPlayerPrivate::totalBytes() const
+unsigned MediaPlayerPrivatePhonon::totalBytes() const
{
//notImplemented();
return 0;
}
-void MediaPlayerPrivate::setRate(float)
+void MediaPlayerPrivatePhonon::setRate(float)
{
notImplemented();
}
-void MediaPlayerPrivate::setVolume(float volume)
+void MediaPlayerPrivatePhonon::setVolume(float volume)
{
LOG(Media, "MediaPlayerPrivatePhonon::setVolume()");
m_audioOutput->setVolume(volume);
}
-void MediaPlayerPrivate::setMuted(bool muted)
+void MediaPlayerPrivatePhonon::setMuted(bool muted)
{
LOG(Media, "MediaPlayerPrivatePhonon::setMuted()");
m_audioOutput->setMuted(muted);
}
-MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
+MediaPlayer::NetworkState MediaPlayerPrivatePhonon::networkState() const
{
const QMetaObject* metaObj = this->metaObject();
QMetaEnum networkStates = metaObj->enumerator(metaObj->indexOfEnumerator("NetworkState"));
@@ -356,7 +356,7 @@ MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
return m_networkState;
}
-MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
+MediaPlayer::ReadyState MediaPlayerPrivatePhonon::readyState() const
{
const QMetaObject* metaObj = this->metaObject();
QMetaEnum readyStates = metaObj->enumerator(metaObj->indexOfEnumerator("ReadyState"));
@@ -364,7 +364,7 @@ MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
return m_readyState;
}
-void MediaPlayerPrivate::updateStates()
+void MediaPlayerPrivatePhonon::updateStates()
{
MediaPlayer::NetworkState oldNetworkState = m_networkState;
MediaPlayer::ReadyState oldReadyState = m_readyState;
@@ -412,7 +412,7 @@ void MediaPlayerPrivate::updateStates()
}
}
-void MediaPlayerPrivate::setVisible(bool visible)
+void MediaPlayerPrivatePhonon::setVisible(bool visible)
{
m_isVisible = visible;
LOG(Media, "MediaPlayerPrivatePhonon::setVisible(%s)", visible ? "true" : "false");
@@ -420,7 +420,7 @@ void MediaPlayerPrivate::setVisible(bool visible)
m_videoWidget->setVisible(m_isVisible);
}
-void MediaPlayerPrivate::setSize(const IntSize& newSize)
+void MediaPlayerPrivatePhonon::setSize(const IntSize& newSize)
{
if (!m_videoWidget)
return;
@@ -434,7 +434,7 @@ void MediaPlayerPrivate::setSize(const IntSize& newSize)
m_videoWidget->resize(newSize.width(), newSize.height());
}
-IntSize MediaPlayerPrivate::naturalSize() const
+IntSize MediaPlayerPrivatePhonon::naturalSize() const
{
if (!hasVideo()) {
LOG(Media, "MediaPlayerPrivatePhonon::naturalSize() -> %dx%d",
@@ -455,7 +455,7 @@ IntSize MediaPlayerPrivate::naturalSize() const
return naturalSize;
}
-bool MediaPlayerPrivate::eventFilter(QObject* obj, QEvent* event)
+bool MediaPlayerPrivatePhonon::eventFilter(QObject* obj, QEvent* event)
{
if (event->type() == QEvent::UpdateRequest)
m_player->repaint();
@@ -463,7 +463,7 @@ bool MediaPlayerPrivate::eventFilter(QObject* obj, QEvent* event)
return QObject::eventFilter(obj, event);
}
-void MediaPlayerPrivate::paint(GraphicsContext* graphicsContect, const IntRect& rect)
+void MediaPlayerPrivatePhonon::paint(GraphicsContext* graphicsContect, const IntRect& rect)
{
if (graphicsContect->paintingDisabled())
return;
@@ -481,7 +481,7 @@ void MediaPlayerPrivate::paint(GraphicsContext* graphicsContect, const IntRect&
// ====================== Phonon::MediaObject signals ======================
-void MediaPlayerPrivate::stateChanged(Phonon::State newState, Phonon::State oldState)
+void MediaPlayerPrivatePhonon::stateChanged(Phonon::State newState, Phonon::State oldState)
{
const QMetaObject* metaObj = this->metaObject();
QMetaEnum phononStates = metaObj->enumerator(metaObj->indexOfEnumerator("PhononState"));
@@ -491,48 +491,48 @@ void MediaPlayerPrivate::stateChanged(Phonon::State newState, Phonon::State oldS
updateStates();
}
-void MediaPlayerPrivate::metaDataChanged()
+void MediaPlayerPrivatePhonon::metaDataChanged()
{
LOG(Media, "MediaPlayerPrivatePhonon::metaDataChanged()");
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::seekableChanged(bool)
+void MediaPlayerPrivatePhonon::seekableChanged(bool)
{
notImplemented();
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::hasVideoChanged(bool hasVideo)
+void MediaPlayerPrivatePhonon::hasVideoChanged(bool hasVideo)
{
LOG(Media, "MediaPlayerPrivatePhonon::hasVideoChanged(%s)", hasVideo ? "true" : "false");
}
-void MediaPlayerPrivate::bufferStatus(int)
+void MediaPlayerPrivatePhonon::bufferStatus(int)
{
notImplemented();
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::finished()
+void MediaPlayerPrivatePhonon::finished()
{
notImplemented();
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::currentSourceChanged(const Phonon::MediaSource&)
+void MediaPlayerPrivatePhonon::currentSourceChanged(const Phonon::MediaSource&)
{
notImplemented();
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::aboutToFinish()
+void MediaPlayerPrivatePhonon::aboutToFinish()
{
notImplemented();
LOG_MEDIAOBJECT();
}
-void MediaPlayerPrivate::totalTimeChanged(qint64 totalTime)
+void MediaPlayerPrivatePhonon::totalTimeChanged(qint64 totalTime)
{
#if OS(WINDOWS)
LOG(Media, "MediaPlayerPrivatePhonon::totalTimeChanged(%I64d)", totalTime);
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
index ff6a01c..d793675 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.h
@@ -40,13 +40,13 @@ QT_END_NAMESPACE
namespace WebCore {
- class MediaPlayerPrivate : public QObject, public MediaPlayerPrivateInterface {
+ class MediaPlayerPrivatePhonon : public QObject, public MediaPlayerPrivateInterface {
Q_OBJECT
public:
static void registerMediaEngine(MediaEngineRegistrar);
- ~MediaPlayerPrivate();
+ ~MediaPlayerPrivatePhonon();
// These enums are used for debugging
Q_ENUMS(ReadyState NetworkState PhononState)
@@ -127,7 +127,7 @@ namespace WebCore {
void totalTimeChanged(qint64);
private:
- MediaPlayerPrivate(MediaPlayer*);
+ MediaPlayerPrivatePhonon(MediaPlayer*);
static MediaPlayerPrivateInterface* create(MediaPlayer* player);
static void getSupportedTypes(HashSet<String>&);
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 1bf1a3d..1d10cb3 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -53,17 +53,17 @@ using namespace WTF;
namespace WebCore {
-MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
+MediaPlayerPrivateInterface* MediaPlayerPrivateQt::create(MediaPlayer* player)
{
- return new MediaPlayerPrivate(player);
+ return new MediaPlayerPrivateQt(player);
}
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+void MediaPlayerPrivateQt::registerMediaEngine(MediaEngineRegistrar registrar)
{
registrar(create, getSupportedTypes, supportsType);
}
-void MediaPlayerPrivate::getSupportedTypes(HashSet<String> &supported)
+void MediaPlayerPrivateQt::getSupportedTypes(HashSet<String> &supported)
{
QStringList types = QMediaPlayer::supportedMimeTypes();
@@ -74,7 +74,7 @@ void MediaPlayerPrivate::getSupportedTypes(HashSet<String> &supported)
}
}
-MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, const String& codec)
+MediaPlayer::SupportsType MediaPlayerPrivateQt::supportsType(const String& mime, const String& codec)
{
if (!mime.startsWith("audio/") && !mime.startsWith("video/"))
return MediaPlayer::IsNotSupported;
@@ -85,7 +85,7 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, c
return MediaPlayer::MayBeSupported;
}
-MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
+MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
: m_player(player)
, m_mediaPlayer(new QMediaPlayer)
, m_mediaPlayerControl(0)
@@ -132,23 +132,23 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
}
}
-MediaPlayerPrivate::~MediaPlayerPrivate()
+MediaPlayerPrivateQt::~MediaPlayerPrivateQt()
{
delete m_mediaPlayer;
delete m_videoScene;
}
-bool MediaPlayerPrivate::hasVideo() const
+bool MediaPlayerPrivateQt::hasVideo() const
{
return m_mediaPlayer->isVideoAvailable();
}
-bool MediaPlayerPrivate::hasAudio() const
+bool MediaPlayerPrivateQt::hasAudio() const
{
return true;
}
-void MediaPlayerPrivate::load(const String& url)
+void MediaPlayerPrivateQt::load(const String& url)
{
m_mediaUrl = url;
@@ -162,7 +162,7 @@ void MediaPlayerPrivate::load(const String& url)
commitLoad(url);
}
-void MediaPlayerPrivate::commitLoad(const String& url)
+void MediaPlayerPrivateQt::commitLoad(const String& url)
{
// We are now loading
if (m_networkState != MediaPlayer::Loading) {
@@ -236,7 +236,7 @@ void MediaPlayerPrivate::commitLoad(const String& url)
m_mediaPlayer->play();
}
-void MediaPlayerPrivate::resumeLoad()
+void MediaPlayerPrivateQt::resumeLoad()
{
m_delayingLoad = false;
@@ -244,36 +244,36 @@ void MediaPlayerPrivate::resumeLoad()
commitLoad(m_mediaUrl);
}
-void MediaPlayerPrivate::cancelLoad()
+void MediaPlayerPrivateQt::cancelLoad()
{
m_mediaPlayer->setMedia(QMediaContent());
updateStates();
}
-void MediaPlayerPrivate::prepareToPlay()
+void MediaPlayerPrivateQt::prepareToPlay()
{
if (m_mediaPlayer->media().isNull() || m_delayingLoad)
resumeLoad();
}
-void MediaPlayerPrivate::play()
+void MediaPlayerPrivateQt::play()
{
if (m_mediaPlayer->state() != QMediaPlayer::PlayingState)
m_mediaPlayer->play();
}
-void MediaPlayerPrivate::pause()
+void MediaPlayerPrivateQt::pause()
{
if (m_mediaPlayer->state() == QMediaPlayer::PlayingState)
m_mediaPlayer->pause();
}
-bool MediaPlayerPrivate::paused() const
+bool MediaPlayerPrivateQt::paused() const
{
return (m_mediaPlayer->state() != QMediaPlayer::PlayingState);
}
-void MediaPlayerPrivate::seek(float position)
+void MediaPlayerPrivateQt::seek(float position)
{
if (!m_mediaPlayer->isSeekable())
return;
@@ -309,12 +309,12 @@ void MediaPlayerPrivate::seek(float position)
}
}
-bool MediaPlayerPrivate::seeking() const
+bool MediaPlayerPrivateQt::seeking() const
{
return m_isSeeking;
}
-float MediaPlayerPrivate::duration() const
+float MediaPlayerPrivateQt::duration() const
{
if (m_readyState < MediaPlayer::HaveMetadata)
return 0.0f;
@@ -328,13 +328,13 @@ float MediaPlayerPrivate::duration() const
return duration;
}
-float MediaPlayerPrivate::currentTime() const
+float MediaPlayerPrivateQt::currentTime() const
{
float currentTime = m_mediaPlayer->position() / 1000.0f;
return currentTime;
}
-PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
+PassRefPtr<TimeRanges> MediaPlayerPrivateQt::buffered() const
{
RefPtr<TimeRanges> buffered = TimeRanges::create();
@@ -352,7 +352,7 @@ PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const
return buffered.release();
}
-float MediaPlayerPrivate::maxTimeSeekable() const
+float MediaPlayerPrivateQt::maxTimeSeekable() const
{
if (!m_mediaPlayerControl)
return 0;
@@ -360,7 +360,7 @@ float MediaPlayerPrivate::maxTimeSeekable() const
return static_cast<float>(m_mediaPlayerControl->availablePlaybackRanges().latestTime()) / 1000.0f;
}
-unsigned MediaPlayerPrivate::bytesLoaded() const
+unsigned MediaPlayerPrivateQt::bytesLoaded() const
{
QLatin1String bytesLoadedKey("bytes-loaded");
if (m_mediaPlayer->availableExtendedMetaData().contains(bytesLoadedKey))
@@ -369,7 +369,7 @@ unsigned MediaPlayerPrivate::bytesLoaded() const
return m_mediaPlayer->bufferStatus();
}
-unsigned MediaPlayerPrivate::totalBytes() const
+unsigned MediaPlayerPrivateQt::totalBytes() const
{
if (m_mediaPlayer->availableMetaData().contains(QtMultimediaKit::Size))
return m_mediaPlayer->metaData(QtMultimediaKit::Size).toInt();
@@ -377,59 +377,59 @@ unsigned MediaPlayerPrivate::totalBytes() const
return 100;
}
-void MediaPlayerPrivate::setPreload(MediaPlayer::Preload preload)
+void MediaPlayerPrivateQt::setPreload(MediaPlayer::Preload preload)
{
m_preload = preload;
if (m_delayingLoad && m_preload != MediaPlayer::None)
resumeLoad();
}
-void MediaPlayerPrivate::setRate(float rate)
+void MediaPlayerPrivateQt::setRate(float rate)
{
m_mediaPlayer->setPlaybackRate(rate);
}
-void MediaPlayerPrivate::setVolume(float volume)
+void MediaPlayerPrivateQt::setVolume(float volume)
{
m_mediaPlayer->setVolume(static_cast<int>(volume * 100.0));
}
-bool MediaPlayerPrivate::supportsMuting() const
+bool MediaPlayerPrivateQt::supportsMuting() const
{
return true;
}
-void MediaPlayerPrivate::setMuted(bool muted)
+void MediaPlayerPrivateQt::setMuted(bool muted)
{
m_mediaPlayer->setMuted(muted);
}
-MediaPlayer::NetworkState MediaPlayerPrivate::networkState() const
+MediaPlayer::NetworkState MediaPlayerPrivateQt::networkState() const
{
return m_networkState;
}
-MediaPlayer::ReadyState MediaPlayerPrivate::readyState() const
+MediaPlayer::ReadyState MediaPlayerPrivateQt::readyState() const
{
return m_readyState;
}
-void MediaPlayerPrivate::setVisible(bool visible)
+void MediaPlayerPrivateQt::setVisible(bool visible)
{
m_isVisible = visible;
}
-void MediaPlayerPrivate::mediaStatusChanged(QMediaPlayer::MediaStatus)
+void MediaPlayerPrivateQt::mediaStatusChanged(QMediaPlayer::MediaStatus)
{
updateStates();
}
-void MediaPlayerPrivate::handleError(QMediaPlayer::Error)
+void MediaPlayerPrivateQt::handleError(QMediaPlayer::Error)
{
updateStates();
}
-void MediaPlayerPrivate::stateChanged(QMediaPlayer::State state)
+void MediaPlayerPrivateQt::stateChanged(QMediaPlayer::State state)
{
if (state != QMediaPlayer::PlayingState && m_isSeeking && m_queuedSeek >= 0) {
m_mediaPlayer->setPosition(m_queuedSeek);
@@ -437,12 +437,12 @@ void MediaPlayerPrivate::stateChanged(QMediaPlayer::State state)
}
}
-void MediaPlayerPrivate::nativeSizeChanged(const QSizeF&)
+void MediaPlayerPrivateQt::nativeSizeChanged(const QSizeF&)
{
m_player->sizeChanged();
}
-void MediaPlayerPrivate::queuedSeekTimeout()
+void MediaPlayerPrivateQt::queuedSeekTimeout()
{
// If we haven't heard anything, assume the player is now paused
// and we can attempt the seek
@@ -455,7 +455,7 @@ void MediaPlayerPrivate::queuedSeekTimeout()
}
}
-void MediaPlayerPrivate::seekTimeout()
+void MediaPlayerPrivateQt::seekTimeout()
{
// If we haven't heard anything, assume the seek succeeded
if (m_isSeeking) {
@@ -464,7 +464,7 @@ void MediaPlayerPrivate::seekTimeout()
}
}
-void MediaPlayerPrivate::positionChanged(qint64)
+void MediaPlayerPrivateQt::positionChanged(qint64)
{
// Only propogate this event if we are seeking
if (m_isSeeking && m_queuedSeek == -1) {
@@ -473,27 +473,27 @@ void MediaPlayerPrivate::positionChanged(qint64)
}
}
-void MediaPlayerPrivate::bufferStatusChanged(int)
+void MediaPlayerPrivateQt::bufferStatusChanged(int)
{
notImplemented();
}
-void MediaPlayerPrivate::durationChanged(qint64)
+void MediaPlayerPrivateQt::durationChanged(qint64)
{
m_player->durationChanged();
}
-void MediaPlayerPrivate::volumeChanged(int volume)
+void MediaPlayerPrivateQt::volumeChanged(int volume)
{
m_player->volumeChanged(static_cast<float>(volume) / 100.0);
}
-void MediaPlayerPrivate::mutedChanged(bool muted)
+void MediaPlayerPrivateQt::mutedChanged(bool muted)
{
m_player->muteChanged(muted);
}
-void MediaPlayerPrivate::updateStates()
+void MediaPlayerPrivateQt::updateStates()
{
// Store the old states so that we can detect a change and raise change events
MediaPlayer::NetworkState oldNetworkState = m_networkState;
@@ -544,7 +544,7 @@ void MediaPlayerPrivate::updateStates()
m_player->networkStateChanged();
}
-void MediaPlayerPrivate::setSize(const IntSize& size)
+void MediaPlayerPrivateQt::setSize(const IntSize& size)
{
if (size == m_currentSize)
return;
@@ -553,7 +553,7 @@ void MediaPlayerPrivate::setSize(const IntSize& size)
m_videoItem->setSize(QSizeF(QSize(size)));
}
-IntSize MediaPlayerPrivate::naturalSize() const
+IntSize MediaPlayerPrivateQt::naturalSize() const
{
if (!hasVideo() || m_readyState < MediaPlayer::HaveMetadata)
return IntSize();
@@ -561,7 +561,7 @@ IntSize MediaPlayerPrivate::naturalSize() const
return IntSize(m_videoItem->nativeSize().toSize());
}
-void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect& rect)
+void MediaPlayerPrivateQt::paint(GraphicsContext* context, const IntRect& rect)
{
#if USE(ACCELERATED_COMPOSITING)
if (m_composited)
@@ -580,13 +580,13 @@ void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect& rect)
m_videoScene->render(painter, QRectF(QRect(rect)), m_videoItem->sceneBoundingRect());
}
-void MediaPlayerPrivate::repaint()
+void MediaPlayerPrivateQt::repaint()
{
m_player->repaint();
}
#if USE(ACCELERATED_COMPOSITING)
-void MediaPlayerPrivate::acceleratedRenderingStateChanged()
+void MediaPlayerPrivateQt::acceleratedRenderingStateChanged()
{
bool composited = m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player);
if (composited == m_composited)
@@ -599,17 +599,17 @@ void MediaPlayerPrivate::acceleratedRenderingStateChanged()
m_videoScene->addItem(m_videoItem);
}
-PlatformLayer* MediaPlayerPrivate::platformLayer() const
+PlatformLayer* MediaPlayerPrivateQt::platformLayer() const
{
return m_composited ? m_videoItem : 0;
}
#endif
-PlatformMedia MediaPlayerPrivate::platformMedia() const
+PlatformMedia MediaPlayerPrivateQt::platformMedia() const
{
PlatformMedia pm;
pm.type = PlatformMedia::QtMediaPlayerType;
- pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivate*>(this);
+ pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivateQt*>(this);
return pm;
}
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index 117187d..620b824 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -33,13 +33,13 @@ QT_END_NAMESPACE
namespace WebCore {
-class MediaPlayerPrivate : public QObject, public MediaPlayerPrivateInterface {
+class MediaPlayerPrivateQt : public QObject, public MediaPlayerPrivateInterface {
Q_OBJECT
public:
static MediaPlayerPrivateInterface* create(MediaPlayer* player);
- ~MediaPlayerPrivate();
+ ~MediaPlayerPrivateQt();
static void registerMediaEngine(MediaEngineRegistrar);
static void getSupportedTypes(HashSet<String>&);
@@ -118,7 +118,7 @@ private:
void updateStates();
private:
- MediaPlayerPrivate(MediaPlayer*);
+ MediaPlayerPrivateQt(MediaPlayer*);
MediaPlayer* m_player;
QMediaPlayer* m_mediaPlayer;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list