Both patches are for latest "softphone-classic/branches/1.0".
First patch ( config.patch ) is for compilation bug ( on linux ).
Second patch (alsa.patch) is for portaudio library ( with alsa enabled ). In
the default alsa configuration ( ver 1.0.10 ) there is a lot of devices
which aren't of compound type ( including default plugin ). This patch allows
to choose them and makes wengophone usable.
Regards, Artur Kornacki
Index: libs/portaudio/pa_linux_alsa/pa_linux_alsa.c
===================================================================
--- libs/portaudio/pa_linux_alsa/pa_linux_alsa.c (wersja 4485)
+++ libs/portaudio/pa_linux_alsa/pa_linux_alsa.c (kopia robocza)
@@ -788,7 +788,7 @@
static const char *ignoredPlugins[] = {"hw", "plughw", "plug",
// "default",
"dsnoop", "dmix", "tee",
- "file", "null", "shm", 0};
+ "file", "null", "shm", "cards", 0};
int i;
for( i = 0; ignoredPlugins[i]; ++i )
@@ -914,23 +914,18 @@
snd_config_for_each( i, next, topNode )
{
- const char *tpStr = NULL, *idStr = NULL;
+ const char *idStr = NULL;
char *alsaDeviceName, *deviceName;
- snd_config_t *n = snd_config_iterator_entry( i ), *tp = NULL;
- if( snd_config_get_type( n ) != SND_CONFIG_TYPE_COMPOUND )
- continue;
+ snd_config_t *n = snd_config_iterator_entry( i );
- ENSURE_( snd_config_search( n, "type", &tp ), paUnanticipatedHostError );
- ENSURE_( snd_config_get_string( tp, &tpStr ), paUnanticipatedHostError );
-
ENSURE_( snd_config_get_id( n, &idStr ), paUnanticipatedHostError );
if( IgnorePlugin( idStr ) )
{
- PA_DEBUG(( "%s: Ignoring ALSA plugin device %s of type %s\n", __FUNCTION__, idStr, tpStr ));
+ PA_DEBUG(( "%s: Ignoring ALSA plugin device %s\n", __FUNCTION__, idStr ));
continue;
}
- PA_DEBUG(( "%s: Found plugin %s of type %s\n", __FUNCTION__, idStr, tpStr ));
+ PA_DEBUG(( "%s: Found plugin %s\n", __FUNCTION__, idStr ));
PA_UNLESS( alsaDeviceName = (char*)PaUtil_GroupAllocateMemory( alsaApi->allocations,
strlen(idStr) + 6 ), paInsufficientMemory );
Index: gui/config/GeneralConfigWidget.cpp
===================================================================
--- gui/config/GeneralConfigWidget.cpp (wersja 4485)
+++ gui/config/GeneralConfigWidget.cpp (kopia robocza)
@@ -31,12 +31,11 @@
GeneralConfigWidget::GeneralConfigWidget(QWidget * parent) : QObject(parent) {
_generalConfigWidget = MyWidgetFactory::create("GeneralConfigWidgetForm.ui", this, parent);
+ AdvancedConfig & advancedConfig = AdvancedConfig::getInstance();
#ifdef WIN32
_startup = new Startup("Wengo", QString("\"") + QDir::currentDirPath() + QString("/wengophone.exe\"") + " -background");
- AdvancedConfig & advancedConfig = AdvancedConfig::getInstance();
-
QCheckBox * startupCheckBox = (QCheckBox *) _generalConfigWidget->child("startupCheckBox", "QCheckBox");
if ((_startup->isStartup()) || (advancedConfig.getAutoStart())) {
startupCheckBox->toggle();
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
