diff options
| -rw-r--r-- | examples/multimedia/spectrum/app/wavfile.cpp | 5 | ||||
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp index b0a3ffccc..475200db5 100644 --- a/examples/multimedia/spectrum/app/wavfile.cpp +++ b/examples/multimedia/spectrum/app/wavfile.cpp @@ -49,9 +49,6 @@ ****************************************************************************/ #include <qendian.h> -#include <QVector> -#include <QDebug> -#include "utils.h" #include "wavfile.h" struct chunk @@ -109,7 +106,7 @@ const QAudioFormat &WavFile::fileFormat() const qint64 WavFile::headerLength() const { -return m_headerLength; + return m_headerLength; } bool WavFile::readHeader() diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index f38ade75f..5989d2133 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -44,6 +44,7 @@ #include <QtCore/qdir.h> #include <QtCore/qbytearray.h> #include <QtCore/qvariant.h> +#include <QtCore/qregularexpression.h> #include <QtCore/qsize.h> #include <QtCore/qset.h> #include <QtCore/qstringlist.h> @@ -849,7 +850,7 @@ QSet<QString> QGstUtils::supportedMimeTypes(bool (*isValidFactory)(GstElementFac if (value) { gchar *str = gst_value_serialize(value); QString versions = QLatin1String(str); - const QStringList elements = versions.split(QRegExp(QLatin1String("\\D+")), QString::SkipEmptyParts); + const QStringList elements = versions.split(QRegularExpression(QLatin1String("\\D+")), QString::SkipEmptyParts); for (const QString &e : elements) supportedMimeTypes.insert(nameLowcase + e); g_free(str); @@ -1511,10 +1512,11 @@ QString QGstUtils::fileExtensionForMimeType(const QString &mimeType) if (!extension.isEmpty() || format.isEmpty()) return extension; - QRegExp rx(QStringLiteral("[-/]([\\w]+)$")); + QRegularExpression rx(QStringLiteral("[-/]([\\w]+)$")); + QRegularExpressionMatch match = rx.match(format); - if (rx.indexIn(format) != -1) - extension = rx.cap(1); + if (match.hasMatch()) + extension = match.captured(1); return extension; } diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index f4559de81..77178c322 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -843,6 +843,8 @@ void CameraBinSession::load() return; } + m_recorderControl->applySettings(); + #if QT_CONFIG(gstreamer_encodingprofiles) GstEncodingContainerProfile *profile = m_recorderControl->videoProfile(); if (profile) { @@ -887,8 +889,6 @@ void CameraBinSession::start() setStatus(QCamera::StartingStatus); - m_recorderControl->applySettings(); - setAudioCaptureCaps(); setupCaptureResolution(); |