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

Android: Clean-up in jmultimediautils class.

Browse Source 
Remove unused code.

Change-Id: I2c0db45dd95e6a79387bba1b1ccd4b62b7d22aec
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Christian Strømme
2014-03-27 12:21:23 +01:00
committed by The Qt Project
parent 4ba7b22390
commit ccce4e3da2
3 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,6 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
if (!JMediaPlayer::initJNI(jniEnv) || if (!JMediaPlayer::initJNI(jniEnv) ||
!JCamera::initJNI(jniEnv) || !JCamera::initJNI(jniEnv) ||
!JMultimediaUtils::initJNI(jniEnv) ||
!JMediaRecorder::initJNI(jniEnv)) { !JMediaRecorder::initJNI(jniEnv)) {
return JNI_ERR; return JNI_ERR;
} }

31
src/plugins/android/src/wrappers/jmultimediautils.cpp
View File

@@ -45,27 +45,24 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static jclass g_qtMultimediaUtilsClass = 0;
JMultimediaUtils::JMultimediaUtils()
: QObject()
, QJNIObjectPrivate(g_qtMultimediaUtilsClass)
{
}
void JMultimediaUtils::enableOrientationListener(bool enable) void JMultimediaUtils::enableOrientationListener(bool enable)
{ {
callStaticMethod<void>(g_qtMultimediaUtilsClass, "enableOrientationListener", "(Z)V", enable); QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils",
"enableOrientationListener",
"(Z)V",
enable);
} }
int JMultimediaUtils::getDeviceOrientation() int JMultimediaUtils::getDeviceOrientation()
{ {
return callStaticMethod<jint>(g_qtMultimediaUtilsClass, "getDeviceOrientation"); return QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils",
"getDeviceOrientation");
} }
QString JMultimediaUtils::getDefaultMediaDirectory(MediaType type) QString JMultimediaUtils::getDefaultMediaDirectory(MediaType type)
{ {
QJNIObjectPrivate path = callStaticObjectMethod(g_qtMultimediaUtilsClass, QJNIObjectPrivate path = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/multimedia/QtMultimediaUtils",
"getDefaultMediaDirectory", "getDefaultMediaDirectory",
"(I)Ljava/lang/String;", "(I)Ljava/lang/String;",
jint(type)); jint(type));
@@ -74,22 +71,10 @@ QString JMultimediaUtils::getDefaultMediaDirectory(MediaType type)
void JMultimediaUtils::registerMediaFile(const QString &file) void JMultimediaUtils::registerMediaFile(const QString &file)
{ {
callStaticMethod<void>(g_qtMultimediaUtilsClass, QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils",
"registerMediaFile", "registerMediaFile",
"(Ljava/lang/String;)V", "(Ljava/lang/String;)V",
QJNIObjectPrivate::fromString(file).object()); QJNIObjectPrivate::fromString(file).object());
} }
bool JMultimediaUtils::initJNI(JNIEnv *env)
{
jclass clazz = env->FindClass("org/qtproject/qt5/android/multimedia/QtMultimediaUtils");
if (env->ExceptionCheck())
env->ExceptionClear();
if (clazz)
g_qtMultimediaUtilsClass = static_cast<jclass>(env->NewGlobalRef(clazz));
return true;
}
QT_END_NAMESPACE QT_END_NAMESPACE

7
src/plugins/android/src/wrappers/jmultimediautils.h
View File

@@ -47,9 +47,8 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class JMultimediaUtils : public QObject, public QJNIObjectPrivate class JMultimediaUtils
{ {
Q_OBJECT
public: public:
enum MediaType { enum MediaType {
Music = 0, Music = 0,
@@ -58,14 +57,10 @@ public:
Sounds = 3 Sounds = 3
}; };
JMultimediaUtils();
static void enableOrientationListener(bool enable); static void enableOrientationListener(bool enable);
static int getDeviceOrientation(); static int getDeviceOrientation();
static QString getDefaultMediaDirectory(MediaType type); static QString getDefaultMediaDirectory(MediaType type);
static void registerMediaFile(const QString &file); static void registerMediaFile(const QString &file);
static bool initJNI(JNIEnv *env);
}; };
QT_END_NAMESPACE QT_END_NAMESPACE