From 96543d75ef8d2935b36a19d2601a761cf5ac6396 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 6 May 2021 16:55:54 +0200 Subject: Replace category in QAudioOutput with an audio role This makes the API consistent with QMediaPlayer and removes a place where we accepted random strings without knowing what the backend might do with them. Change-Id: Icdd699bc547eacb9250f4e860e23e5f645dc45d8 Reviewed-by: Volker Hilsheimer --- examples/multimedia/spectrum/app/engine.cpp | 12 ------------ examples/multimedia/spectrum/app/engine.h | 1 - 2 files changed, 13 deletions(-) (limited to 'examples') diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index 8d688ca0d..c251414af 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -68,7 +68,6 @@ //----------------------------------------------------------------------------- const qint64 BufferDurationUs = 10 * 1000000; -const int NotifyIntervalMs = 100; // Size of the level calculation window in microseconds const int LevelWindowUs = 0.1 * 1000000; @@ -113,15 +112,6 @@ Engine::Engine(QObject *parent) for (int i = 0; i < arguments.count(); ++i) { if (arguments.at(i) == QStringLiteral("--")) break; - - if (arguments.at(i) == QStringLiteral("-category") - || arguments.at(i) == QStringLiteral("--category")) { - ++i; - if (i < arguments.count()) - m_audioOutputCategory = arguments.at(i); - else - --i; - } } initialize(); @@ -523,7 +513,6 @@ bool Engine::initialize() } } m_audioOutput = new QAudioOutput(m_audioOutputDevice, m_format, this); - m_audioOutput->setCategory(m_audioOutputCategory); } } else { if (m_file) @@ -538,7 +527,6 @@ bool Engine::initialize() ENGINE_DEBUG << "Engine::initialize" << "m_bufferLength" << m_bufferLength; ENGINE_DEBUG << "Engine::initialize" << "m_dataLength" << m_dataLength; ENGINE_DEBUG << "Engine::initialize" << "format" << m_format; - ENGINE_DEBUG << "Engine::initialize" << "m_audioOutputCategory" << m_audioOutputCategory; return result; } diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h index a6aada174..97c2c7f41 100644 --- a/examples/multimedia/spectrum/app/engine.h +++ b/examples/multimedia/spectrum/app/engine.h @@ -300,7 +300,6 @@ private: const QList m_availableAudioOutputDevices; QAudioDeviceInfo m_audioOutputDevice; QAudioOutput* m_audioOutput; - QString m_audioOutputCategory; qint64 m_playPosition; QBuffer m_audioOutputIODevice; -- cgit v1.2.3