diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-11 13:40:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 10:03:10 +0200 |
| commit | 634894a8a83b021386da8c2672628b0b26185ef3 (patch) | |
| tree | 40ad48c0dbcc019a959d17154a11518d81b2693a /src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp | |
| parent | 57b7a6cf44fdf867abc8598b3850df962dfef029 (diff) | |
Get rid of QAudio::Role
This was only ever implemented to some extent for Android.
Remove for now, as it's not really an important feature and
can't be implemented properly on many of our platforms.
Change-Id: Idc4d21c857380088ca6d10d59a0e05d192899534
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp')
| -rw-r--r-- | src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp index 59543874b..99f2dc09b 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp +++ b/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp @@ -305,6 +305,7 @@ bool QPulseAudioSink::open() qint64 bytesPerSecond = m_format.sampleRate() * m_format.bytesPerFrame(); +#if 0 static const char *mediaRoleFromAudioRole[] = { nullptr, // UnknownRole "music", // MusicRole @@ -322,6 +323,7 @@ bool QPulseAudioSink::open() const char *r = mediaRoleFromAudioRole[m_role]; if (r) pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, r); +#endif static const auto mapName = qEnvironmentVariable("QT_PA_CHANNEL_MAP"); pa_channel_map_def_t mapDef = PA_CHANNEL_MAP_DEFAULT; @@ -360,8 +362,8 @@ bool QPulseAudioSink::open() pa_stream_set_overflow_callback(m_stream, outputStreamOverflowCallback, this); pa_stream_set_latency_update_callback(m_stream, outputStreamLatencyCallback, this); - if (m_bufferSize <= 0 && m_role == QAudio::GameRoleRole) - m_bufferSize = bytesPerSecond * LowLatencyBufferSizeMs / qint64(1000); +// if (m_bufferSize <= 0 && m_role == QAudio::GameRoleRole) +// m_bufferSize = bytesPerSecond * LowLatencyBufferSizeMs / qint64(1000); pa_buffer_attr requestedBuffer; requestedBuffer.fragsize = (uint32_t)-1; @@ -385,7 +387,7 @@ bool QPulseAudioSink::open() pa_threaded_mainloop_wait(pulseEngine->mainloop()); const pa_buffer_attr *buffer = pa_stream_get_buffer_attr(m_stream); - m_periodTime = (m_role == QAudio::GameRole) ? LowLatencyPeriodTimeMs : PeriodTimeMs; + m_periodTime = /*(m_role == QAudio::GameRole) ? LowLatencyPeriodTimeMs :*/ PeriodTimeMs; m_periodSize = pa_usec_to_bytes(m_periodTime*1000, &m_spec); m_bufferSize = buffer->tlength; m_maxBufferSize = buffer->maxlength; |