From 2d264a80f9fc759e979dfe2583425cb419688a70 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 16 Feb 2010 10:56:47 +1000
Subject: Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include
QtOpenGL.
---
src/multimedia/base/qgraphicsvideoitem.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index 85369db..21ba8c9 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -47,7 +47,10 @@
#include <QtMultimedia/qvideooutputcontrol.h>
#include <QtMultimedia/qvideorenderercontrol.h>
#include <QtMultimedia/qvideosurfaceformat.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
#include <QtOpenGL/qgl.h>
+#endif
QT_BEGIN_NAMESPACE
@@ -384,6 +387,7 @@ void QGraphicsVideoItem::paint(
if (d->surface && d->surface->isActive()) {
d->surface->paint(painter, d->boundingRect, d->sourceRect);
d->surface->setReady(true);
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
} else if (d->updatePaintDevice && (painter->paintEngine()->type() == QPaintEngine::OpenGL
|| painter->paintEngine()->type() == QPaintEngine::OpenGL2)) {
d->updatePaintDevice = false;
@@ -394,6 +398,7 @@ void QGraphicsVideoItem::paint(
} else {
d->surface->setShaderType(QPainterVideoSurface::FragmentProgramShader);
}
+#endif
}
}
--
cgit v0.12
From 2f29860320796ad6f94f51daf6af84515c288ec8 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Tue, 16 Feb 2010 12:33:05 +1000
Subject: Fixed compile error in pulseaudio soundeffect implementation
---
src/multimedia/qml/qsoundeffect_pulse_p.cpp | 4 ++--
src/multimedia/qml/qsoundeffect_pulse_p.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
index 6d7b222..b1e5982 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
@@ -151,7 +151,7 @@ private:
m_mainLoopApi = pa_threaded_mainloop_get_api(m_mainLoop);
lock();
- m_context = pa_context_new(m_mainLoopApi, QString("QtPulseAudio:%1").arg(::getpid()).toAscii().constData());
+ m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toAscii().constData());
#if(Q_WS_MAEMO_5)
pa_context_set_state_callback(m_context, context_state_callback, this);
@@ -362,7 +362,7 @@ void QSoundEffectPrivate::decoderReady()
}
if (m_name.isNull())
- m_name = QString("QtPulseSample-%1-%2").arg(::getpid()).arg(int(this)).toUtf8();
+ m_name = QString(QLatin1String("QtPulseSample-%1-%2")).arg(::getpid()).arg(int(this)).toUtf8();
pa_sample_spec spec = audioFormatToSampleSpec(m_waveDecoder->audioFormat());
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.h b/src/multimedia/qml/qsoundeffect_pulse_p.h
index 155d7fc..58a05d2 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.h
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.h
@@ -57,7 +57,7 @@
#include "qsoundeffect_p.h"
#include <QtCore/qobject.h>
-#include <QtCore/qtime.h>
+#include <QtCore/qdatetime.h>
#include <QtMultimedia/qmediaplayer.h>
#include <pulse/pulseaudio.h>
--
cgit v0.12
From 78967c9f7cfba6142a5f987a1fe81692b479a6d2 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Tue, 16 Feb 2010 12:33:26 +1000
Subject: Added multimedia to qmlviewer
---
tools/qmlviewer/qmlviewer.pro | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index 35e4ba8..003115d 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -7,6 +7,10 @@ QT += declarative \
network \
sql
+contains(QT_CONFIG, multimedia) {
+ QT += multimedia
+}
+
contains(QT_CONFIG, opengl) {
QT += opengl
DEFINES += GL_SUPPORTED
--
cgit v0.12