summaryrefslogtreecommitdiffstats
path: root/src/multimedia/recording
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/recording')
-rw-r--r--src/multimedia/recording/qmediacapturesession.cpp15
-rw-r--r--src/multimedia/recording/qmediacapturesession.h2
-rw-r--r--src/multimedia/recording/qmediarecorder.cpp2
3 files changed, 9 insertions, 10 deletions
diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp
index 0d9ba8d78..1a827ad7a 100644
--- a/src/multimedia/recording/qmediacapturesession.cpp
+++ b/src/multimedia/recording/qmediacapturesession.cpp
@@ -146,7 +146,7 @@ public:
}
\endqml
- \sa Camera, MediaDevice, MediaRecorder, ImageCapture, AudioInput, VideoOutput
+ \sa Camera, MediaDevices, MediaRecorder, ImageCapture, AudioInput, VideoOutput
*/
/*!
@@ -179,8 +179,7 @@ QMediaCaptureSession::~QMediaCaptureSession()
/*!
\qmlproperty AudioInput QtMultimedia::CaptureSession::audioInput
- This property holds the audio input that is being used to capture audio..
- \sa setAudioInput()
+ This property holds the audio input that is being used to capture audio.
*/
/*!
@@ -192,16 +191,16 @@ QAudioInput *QMediaCaptureSession::audioInput() const
}
/*!
- Sets the audio input device to \a device. If setting it to an empty
+ Sets the audio input device to \a input. If setting it to an empty
QAudioDevice the capture session will use the default input as
defined by the operating system.
*/
-void QMediaCaptureSession::setAudioInput(QAudioInput *device)
+void QMediaCaptureSession::setAudioInput(QAudioInput *input)
{
- if (d_ptr->audioInput == device)
+ if (d_ptr->audioInput == input)
return;
- d_ptr->audioInput = device;
- d_ptr->captureSession->setAudioInput(device ? device->handle() : nullptr);
+ d_ptr->audioInput = input;
+ d_ptr->captureSession->setAudioInput(input ? input->handle() : nullptr);
emit audioInputChanged();
}
diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h
index 5ae152d8e..5941ccaf1 100644
--- a/src/multimedia/recording/qmediacapturesession.h
+++ b/src/multimedia/recording/qmediacapturesession.h
@@ -69,7 +69,7 @@ public:
~QMediaCaptureSession();
QAudioInput *audioInput() const;
- void setAudioInput(QAudioInput *device);
+ void setAudioInput(QAudioInput *input);
QCamera *camera() const;
void setCamera(QCamera *camera);
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index e7a0b082c..36d8a2f86 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -586,7 +586,7 @@ QMediaCaptureSession *QMediaRecorder::captureSession() const
return d->captureSession;
}
/*!
- \qmlproprty enumeration QtMultimedia::MediaRecorder::quality
+ \qmlproperty enumeration QtMultimedia::MediaRecorder::quality
Enumerates quality encoding levels.