diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
| commit | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (patch) | |
| tree | 33e55f0cba22d73a7207b6237156daca1dcd624e /src/plugins/qnx-audio | |
| parent | 0cb4dc5c1fded81b4f47945b51b8de0b0151bf67 (diff) | |
| parent | d3a2d9c96994c56d67467c131b8f080510d1a8fd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
qtmultimedia.pro
src/multimedia/playback/qmediaplayer.cpp
src/plugins/directshow/directshow.pro
tests/auto/integration/qmediaplayerbackend/BLACKLIST
Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
Diffstat (limited to 'src/plugins/qnx-audio')
| -rw-r--r-- | src/plugins/qnx-audio/audio/qnxaudioinput.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qnx-audio/audio/qnxaudiooutput.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp index fc67f4211..35d11597c 100644 --- a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp +++ b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp @@ -282,7 +282,7 @@ bool QnxAudioInput::open() } // Necessary so that bytesFree() which uses the "free" member of the status struct works - snd_pcm_plugin_set_disable(m_pcmHandle, PLUGIN_DISABLE_MMAP); + snd_pcm_plugin_set_disable(m_pcmHandle, PLUGIN_MMAP); snd_pcm_channel_info_t info; memset(&info, 0, sizeof(info)); diff --git a/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp b/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp index 2c196624b..d5805c2bd 100644 --- a/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp +++ b/src/plugins/qnx-audio/audio/qnxaudiooutput.cpp @@ -286,7 +286,7 @@ bool QnxAudioOutput::open() } // Necessary so that bytesFree() which uses the "free" member of the status struct works - snd_pcm_plugin_set_disable(m_pcmHandle, PLUGIN_DISABLE_MMAP); + snd_pcm_plugin_set_disable(m_pcmHandle, PLUGIN_MMAP); snd_pcm_channel_info_t info; memset(&info, 0, sizeof(info)); |