Merge commit 'origin/master'

2e82b778 · Pierre-Luc Beaudoin · c0ffee7b · bf52db50 · 2e82b778 · 2e82b778
Commit 2e82b778 authored Sep 19, 2007 by Pierre-Luc Beaudoin
--- a/src/iaxaccount.cpp
+++ b/src/iaxaccount.cpp
@@ -24,7 +24,7 @@
 IAXAccount::IAXAccount(const AccountID& accountID)
 : Account(accountID)
 {
-  createVoIPLink();
+  _link = new IAXVoIPLink(accountID);
 }
@@ -32,16 +32,6 @@ IAXAccount::~IAXAccount()
 {
 }
-/* virtual Account function implementation */
-bool
-IAXAccount::createVoIPLink()
-{
-  if (!_link) {
-    _link = new IAXVoIPLink(_accountID);
-  }
-  return (_link != 0 ? true : false);
-}
 bool
 IAXAccount::registerAccount()
 {

--- a/src/iaxaccount.h
+++ b/src/iaxaccount.h
@@ -21,6 +21,7 @@
 #include "account.h"
 /**
 * An IAX Account specify IAX specific functions and objects (IAXCall/IAXVoIPLink)
 * @author Yan Morin <yan.morin@gmail.com>
@@ -34,6 +35,7 @@ public:
  /* virtual Account function implementation */
  void initConfig(Conf::ConfigTree& config);
+  /** Actually unuseful, since config loading is done in init() */
  void loadConfig();
  bool registerAccount();
  bool unregisterAccount();
@@ -41,8 +43,6 @@ public:
  bool terminate();
 private:
-  /* virtual Account function implementation */
-  bool createVoIPLink();
 };
 #endif
--- a/src/iaxvoiplink.cpp
+++ b/src/iaxvoiplink.cpp
@@ -268,7 +268,7 @@ IAXVoIPLink::sendAudioFromMic(void)
    // take the lowest
    int bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
-    _debug("available = %d, maxBytesToGet = %d\n", availBytesFromMic, maxBytesToGet);
+    //_debug("available = %d, maxBytesToGet = %d\n", availBytesFromMic, maxBytesToGet);
    // Get bytes from micRingBuffer to data_from_mic
    int nbSample = audiolayer->getMic(_dataAudioLayer, bytesAvail) / sizeof(SFLDataFormat);

--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -69,7 +69,7 @@ ManagerImpl::ManagerImpl (void)
  _dbus = NULL;
  // sound
-  _audiodriver = 0;
+  _audiodriver = NULL;
  _dtmfKey = 0;
  _spkr_volume = 0;  // Initialize after by init() -> initVolume()
  _mic_volume  = 0;  // Initialize after by init() -> initVolume()

--- a/src/sipaccount.cpp
+++ b/src/sipaccount.cpp
@@ -21,12 +21,10 @@
 #include "manager.h"
 SIPAccount::SIPAccount(const AccountID& accountID)
 : Account(accountID)
 {
-  createVoIPLink();
+  _link = new SIPVoIPLink(accountID);
 }
@@ -34,16 +32,6 @@ SIPAccount::~SIPAccount()
 {
 }
-/* virtual Account function implementation */
-bool
-SIPAccount::createVoIPLink()
-{
-  if (!_link) {
-    _link = new SIPVoIPLink(_accountID);
-  }
-  return (_link != 0 ? true : false);
-}
 bool
 SIPAccount::registerAccount()
 {

--- a/src/sipaccount.h
+++ b/src/sipaccount.h
@@ -35,6 +35,7 @@ public:
  /* virtual Account function implementation */
  void initConfig(Conf::ConfigTree& config);
+  /** Actually unuseful, since config loading is done in init() */
  void loadConfig();
  bool registerAccount();
  bool unregisterAccount();
@@ -42,8 +43,6 @@ public:
  bool terminate();
 private:
-  /* virtual Account function implementation */
-  bool createVoIPLink();
 };

--- a/www/header.php
+++ b/www/header.php
@@ -9,5 +9,14 @@
 <body>
 <div id="page_wrapper">
 <div id="header">
-  <a href="."><img src="images/logoSFLphone<?= ($module == 'page_home' ? '512x149' : '312x91') ?>.png" /></a>
+  <a href="."><img src="images/logoSFLphone<?= ($module == 'home' ? '512x149' : '312x91') ?>.png" /></a>
+<?php if ($module != 'home') { ?>
+<div id="homebutton">
+  <a href="index.php"><img src="images/home.png" alt="Home" /></a>
+</div>
+<?php } ?>
 </div>
\ No newline at end of file
--- a/www/images/home.png
+++ b/www/images/home.png
--- a/www/images/icons/README
+++ b/www/images/icons/README
+Replaced the plain DocBook XSL admonition icons with Jimmac's DocBook
+icons (http://jimmac.musichall.cz/ikony.php3). I dropped transparency
+from the Jimmac icons to get round MS IE and FOP PNG incompatibilies.
+Stuart Rackham
+---------
+SFLphone took those from AsciiDoc package.
--- a/www/images/icons/callouts/1.png
+++ b/www/images/icons/callouts/1.png
--- a/www/images/icons/callouts/10.png
+++ b/www/images/icons/callouts/10.png
--- a/www/images/icons/callouts/11.png
+++ b/www/images/icons/callouts/11.png
--- a/www/images/icons/callouts/12.png
+++ b/www/images/icons/callouts/12.png
--- a/www/images/icons/callouts/13.png
+++ b/www/images/icons/callouts/13.png
--- a/www/images/icons/callouts/14.png
+++ b/www/images/icons/callouts/14.png
--- a/www/images/icons/callouts/15.png
+++ b/www/images/icons/callouts/15.png
--- a/www/images/icons/callouts/2.png
+++ b/www/images/icons/callouts/2.png
--- a/www/images/icons/callouts/3.png
+++ b/www/images/icons/callouts/3.png
--- a/www/images/icons/callouts/4.png
+++ b/www/images/icons/callouts/4.png
--- a/www/images/icons/callouts/5.png
+++ b/www/images/icons/callouts/5.png