Commit fb081475 authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

Merge commit 'origin/master' into dbus

Conflicts:

	.gitignore
	src/Makefile.am
	src/managerimpl.cpp
parents 96868436 4be69b42
...@@ -10,19 +10,66 @@ Makefile ...@@ -10,19 +10,66 @@ Makefile
*.m4 *.m4
Makefile.in Makefile.in
*.spec *.spec
*moc*.*
/config.* /config.*
# Ignore rendered docs # Ignore rendered docs
doc/html doc/doxygen/html-everything
doc/doxygen/html-sflphoned
doc/doxygen/html-gui-qt
doc/*.html
# Ignore buildsys stuff # Ignore buildsys stuff
autom4te.cache /autom4te.cache
/configure
/depcomp
/missing
/ltmain.sh
/libtool
/install-sh
/stamp-h1
# Ignore temp portaudio stuff # Ignore QT automatically-rendered stuff
/src/gui/qt/*moc*.*
/src/gui/qt/ConfigurationPanel.h
/src/gui/qt/ConfigurationPanelui.cpp
/src/gui/qt/qmake_image_collection.cpp
# Ignore built stuff
/src/gui/cli/sflphone-cli
/src/gui/qt/sflphone-qt
/src/sflphoned
/src/sflphone
/src/.libs
# Ignore temp libs stuff
tools/portaudio tools/portaudio
# Ignore sub-modules stuff
## libiax2
/libs/libiax2/doc/html
/libs/libiax2/config.*
/libs/libiax2/autom4te.cache
/libs/libiax2/src/.libs
/libs/libiax2/libtool
/libs/libiax2/ltmain.sh
/libs/libiax2/iax-config
/libs/libiax2/configure
## taxidermy
/libs/taxidermy/*moc*.*
# Ignore temp files # Ignore temp files
*~ *~
# Ignore website stuff
/www/cache
/www/config.inc.php
/www/lighttpd.*
# Ignore platform packaging temp files
/platform/debian/changelog
// AsciiDoc file
About
=====
SFLphone is a mega phone. We like it.
// AsciiDoc file
Build notes
-----------
sflphoned
~~~~~~~~~
Instructions to build `sflphoned`:
libiax2
^^^^^^^
Go to `libs/libiax2` and run:
-------------------------
./configure --prefix=/usr
make
sudo make install
-------------------------
the daemon
^^^^^^^^^^
Then, go to the root of the repository, and run:
---------------------------------------------------
./configure --prefix=/usr (or whatever your prefix)
make
sudo make install
---------------------------------------------------
sflphone-qt
~~~~~~~~~~~
`sflphone-qt` gets built with sflphoned, for now.
sflphone-gtk
~~~~~~~~~~~~
Merging of `sflphone-gtk` to come.
// AsciiDoc file
Debugging techniques for SFLphone
---------------------------------
Listening protocol using `tcpdump`:
----------------------
----------------------
// AsciiDoc file
Dependencies to compile SFLphone daemon
---------------------------------------
`--------------------`----------`-----------------------------------------------------
Program Version Links
--------------------------------------------------------------------------------------
libiax2 0.2.3 http://svncommunity.digium.com/view/libiax2/trunk/[svn repos]
Common C++2 1.3.21 http://sourceforge.net/projects/cplusplus/[website]
ccRTP 1.3.5 http://sourceforge.net/projects/cplusplus/[website]
libeXosip2 ** 2.2.2 http://savannah.nongnu.org/projects/exosip/[website]
libosip2 2.2.2 http://www.gnu.org/software/osip/[website]
portaudio v19 http://www.portaudio.com/[website]
portaudio C++ binds. http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz[archive]
libsamplerate 0.1.2 http://www.mega-nerd.com/SRC/[website]
--------------------------------------------------------------------------------------
// [done], [not done], [not tested], etc.. are defined in asciidoc.conf
Features
========
SFLphone feature map
--------------------
* SIP features
- transfer: [done] and tested
- reinvite: [done] and tested
- play DTMF sipinfo: [done] and tested
- receive text message: [done] and tested with sipsak
- SFLphone to snom (asterisk): [done] and tested
- SFLphone to SFLphone (IP and no proxy): [done] and tested
- conference: [not done] yet
- send text message: [not done] yet
* IAX support: [not done] yet
* Audio devices:
- OSS: [done] and tested (portaudio)
- ALSA: [done] and tested (portaudio)
- ALSA with dmix: [not tested]
- JACK: [partial], portaudio has problems to open it
- ASIO on windows: in portaudio, [not tested]
- on MacOSX: we can't use portaudio in 8kHz. libsamplerate was added to convert from 44,1kHz to 8kHz.
* Codecs:
- G711a/PCM: [done] and tested
- G711u: [done] and tested
- GSM: [done] and tested
- Speex codec 8khz: [not tested] but integrated
- ILBc: [notdone]
* Video support:
- video integration in SIP: [not done]
- video integration in IAX: [not done]
- integration in QT: not done
* Zeroconf:
- sflphone-d: partially
- sflphone-qt: not done
* SFLphone Client:
- QT3: done and tested on linux
- QT4: not tested
- GTK: not done
- Command Line Interface (in C): partially done
- Command Line Interface (in python): not done
* MacOSX port:
- compilation: done
- 44,1khz to 8khz conversion (with libsamplerate): not tested
* Windows port:
- compilation of sflphoned: not done
- compilation of sflphone-qt (qt3): not done
- compilation of sflphone-qt (qt4): not done
* Desktop Integration:
- firefox sip: handling: open sflphone, not integrated in install process
- konqueror sip: handling: open sflphone, not integrated in install process
- addressbook: open sflphone and call, not integrated in install process
- inter-process communication: [not done]
- tray icon: [not done]
- menu icon (.desktop): only in fedora rpm
- LDAP enterprise directory support: [not done]
* Packaging:
- Remove libeXosip2 from package: [not done]
- Remove portaudio final from package: [not done]
- Fedora Core 4 packages: [done]
- Suse 9.3 packages: [done]
- .tar.gz publication: [done]
- Debian packages: [not done]
- Suse 10 packages: [not done]
SFLphone-qt (linux)
-------------------
* audiodevice input/output selector: [not done]
* drag'n'drop over lcd screen: [done]
* paste with ctrl+v: [done]
* keyboard mapping: [partial], not completed
* keyboard shortcut: [partial], not completed
...@@ -10,6 +10,8 @@ To access SFLphone's git repository (read-only): ...@@ -10,6 +10,8 @@ To access SFLphone's git repository (read-only):
--------------------------------------------- ---------------------------------------------
git clone git://sflphone.org/git/sflphone.git git clone git://sflphone.org/git/sflphone.git
cd sflphone
autoreconf --install
--------------------------------------------- ---------------------------------------------
...@@ -31,5 +33,7 @@ authentication. Then: ...@@ -31,5 +33,7 @@ authentication. Then:
-------------------------------------------------------------- --------------------------------------------------------------
git clone git+ssh://sflphone_org@sflphone.org/git/sflphone.git git clone git+ssh://sflphone_org@sflphone.org/git/sflphone.git
cd sflphone
autoreconf --install
-------------------------------------------------------------- --------------------------------------------------------------
// AsciiDoc file
News
====
* News 1
* News 2
This directory holds all the documentation files, that are interfaced on the
sflphone.org website, and in other documentation areas.
// AsciiDoc file
Screenshots
-----------
.Screenshot de 2007
sflimage::images/SflphonePOuetpoUEt.png[SFLphone qt3]
.Screenshot de SFLphone 0.7
sflimage::images/sflphone0.7.png[SFLphone 0.7]
#
# Used in Features.txt
#
[replacements]
\[done\]\s*(.*)$=<span style="color: green">done \1<span>
\[not\s?done\]\s*(.*)$=<span style="color: red">not done \1<span>
\[partial\]\s*(.*)$=<span style="color: orange">partially done \1<span>
\[not\s?tested\]\s*(.*)$=<span style="color: orange">not tested \1<span>
#
# Used everywhere to link pages together. Refers to another
#
ifdef::backend-xhtml11[]
[sflink-inlinemacro]
<a href="index.php?f={target}.txt">{0?{0}}{0!{target}}</a>
endif::backend-xhtml11[]
#
# Image links (with "image:")
#
[sflimage-blockmacro]
<div class="image">
<a id="{id}"></a>
<div class="content">
<a class="image" href="{link#}">
<img src="index.php?i={target}" alt="{1={target}}"{1? title="{1}"}{width? width="{width}"}{height? height="{height}"}/>
{link#}</a>
</div>
<div class="image-title">{title}</div>
</div>
\ No newline at end of file
This diff is collapsed.
...@@ -30,7 +30,7 @@ PROJECT_NUMBER = ...@@ -30,7 +30,7 @@ PROJECT_NUMBER =
# If a relative path is entered, it will be relative to the location # If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used. # where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doc OUTPUT_DIRECTORY = doc/doxygen
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output # 4096 sub-directories (in 2 levels) under the output directory of each output
...@@ -629,7 +629,7 @@ GENERATE_HTML = YES ...@@ -629,7 +629,7 @@ GENERATE_HTML = YES
# If a relative path is entered the value of OUTPUT_DIRECTORY will be # If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path. # put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html HTML_OUTPUT = html-gui-qt
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
......
...@@ -30,7 +30,7 @@ PROJECT_NUMBER = ...@@ -30,7 +30,7 @@ PROJECT_NUMBER =
# If a relative path is entered, it will be relative to the location # If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used. # where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doc OUTPUT_DIRECTORY = doc/doxygen
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output # 4096 sub-directories (in 2 levels) under the output directory of each output
...@@ -224,13 +224,11 @@ EXTRACT_ALL = YES ...@@ -224,13 +224,11 @@ EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation. # will be included in the documentation.
EXTRACT_PRIVATE = NO
EXTRACT_PRIVATE = YES EXTRACT_PRIVATE = YES
# If the EXTRACT_STATIC tag is set to YES all static members of a file # If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation. # will be included in the documentation.
EXTRACT_STATIC = NO
EXTRACT_STATIC = YES EXTRACT_STATIC = YES
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
...@@ -244,7 +242,6 @@ EXTRACT_LOCAL_CLASSES = YES ...@@ -244,7 +242,6 @@ EXTRACT_LOCAL_CLASSES = YES
# the interface are included in the documentation. # the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included. # If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
EXTRACT_LOCAL_METHODS = YES EXTRACT_LOCAL_METHODS = YES
# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
...@@ -453,7 +450,7 @@ WARN_LOGFILE = ...@@ -453,7 +450,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = src src/audio src/zeroconf src/config src/gui/server INPUT = src src/audio src/zeroconf src/config src/gui/server src/gui
# If the value of the INPUT tag contains directories, you can use the # If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
...@@ -629,7 +626,7 @@ GENERATE_HTML = YES ...@@ -629,7 +626,7 @@ GENERATE_HTML = YES
# If a relative path is entered the value of OUTPUT_DIRECTORY will be # If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path. # put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html HTML_OUTPUT = html-sflphoned
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
...@@ -720,7 +717,7 @@ ENUM_VALUES_PER_LINE = 4 ...@@ -720,7 +717,7 @@ ENUM_VALUES_PER_LINE = 4
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature. # probably better off using the HTML help feature.
GENERATE_TREEVIEW = NO GENERATE_TREEVIEW = YES
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree # used to set the initial width (in pixels) of the frame in which the tree
......
Supports Markdown
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