slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: Fix namespace usage.

Browse Source 
Make it possible to build multimedia with a Qt namespace

Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Christian Strømme
2014-04-30 12:31:21 +02:00
committed by The Qt Project
parent 1d6872ae9c
commit 469f9a0c07
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
View File

@@ -69,4 +69,6 @@ private:
QList<QSize> m_supportedResolutions; QList<QSize> m_supportedResolutions;
}; };
QT_END_NAMESPACE
#endif // QANDROIDIMAGEENCODERCONTROL_H #endif // QANDROIDIMAGEENCODERCONTROL_H

4
src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp
View File

@@ -43,6 +43,8 @@
#include "qandroidmediavideoprobecontrol.h" #include "qandroidmediavideoprobecontrol.h"
#include <qvideoframe.h> #include <qvideoframe.h>
QT_BEGIN_NAMESPACE
QAndroidMediaVideoProbeControl::QAndroidMediaVideoProbeControl(QObject *parent) : QAndroidMediaVideoProbeControl::QAndroidMediaVideoProbeControl(QObject *parent) :
QMediaVideoProbeControl(parent) QMediaVideoProbeControl(parent)
{ {
@@ -57,3 +59,5 @@ void QAndroidMediaVideoProbeControl::newFrameProbed(const QVideoFrame &frame)
{ {
emit videoFrameProbed(frame); emit videoFrameProbed(frame);
} }
QT_END_NAMESPACE

4
src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h
View File

@@ -45,6 +45,8 @@
#include <qmediavideoprobecontrol.h> #include <qmediavideoprobecontrol.h>
QT_BEGIN_NAMESPACE
class QAndroidMediaVideoProbeControl : public QMediaVideoProbeControl class QAndroidMediaVideoProbeControl : public QMediaVideoProbeControl
{ {
Q_OBJECT Q_OBJECT
@@ -56,4 +58,6 @@ public:
}; };
QT_END_NAMESPACE
#endif // QANDROIDMEDIAVIDEOPROBECONTROL_H #endif // QANDROIDMEDIAVIDEOPROBECONTROL_H

4
src/plugins/android/src/qandroidmediaserviceplugin.cpp
View File

@@ -147,9 +147,11 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons
return QAndroidCameraInfoControl::orientation(device); return QAndroidCameraInfoControl::orientation(device);
} }
QT_END_NAMESPACE
Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
{ {
QT_USE_NAMESPACE
typedef union { typedef union {
JNIEnv *nativeEnvironment; JNIEnv *nativeEnvironment;
void *venv; void *venv;
@@ -173,5 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
return JNI_VERSION_1_4; return JNI_VERSION_1_4;
} }
QT_END_NAMESPACE

4
src/plugins/android/src/wrappers/jmediaplayer.cpp
View File

@@ -155,8 +155,6 @@ void JMediaPlayer::setDisplay(jobject surfaceHolder)
mMediaPlayer.callMethod<void>("setDisplay", "(Landroid/view/SurfaceHolder;)V", surfaceHolder); mMediaPlayer.callMethod<void>("setDisplay", "(Landroid/view/SurfaceHolder;)V", surfaceHolder);
} }
QT_END_NAMESPACE
static void onErrorNative(JNIEnv *env, jobject thiz, jint what, jint extra, jlong id) static void onErrorNative(JNIEnv *env, jobject thiz, jint what, jint extra, jlong id)
{ {
Q_UNUSED(env); Q_UNUSED(env);
@@ -238,8 +236,6 @@ static void onVideoSizeChangedNative(JNIEnv *env,
Q_EMIT mp->videoSizeChanged(width, height); Q_EMIT mp->videoSizeChanged(width, height);
} }
QT_BEGIN_NAMESPACE
bool JMediaPlayer::initJNI(JNIEnv *env) bool JMediaPlayer::initJNI(JNIEnv *env)
{ {
jclass jClass = env->FindClass("org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer"); jclass jClass = env->FindClass("org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer");