diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-01-23 15:17:59 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-01-23 15:17:59 +0000 |
| commit | 69f4840a192587d72fee046f3282338589ebcd3f (patch) | |
| tree | 00c9aa86bf8cc31bde5d2e48c374f684e95544b0 | |
| parent | fc72d36e99a63fe18b4df2f51325a9e6617ee5bd (diff) | |
| download | qmmp-69f4840a192587d72fee046f3282338589ebcd3f.tar.gz qmmp-69f4840a192587d72fee046f3282338589ebcd3f.tar.bz2 qmmp-69f4840a192587d72fee046f3282338589ebcd3f.zip | |
fixed problems with alsa < 1.22.00
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1526 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Output/alsa/settingsdialog.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index e47a27cd8..593191086 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -31,9 +31,9 @@ extern "C" SettingsDialog::SettingsDialog ( QWidget *parent ) : QDialog ( parent ) { - ui.setupUi ( this ); - setAttribute ( Qt::WA_DeleteOnClose ); - ui.deviceComboBox->setEditable ( TRUE ); + ui.setupUi (this); + setAttribute (Qt::WA_DeleteOnClose); + ui.deviceComboBox->setEditable (TRUE); getCards(); getSoftDevices(); connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int))); @@ -91,6 +91,7 @@ void SettingsDialog::getCards() void SettingsDialog::getSoftDevices() { +#if SND_LIB_VERSION >= 0x011600 //1.22.00 void **hints = 0; int i = 0; @@ -119,6 +120,7 @@ void SettingsDialog::getSoftDevices() if (hints) snd_device_name_free_hint (hints); +#endif } void SettingsDialog::getCardDevices(int card) |