diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-30 14:41:05 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-31 14:08:16 +0200 |
| commit | 1cce84af3ecb4a570ab36fbe48357934d4d94ba0 (patch) | |
| tree | 2b2865a699f1fc3252331d0e9a6d27226766611f /src | |
| parent | 74ce8e208fd098cacdd044d4688607fdea82cb42 (diff) | |
Move the static variable declaration inside a function
In both files, it doesn't look like that we need these variable in more
than one functions. So, we can move them in their respective functions.
P.S. If not fixed, this breaks the Unity Build since it will result in
a duplicate symbol declaration error.
Pick-to: 6.5
Change-Id: I2e0babeb2422b3d3e4f953c93fb9c5a5ba11366a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/multimedia/qnx/capture/qqnxaudiorecorder.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/multimedia/qnx/capture/qqnxaudiorecorder.cpp b/src/plugins/multimedia/qnx/capture/qqnxaudiorecorder.cpp index ead199fac..00a20bbd7 100644 --- a/src/plugins/multimedia/qnx/capture/qqnxaudiorecorder.cpp +++ b/src/plugins/multimedia/qnx/capture/qqnxaudiorecorder.cpp @@ -12,8 +12,6 @@ #include <sys/stat.h> #include <sys/strm.h> -static int idCounter = 0; - static QByteArray buildDevicePath(const QByteArray &deviceId, const QMediaEncoderSettings &settings) { QByteArray devicePath = QByteArrayLiteral("snd:/dev/snd/") + deviceId + QByteArrayLiteral("?"); @@ -43,6 +41,8 @@ QQnxAudioRecorder::~QQnxAudioRecorder() void QQnxAudioRecorder::openConnection() { + static int idCounter = 0; + m_connection = ConnectionUniquePtr { mmr_connect(nullptr) }; if (!m_connection) { diff --git a/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp b/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp index 8d32ac939..e68f95d6d 100644 --- a/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp +++ b/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp @@ -140,8 +140,6 @@ private: QQnxWindowGrabber::BufferView buffer; }; -static int idCounter = 0; - QT_BEGIN_NAMESPACE QQnxMediaPlayer::QQnxMediaPlayer(QMediaPlayer *parent) @@ -168,6 +166,8 @@ QQnxMediaPlayer::~QQnxMediaPlayer() void QQnxMediaPlayer::openConnection() { + static int idCounter = 0; + m_connection = mmr_connect(nullptr); if (!m_connection) { emitPError(QString::fromLatin1("Unable to connect to the multimedia renderer")); |