aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input/ffmpeg')
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp4
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp3
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp3
3 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
index a27a687fe..7e3bad222 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpegcue.cpp
@@ -20,7 +20,7 @@
#include <QObject>
#include <QFile>
-#include <QRegExp>
+#include <QRegularExpression>
#include <qmmp/cueparser.h>
#include "decoder_ffmpeg.h"
#include "decoder_ffmpegcue.h"
@@ -54,7 +54,7 @@ bool DecoderFFmpegCue::initialize()
return false;
}
filePath.remove("ffmpeg://");
- filePath.remove(QRegExp("#\\d+$"));
+ filePath.remove(QRegularExpression("#\\d+$"));
m_track = m_url.section("#", -1).toInt();
AVFormatContext *in = nullptr;
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 4fb284b98..06666d352 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -21,6 +21,7 @@
#include <QSettings>
#include <QMessageBox>
#include <QFileInfo>
+#include <QRegularExpression>
#include <qmmp/cueparser.h>
extern "C"{
#include <libavformat/avformat.h>
@@ -180,7 +181,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
if(path.contains("://")) //is it cue track?
{
filePath.remove("ffmpeg://");
- filePath.remove(QRegExp("#\\d+$"));
+ filePath.remove(QRegularExpression("#\\d+$"));
cueTrack = path.section("#", -1).toInt();
parts = TrackInfo::AllParts; //extract all metadata for single cue track
}
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index eeb7d3681..032eec593 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <QRegularExpression>
extern "C" {
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
@@ -33,7 +34,7 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(tr
if(path.startsWith("ffmpeg://"))
{
filePath.remove("ffmpeg://");
- filePath.remove(QRegExp("#\\d+$"));
+ filePath.remove(QRegularExpression("#\\d+$"));
}
#ifdef Q_OS_WIN