diff --git a/src/audiodriversoss.cpp b/src/audiodriversoss.cpp index 5fb9477799f13eca02c9cbe1d2f610f424e572f7..27b156104d1f36aa48bb36e4dd64c6264f57f219 100644 --- a/src/audiodriversoss.cpp +++ b/src/audiodriversoss.cpp @@ -83,7 +83,6 @@ AudioDriversOSS::initDevice (DeviceMode mode) { audio_fd = open (AUDIO_DEVICE, oflag | O_NONBLOCK ); if (audio_fd == -1) { error->errorName(OPEN_FAILED_DEVICE, NULL); - return -1; } diff --git a/src/configurationpanel.ui.h b/src/configurationpanel.ui.h index 7d68dbbe02ae456669a22616d819b521c72d55bf..7c92a2103b6199f0672560a31ec9c286544c54de 100644 --- a/src/configurationpanel.ui.h +++ b/src/configurationpanel.ui.h @@ -22,7 +22,6 @@ void ConfigurationPanel::init() { // For reading settings at application startup - // List skin choice from "skins" directory QDir dir(Skin::getPath(QString(SKINDIR))); if ( !dir.exists() ) { @@ -71,6 +70,7 @@ void ConfigurationPanel::init() "stun.fwdnet.net:3478")); ((QRadioButton*)stunButtonGroup->find(Config::get("Signalisations", "STUN.useStun", 1)))->setChecked(true); // For audio tab + ((QRadioButton*)DriverChoice->find(Config::get("Audio", "Drivers.driverName", 0)))->setChecked(true); #ifdef ALSA diff --git a/src/configurationpanelui.cpp b/src/configurationpanelui.cpp index fcdbd9eb9867c6bee0c0b0604de942c3c1612959..8612f9f466424a0221e696a5a56c6149e948cfe9 100644 --- a/src/configurationpanelui.cpp +++ b/src/configurationpanelui.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'configurationpanel.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:34 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/configurationpanelui.h b/src/configurationpanelui.h index 556385378579c80a7c92a85368f8e4ac167bb4fe..a6684acf38396e124cdf14f56baf497860683f6b 100644 --- a/src/configurationpanelui.h +++ b/src/configurationpanelui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'configurationpanel.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:34 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/global.h b/src/global.h index 7a80902f1ee08bdda0be50ff9a3b1c3fe9bbbaf3..1b050dd4dd7dd6a0b40418236182fcceb9d245e3 100644 --- a/src/global.h +++ b/src/global.h @@ -24,7 +24,7 @@ #define PREFIX "/usr/local" #endif -#define VERSION "0.2" +#define VERSION "0.3" #define PROGNAME "sflphone" #define SKINDIR "skins" #define PIXDIR "pixmaps" diff --git a/src/manager.cpp b/src/manager.cpp index 911b8688d6c1203220890ab2a94671a4d6236065..a9021f5a3f488b9dcbdb799e4253c2a0f9ed883a 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -59,16 +59,16 @@ Manager::Manager (QString *Dc = NULL) { exist = createSettingsPath(); - selectAudioDriver(); phonegui = new QtGUIMainWindow (0, 0 , Qt::WDestructiveClose | Qt::WStyle_Customize | Qt::WStyle_NoBorder,this); + error = new Error(this); + selectAudioDriver(); sip = new SIP(this); tone = new ToneGenerator(this); audioRTP = new AudioRtp(this); - error = new Error(this); sip_init(); @@ -91,6 +91,7 @@ Manager::Manager (QString *Dc = NULL) { } initVolume (); + } Manager::~Manager (void) { diff --git a/src/phonebookui.cpp b/src/phonebookui.cpp index b94dfd6fd63a9a681191bbeced3a9a3b98a79248..3cb38a9af1daf85cf6ec3bf8186078e311ee3c48 100644 --- a/src/phonebookui.cpp +++ b/src/phonebookui.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'phonebook.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:33 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/phonebookui.h b/src/phonebookui.h index 7635aceb72baeae045d6e5a80aff18a7cda3346a..23076321818c2c9792a4e0d37900079f85f44281 100644 --- a/src/phonebookui.h +++ b/src/phonebookui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'phonebook.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:33 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/qtGUImainwindow.cpp b/src/qtGUImainwindow.cpp index c6887a6134e51251562efda83a35368e49f8e787..463a4cb48a17ae347d1b806a7597029ed9049526 100644 --- a/src/qtGUImainwindow.cpp +++ b/src/qtGUImainwindow.cpp @@ -101,7 +101,7 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f, : TransQWidget (parent, name, f) { // Create configuration panel panel = new ConfigurationPanel (0, 0, false); - + // Address book dialog phonebook = new PhoneBook (0, 0, false); diff --git a/src/url_inputui.cpp b/src/url_inputui.cpp index 221fb9ae63554c4cf5b4868fce722657d6bed2ea..946dba5b55eaed847024251e7826aed34253cd86 100644 --- a/src/url_inputui.cpp +++ b/src/url_inputui.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'url_input.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:33 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/url_inputui.h b/src/url_inputui.h index 76e1cdffa474f06ec64a5ca425f3ff1fbbb3d651..0a9011232d41f3edc843418887f86abc1d748d57 100644 --- a/src/url_inputui.h +++ b/src/url_inputui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'url_input.ui' ** -** Created: Tue Apr 26 15:15:15 2005 +** Created: Wed Apr 27 10:37:33 2005 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost!