diff options
Diffstat (limited to 'src/plugins')
5 files changed, 10 insertions, 12 deletions
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java index 6818b2909..7fb4a8690 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java +++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java @@ -44,7 +44,6 @@ import java.lang.String; import java.io.FileInputStream; // API is level is < 9 unless marked otherwise. -import android.app.Activity; import android.content.Context; import android.media.MediaPlayer; import android.net.Uri; @@ -68,7 +67,7 @@ public class QtAndroidMediaPlayer private MediaPlayer mMediaPlayer = null; private Uri mUri = null; private final long mID; - private final Activity mActivity; + private final Context mContext; private boolean mMuted = false; private int mVolume = 100; private static final String TAG = "Qt MediaPlayer"; @@ -207,10 +206,10 @@ public class QtAndroidMediaPlayer } - public QtAndroidMediaPlayer(final Activity activity, final long id) + public QtAndroidMediaPlayer(final Context context, final long id) { mID = id; - mActivity = activity; + mContext = context; } private void setState(int state) @@ -363,7 +362,7 @@ public class QtAndroidMediaPlayer final boolean inAssets = (mUri.getScheme().compareTo("assets") == 0); if (inAssets) { final String asset = mUri.getPath().substring(1 /* Remove first '/' */); - final AssetManager am = mActivity.getAssets(); + final AssetManager am = mContext.getAssets(); afd = am.openFd(asset); final long offset = afd.getStartOffset(); final long length = afd.getLength(); @@ -374,7 +373,7 @@ public class QtAndroidMediaPlayer FileDescriptor fd = fis.getFD(); mMediaPlayer.setDataSource(fd); } else { - mMediaPlayer.setDataSource(mActivity, mUri); + mMediaPlayer.setDataSource(mContext, mUri); } setState(State.Initialized); } catch (final IOException e) { diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp index f65d6aade..582d8aa9d 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp @@ -57,10 +57,11 @@ AndroidMediaPlayer::AndroidMediaPlayer() : QObject() { QWriteLocker locker(rwLock); + auto context = QtAndroidPrivate::activity() ? QtAndroidPrivate::activity() : QtAndroidPrivate::service(); const jlong id = reinterpret_cast<jlong>(this); mMediaPlayer = QJNIObjectPrivate(QtAndroidMediaPlayerClassName, - "(Landroid/app/Activity;J)V", - QtAndroidPrivate::activity(), + "(Landroid/content/Context;J)V", + context, id); mediaPlayers->append(this); } diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h index dd5a7b9e3..8976e41cf 100644 --- a/src/plugins/directshow/camera/dscameraservice.h +++ b/src/plugins/directshow/camera/dscameraservice.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE class DSCameraControl; class DSCameraSession; -class DSVideoOutputControl; class DSVideoDeviceControl; class DSImageCaptureControl; class DSCameraViewfinderSettingsControl; @@ -68,7 +67,6 @@ public: private: DSCameraControl *m_control; DSCameraSession *m_session; - DSVideoOutputControl *m_videoOutput; DSVideoDeviceControl *m_videoDevice; QMediaControl *m_videoRenderer; DSImageCaptureControl *m_imageCapture; diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 87b3c4dc5..960c614e0 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -9,7 +9,7 @@ include(mediaplayer/mediaplayer.pri) HEADERS += neutrinoserviceplugin.h SOURCES += neutrinoserviceplugin.cpp OTHER_FILES += neutrino_mediaservice.json +PLUGIN_CLASS_NAME = NeutrinoServicePlugin PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = BbServicePlugin load(qt_plugin) diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index 082358837..39b7b86d9 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -70,4 +70,4 @@ public: QString deviceDescription(const QByteArray &service, const QByteArray &device); }; -#endif // DSSERVICEPLUGIN_H +#endif // WMFSERVICEPLUGIN_H |