diff options
Diffstat (limited to 'src/plugins/multimedia/darwin')
-rw-r--r-- | src/plugins/multimedia/darwin/qdarwinintegration.mm | 14 | ||||
-rw-r--r-- | src/plugins/multimedia/darwin/qdarwinintegration_p.h | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/multimedia/darwin/qdarwinintegration.mm b/src/plugins/multimedia/darwin/qdarwinintegration.mm index 314ceaff6..5e26fe5c4 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration.mm +++ b/src/plugins/multimedia/darwin/qdarwinintegration.mm @@ -57,37 +57,37 @@ QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo() return m_formatInfo; } -QPlatformAudioDecoder *QDarwinIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QDarwinIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new AVFAudioDecoder(decoder); } -QPlatformMediaCaptureSession *QDarwinIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QDarwinIntegration::createCaptureSession() { return new AVFCameraService; } -QPlatformMediaPlayer *QDarwinIntegration::createPlayer(QMediaPlayer *player) +QMaybe<QPlatformMediaPlayer *> QDarwinIntegration::createPlayer(QMediaPlayer *player) { return new AVFMediaPlayer(player); } -QPlatformCamera *QDarwinIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QDarwinIntegration::createCamera(QCamera *camera) { return new AVFCamera(camera); } -QPlatformMediaRecorder *QDarwinIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QDarwinIntegration::createRecorder(QMediaRecorder *recorder) { return new AVFMediaEncoder(recorder); } -QPlatformImageCapture *QDarwinIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QDarwinIntegration::createImageCapture(QImageCapture *imageCapture) { return new AVFImageCapture(imageCapture); } -QPlatformVideoSink *QDarwinIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QDarwinIntegration::createVideoSink(QVideoSink *sink) { return new AVFVideoSink(sink); } diff --git a/src/plugins/multimedia/darwin/qdarwinintegration_p.h b/src/plugins/multimedia/darwin/qdarwinintegration_p.h index eb6bfbdce..f8f897c51 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration_p.h +++ b/src/plugins/multimedia/darwin/qdarwinintegration_p.h @@ -29,14 +29,14 @@ public: QPlatformMediaFormatInfo *formatInfo() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *) override; - QPlatformImageCapture *createImageCapture(QImageCapture *) override; - - QPlatformVideoSink *createVideoSink(QVideoSink *) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *camera) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) override; + + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *) override; QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; |