From bddd5f6842e13334c0fcbe73b7b2b959bafc4b1c Mon Sep 17 00:00:00 2001
From: llea <llea>
Date: Wed, 27 Apr 2005 14:35:34 +0000
Subject: [PATCH] *** empty log message ***
---
src/audiodriversoss.cpp | 1 -
src/configurationpanel.ui.h | 2 +-
src/configurationpanelui.cpp | 2 +-
src/configurationpanelui.h | 2 +-
src/global.h | 2 +-
src/manager.cpp | 5 +++--
src/phonebookui.cpp | 2 +-
src/phonebookui.h | 2 +-
src/qtGUImainwindow.cpp | 2 +-
src/url_inputui.cpp | 2 +-
src/url_inputui.h | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/audiodriversoss.cpp b/src/audiodriversoss.cpp
index 5fb9477799..27b156104d 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 7d68dbbe02..7c92a2103b 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 fcdbd9eb98..8612f9f466 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 5563853785..a6684acf38 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 7a80902f1e..1b050dd4dd 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 911b8688d6..a9021f5a3f 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 b94dfd6fd6..3cb38a9af1 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 7635aceb72..2307632181 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 c6887a6134..463a4cb48a 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 221fb9ae63..946dba5b55 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 76e1cdffa4..0a9011232d 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!
--
GitLab