slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: simplify checking the available version.

Browse Source 
Make use of SND_LIB_VERSION instead of SND_LIB_[MAJOR MINOR SUBMINOR]
in order to simplify the tests.

Task-number: QTBUG-51681
Change-Id: Ib9f28ff15ddc643cc426ded3a5779fb4ff651139
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lisandro Damián Nicanor Pérez Meyer
2016-03-05 10:36:42 -03:00
parent 77c9ab4a38
commit 680cc0c974
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/alsa/alsatest.cpp
View File

@@ -32,7 +32,7 @@
****************************************************************************/ ****************************************************************************/
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) #if SND_LIB_VERSION < 0x1000a // 1.0.10
#error "Alsa version found too old, require >= 1.0.10" #error "Alsa version found too old, require >= 1.0.10"
#endif #endif

8
src/plugins/alsa/qalsaaudiodeviceinfo.cpp
View File

@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
QList<QByteArray> devices = availableDevices(mode); QList<QByteArray> devices = availableDevices(mode);
if(dev.compare(QLatin1String("default")) == 0) { if(dev.compare(QLatin1String("default")) == 0) {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
if (devices.size() > 0) if (devices.size() > 0)
dev = QLatin1String(devices.first().constData()); dev = QLatin1String(devices.first().constData());
else else
@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
dev = QLatin1String("hw:0,0"); dev = QLatin1String("hw:0,0");
#endif #endif
} else { } else {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
dev = device; dev = device;
#else #else
int idx = 0; int idx = 0;
@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const
snd_pcm_hw_params_t *params; snd_pcm_hw_params_t *params;
QString dev; QString dev;
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
dev = device; dev = device;
if (dev.compare(QLatin1String("default")) == 0) { if (dev.compare(QLatin1String("default")) == 0) {
QList<QByteArray> devices = availableDevices(QAudio::AudioOutput); QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
QList<QByteArray> devices; QList<QByteArray> devices;
QByteArray filter; QByteArray filter;
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
// Create a list of all current audio devices that support mode // Create a list of all current audio devices that support mode
void **hints, **n; void **hints, **n;
char *name, *descr, *io; char *name, *descr, *io;

4
src/plugins/alsa/qalsaaudioinput.cpp
View File

@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
QString dev = QString(QLatin1String(m_device.constData())); QString dev = QString(QLatin1String(m_device.constData()));
QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput); QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput);
if(dev.compare(QLatin1String("default")) == 0) { if(dev.compare(QLatin1String("default")) == 0) {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
if (devices.size() > 0) if (devices.size() > 0)
dev = QLatin1String(devices.first()); dev = QLatin1String(devices.first());
else else
@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
dev = QLatin1String("hw:0,0"); dev = QLatin1String("hw:0,0");
#endif #endif
} else { } else {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
dev = QLatin1String(m_device); dev = QLatin1String(m_device);
#else #else
int idx = 0; int idx = 0;

4
src/plugins/alsa/qalsaaudiooutput.cpp
View File

@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
QString dev = QString(QLatin1String(m_device.constData())); QString dev = QString(QLatin1String(m_device.constData()));
QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput); QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
if(dev.compare(QLatin1String("default")) == 0) { if(dev.compare(QLatin1String("default")) == 0) {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
if (devices.size() > 0) if (devices.size() > 0)
dev = QLatin1String(devices.first()); dev = QLatin1String(devices.first());
else else
@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
dev = QLatin1String("hw:0,0"); dev = QLatin1String("hw:0,0");
#endif #endif
} else { } else {
#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) #if SND_LIB_VERSION >= 0x1000e // 1.0.14
dev = QLatin1String(m_device); dev = QLatin1String(m_device);
#else #else
int idx = 0; int idx = 0;