diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-05-09 17:32:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 13:19:21 +0200 |
| commit | 92147420124f28c4c844b4603de7ab412e084d9f (patch) | |
| tree | 9be1a2acd4c4a9021e5173116f333e7acd3ff2d6 /src/plugins/android/src/common | |
| parent | efa4628e7489677166aadde5f94376d5e41146f9 (diff) | |
Android: Rename the wrapper classes
Change-Id: I2ce15c8475da3186f128ba59b7c58f9b5b0a67e1
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/src/common')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideorendercontrol.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideorendercontrol.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp index 1891e9d10..dfeea33c1 100644 --- a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp +++ b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qandroidvideorendercontrol.h" +#include "androidsurfacetexture.h" -#include <QtCore/private/qjni_p.h> #include <QAbstractVideoSurface> #include <QVideoSurfaceFormat> #include <qevent.h> @@ -50,7 +50,6 @@ #include <qopenglfunctions.h> #include <qopenglshaderprogram.h> #include <qopenglframebufferobject.h> -#include <QtCore/private/qjnihelpers_p.h> QT_BEGIN_NAMESPACE @@ -175,7 +174,7 @@ bool QAndroidVideoRendererControl::initSurfaceTexture() return false; } - m_surfaceTexture = new JSurfaceTexture(m_externalTex); + m_surfaceTexture = new AndroidSurfaceTexture(m_externalTex); if (m_surfaceTexture->object()) { connect(m_surfaceTexture, SIGNAL(frameAvailable()), this, SLOT(onFrameAvailable())); diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.h b/src/plugins/android/src/common/qandroidvideorendercontrol.h index 75fd7ef12..83d57a437 100644 --- a/src/plugins/android/src/common/qandroidvideorendercontrol.h +++ b/src/plugins/android/src/common/qandroidvideorendercontrol.h @@ -45,13 +45,13 @@ #include <qvideorenderercontrol.h> #include <qmutex.h> #include "qandroidvideooutput.h" -#include "jsurfacetexture.h" QT_BEGIN_NAMESPACE class QOpenGLTexture; class QOpenGLFramebufferObject; class QOpenGLShaderProgram; +class AndroidSurfaceTexture; class OpenGLResourcesDeleter : public QObject { @@ -113,7 +113,7 @@ private: QSize m_nativeSize; QJNIObjectPrivate *m_androidSurface; - JSurfaceTexture *m_surfaceTexture; + AndroidSurfaceTexture *m_surfaceTexture; QJNIObjectPrivate *m_surfaceHolder; quint32 m_externalTex; |