diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-27 13:39:20 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-28 11:51:06 +0000 |
commit | 0026e2f288227577ef83f588eb309f1faf4cf39d (patch) | |
tree | a46b779e3c1f4052798c3805c9138a3812c59fc5 /tests | |
parent | 31de9950e504ba8d3c183f6ce81994c2dc7d270c (diff) |
Fix compiler warning by removing half-deleted code
In commit fdaa059fcc04252a533477e6af4ff139afba93ca, before moving to
tst_qaudiosource.cpp, Lars removed several instances of
QByteArray buffer(AUDIO_BUFFER, 0);
from the test code, but only deleted the first two words from one of
them, leading to a compiler kvetch about the left operand of a comma
operator having no effect. Completed the deletion and removed the
now-unused define AUDIO_BUFFER.
Change-Id: I942759f5f2eb24506f0f7a209e5b4517f40a5a1a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit a17400405a329c855f534fd2fc42e7fb51e1d251)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/integration/qaudiosource/tst_qaudiosource.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp index ddeddcea9..e966498de 100644 --- a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp +++ b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -42,7 +42,6 @@ //TESTED_COMPONENT=src/multimedia -#define AUDIO_BUFFER 192000 #define RANGE_ERR 0.5 template<typename T> inline bool qTolerantCompare(T value, T expected) @@ -527,7 +526,6 @@ void tst_QAudioSource::push() qint64 totalBytesRead = 0; bool firstBuffer = true; - (AUDIO_BUFFER, 0); qint64 len = audioFormat.sampleRate()*audioFormat.bytesPerFrame()/2; // .5 seconds while (totalBytesRead < len) { QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() > 0, 1000); |