diff options
Diffstat (limited to 'src/multimedia/platform/darwin/camera/avfmediaencoder.mm')
| -rw-r--r-- | src/multimedia/platform/darwin/camera/avfmediaencoder.mm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index 6f881f986..96fa82503 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -111,14 +111,8 @@ AVFMediaEncoder::~AVFMediaEncoder() [m_videoSettings release]; } -QUrl AVFMediaEncoder::outputLocation() const +bool AVFMediaEncoder::isLocationWritable(const QUrl &location) const { - return m_outputLocation; -} - -bool AVFMediaEncoder::setOutputLocation(const QUrl &location) -{ - m_outputLocation = location; return location.scheme() == QLatin1String("file") || location.scheme().isEmpty(); } @@ -474,7 +468,7 @@ void AVFMediaEncoder::record() if (!audioOnly) { AVFCamera *cameraControl = m_service->avfCameraControl(); - if (!cameraControl || cameraControl->status() != QCamera::ActiveStatus) { + if (!cameraControl || !cameraControl->isActive()) { qDebugCamera() << Q_FUNC_INFO << "can not start record while camera is not active"; Q_EMIT error(QMediaRecorder::ResourceError, tr("Failed to start recording")); return; @@ -493,8 +487,8 @@ void AVFMediaEncoder::record() // rotation = (screenOrientation + (360 - cameraDevice.orientation())) % 360; } - const QString path(m_outputLocation.scheme() == QLatin1String("file") ? - m_outputLocation.path() : m_outputLocation.toString()); + const QString path(outputLocation().scheme() == QLatin1String("file") ? + outputLocation().path() : outputLocation().toString()); const QUrl fileURL(QUrl::fromLocalFile(m_storageLocation.generateFileName(path, audioOnly ? AVFStorageLocation::Audio : AVFStorageLocation::Video, QLatin1String("clip_"), |