Commit bddd5f68 authored by llea's avatar llea

*** empty log message ***

parent b09a4f37
...@@ -83,7 +83,6 @@ AudioDriversOSS::initDevice (DeviceMode mode) { ...@@ -83,7 +83,6 @@ AudioDriversOSS::initDevice (DeviceMode mode) {
audio_fd = open (AUDIO_DEVICE, oflag | O_NONBLOCK ); audio_fd = open (AUDIO_DEVICE, oflag | O_NONBLOCK );
if (audio_fd == -1) { if (audio_fd == -1) {
error->errorName(OPEN_FAILED_DEVICE, NULL); error->errorName(OPEN_FAILED_DEVICE, NULL);
return -1; return -1;
} }
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
void ConfigurationPanel::init() void ConfigurationPanel::init()
{ {
// For reading settings at application startup // For reading settings at application startup
// List skin choice from "skins" directory // List skin choice from "skins" directory
QDir dir(Skin::getPath(QString(SKINDIR))); QDir dir(Skin::getPath(QString(SKINDIR)));
if ( !dir.exists() ) { if ( !dir.exists() ) {
...@@ -71,6 +70,7 @@ void ConfigurationPanel::init() ...@@ -71,6 +70,7 @@ void ConfigurationPanel::init()
"stun.fwdnet.net:3478")); "stun.fwdnet.net:3478"));
((QRadioButton*)stunButtonGroup->find(Config::get("Signalisations", "STUN.useStun", 1)))->setChecked(true); ((QRadioButton*)stunButtonGroup->find(Config::get("Signalisations", "STUN.useStun", 1)))->setChecked(true);
// For audio tab // For audio tab
((QRadioButton*)DriverChoice->find(Config::get("Audio", "Drivers.driverName", 0)))->setChecked(true); ((QRadioButton*)DriverChoice->find(Config::get("Audio", "Drivers.driverName", 0)))->setChecked(true);
#ifdef ALSA #ifdef ALSA
......
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'configurationpanel.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'configurationpanel.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define PREFIX "/usr/local" #define PREFIX "/usr/local"
#endif #endif
#define VERSION "0.2" #define VERSION "0.3"
#define PROGNAME "sflphone" #define PROGNAME "sflphone"
#define SKINDIR "skins" #define SKINDIR "skins"
#define PIXDIR "pixmaps" #define PIXDIR "pixmaps"
......
...@@ -59,16 +59,16 @@ Manager::Manager (QString *Dc = NULL) { ...@@ -59,16 +59,16 @@ Manager::Manager (QString *Dc = NULL) {
exist = createSettingsPath(); exist = createSettingsPath();
selectAudioDriver();
phonegui = new QtGUIMainWindow (0, 0 , phonegui = new QtGUIMainWindow (0, 0 ,
Qt::WDestructiveClose | Qt::WDestructiveClose |
Qt::WStyle_Customize | Qt::WStyle_Customize |
Qt::WStyle_NoBorder,this); Qt::WStyle_NoBorder,this);
error = new Error(this);
selectAudioDriver();
sip = new SIP(this); sip = new SIP(this);
tone = new ToneGenerator(this); tone = new ToneGenerator(this);
audioRTP = new AudioRtp(this); audioRTP = new AudioRtp(this);
error = new Error(this);
sip_init(); sip_init();
...@@ -91,6 +91,7 @@ Manager::Manager (QString *Dc = NULL) { ...@@ -91,6 +91,7 @@ Manager::Manager (QString *Dc = NULL) {
} }
initVolume (); initVolume ();
} }
Manager::~Manager (void) { Manager::~Manager (void) {
......
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'phonebook.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'phonebook.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
...@@ -101,7 +101,7 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f, ...@@ -101,7 +101,7 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
: TransQWidget (parent, name, f) { : TransQWidget (parent, name, f) {
// Create configuration panel // Create configuration panel
panel = new ConfigurationPanel (0, 0, false); panel = new ConfigurationPanel (0, 0, false);
// Address book dialog // Address book dialog
phonebook = new PhoneBook (0, 0, false); phonebook = new PhoneBook (0, 0, false);
......
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'url_input.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'url_input.ui' ** 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$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment