From 69f4840a192587d72fee046f3282338589ebcd3f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 23 Jan 2010 15:17:59 +0000 Subject: 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 --- src/plugins/Output/alsa/settingsdialog.cpp | 10 ++++++---- 1 file 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) -- cgit v1.2.3-13-gbd6f