diff options
author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-11-28 09:57:06 +0100 |
---|---|---|
committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-11-28 13:59:13 +0000 |
commit | 3013fc41c2ac9a83c480543f5115265fb856df1f (patch) | |
tree | 862bb0866a5735721cb558a5a0e0a08798edbdd6 /src | |
parent | 128c7c43060f87b76cd4e27160cf27a6d09ed228 (diff) |
Fix typo: to setup -> to set up
Change-Id: Ia9c8964ce8671fcf384c5590b4fcb804a3e42915
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 5a0b6bee16c9b71589209e6aa18a77c987d27800)
Diffstat (limited to 'src')
8 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/android/qandroidaudiosink.cpp b/src/multimedia/android/qandroidaudiosink.cpp index 39f3132b1..3cbb7dd0a 100644 --- a/src/multimedia/android/qandroidaudiosink.cpp +++ b/src/multimedia/android/qandroidaudiosink.cpp @@ -322,7 +322,7 @@ bool QAndroidAudioSink::preparePlayer() return true; if (!QOpenSLESEngine::setAudioOutput(m_deviceName)) - qWarning() << "Unable to setup Audio Output Device"; + qWarning() << "Unable to set up Audio Output Device"; SLEngineItf engine = QOpenSLESEngine::instance()->slEngine(); if (!engine) { diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp index 22ccc1ac5..786e058e7 100644 --- a/src/multimedia/video/qvideoframeformat.cpp +++ b/src/multimedia/video/qvideoframeformat.cpp @@ -76,7 +76,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFrameFormatPrivate); A video sink presents a stream of video frames. QVideoFrameFormat describes the type of the frames and determines how they should be presented. - The core properties of a video stream required to setup a video sink are the pixel format + The core properties of a video stream required to set up a video sink are the pixel format given by pixelFormat(), and the frame dimensions given by frameSize(). The region of a frame that is actually displayed on a video surface is given by the viewport(). diff --git a/src/multimedia/windows/qwindowsaudiosink.cpp b/src/multimedia/windows/qwindowsaudiosink.cpp index f38654d92..edde1fa52 100644 --- a/src/multimedia/windows/qwindowsaudiosink.cpp +++ b/src/multimedia/windows/qwindowsaudiosink.cpp @@ -236,7 +236,7 @@ bool QWindowsAudioSink::open() } if (!m_resampler.setup(m_format, QWindowsAudioUtils::waveFormatExToFormat(*pwfx))) { - qCWarning(qLcAudioOutput) << "Failed to setup resampler"; + qCWarning(qLcAudioOutput) << "Failed to set up resampler"; CoTaskMemFree(pwfx); return false; } diff --git a/src/multimedia/windows/qwindowsaudiosource.cpp b/src/multimedia/windows/qwindowsaudiosource.cpp index 23fc18828..808872115 100644 --- a/src/multimedia/windows/qwindowsaudiosource.cpp +++ b/src/multimedia/windows/qwindowsaudiosource.cpp @@ -314,7 +314,7 @@ bool QWindowsAudioSource::open() for(int i=0; i<buffer_size/period_size; i++) { result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR)); if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",i,result); + qWarning("QAudioSource: failed to set up block %d,err=%d",i,result); errorState = QAudio::OpenError; deviceState = QAudio::StoppedState; emit stateChanged(deviceState); @@ -495,7 +495,7 @@ qint64 QWindowsAudioSource::read(char* data, qint64 len) } result = waveInAddBuffer(hWaveIn, &waveBlocks[header], sizeof(WAVEHDR)); if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",header,result); + qWarning("QAudioSource: failed to set up block %d,err=%d",header,result); errorState = QAudio::IOError; mutex.lock(); @@ -535,7 +535,7 @@ void QWindowsAudioSource::resume() for(int i=0; i<buffer_size/period_size; i++) { result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR)); if(result != MMSYSERR_NOERROR) { - qWarning("QAudioSource: failed to setup block %d,err=%d",i,result); + qWarning("QAudioSource: failed to set up block %d,err=%d",i,result); errorState = QAudio::OpenError; deviceState = QAudio::StoppedState; emit stateChanged(deviceState); diff --git a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp index e572d5671..e00641419 100644 --- a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp +++ b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp @@ -919,7 +919,7 @@ void QV4L2Camera::startCapturing() buf.memory = V4L2_MEMORY_MMAP; if (ioctl(d->v4l2FileDescriptor, VIDIOC_QBUF, &buf) < 0) { - qWarning() << "failed to setup mapped buffer"; + qWarning() << "failed to set up mapped buffer"; return; } } diff --git a/src/plugins/multimedia/qnx/camera/qqnxcamera.cpp b/src/plugins/multimedia/qnx/camera/qqnxcamera.cpp index 2afd4bc85..b05407b7b 100644 --- a/src/plugins/multimedia/qnx/camera/qqnxcamera.cpp +++ b/src/plugins/multimedia/qnx/camera/qqnxcamera.cpp @@ -411,7 +411,7 @@ void QQnxCamera::setEvOffset(float ev) return; if (camera_set_ev_offset(m_handle.get(), ev) != CAMERA_EOK) - qWarning("QQnxCamera: Failed to setup exposure compensation"); + qWarning("QQnxCamera: Failed to set up exposure compensation"); } uint32_t QQnxCamera::manualIsoSensitivity() const diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp index 45bc70d65..7b271d089 100644 --- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp +++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp @@ -109,7 +109,7 @@ void MFAudioDecoderControl::startReadingSource(IMFMediaSource *source) } if (!m_resampler.setup(mediaFormat, m_outputFormat.isValid() ? m_outputFormat : mediaFormat)) { - qWarning() << "Failed to setup resampler"; + qWarning() << "Failed to set up resampler"; return; } diff --git a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp index 214efde72..bc87e59a2 100644 --- a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp +++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp @@ -24,7 +24,7 @@ QWindowsIUPointer<IMFMediaType> MFDecoderSourceReader::setSource(IMFMediaSource HRESULT hr = MFCreateSourceReaderFromMediaSource(source, attr.get(), m_sourceReader.address()); if (FAILED(hr)) { - qWarning() << "MFDecoderSourceReader: failed to setup source reader: " + qWarning() << "MFDecoderSourceReader: failed to set up source reader: " << std::system_category().message(hr).c_str(); return mediaType; } |