Skip to content
GitLab
Commit a5bde305 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference 

Conflicts:
	sflphone-client-gnome/pixmaps/Makefile.am
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/actions.h
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-client-gnome/src/dbus/callmanager-introspec.xml
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-common/src/Makefile.am
	sflphone-common/src/audio/Makefile.am
	sflphone-common/src/audio/alsalayer.cpp
	sflphone-common/src/audio/audiolayer.h
	sflphone-common/src/audio/audiortp.cpp
	sflphone-common/src/audio/audiortp.h
	sflphone-common/src/audio/codecDescriptor.h
	sflphone-common/src/audio/pulselayer.cpp
	sflphone-common/src/audio/pulselayer.h
	sflphone-common/src/dbus/callmanager.h
	sflphone-common/src/iaxvoiplink.cpp
	sflphone-common/src/iaxvoiplink.h
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/managerimpl.h
	sflphone-common/src/sdp.cpp
	sflphone-common/src/sipcall.cpp
	sflphone-common/src/sipcall.h
	sflphone-common/src/sipvoiplink.cpp
	sflphone-common/src/sipvoiplink.h
	sflphone-common/test/Makefile.am
parents 2280923b d551f336
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ a5bde305
......@@ -94,6 +94,7 @@ sflphone-client-gnome/src/contacts/addressbook/Makefile
sflphone-client-gnome/pixmaps/Makefile
sflphone-client-gnome/tests/Makefile
sflphone-client-gnome/man/Makefile
sflphone-client-gnome/src/widget/Makefile
# Ignore sflphone-client-gnome stuff
......@@ -175,3 +176,5 @@ sflphone-common/libs/dbus-c++/tools/dbusxx-xml2cpp
# Ignore temp files
*~
# GNOME doc file
sflphone-client-gnome/gnome-doc-utils.make
INSTALL
View file @ a5bde305
......@@ -4,7 +4,8 @@ INSTALLATION GUIDE
# Go to the root of the application core directory
cd sflphone-common
# Compile pjsip
cd libs/pjproject-1.0.1
cd libs/pjproject-1.4
./autogen.sh
./configure
make dep && make
sudo make install
......
docbook/README 0 → 100644
View file @ a5bde305
################################################################################################################
TIPS
I already created page samples. Each docbook document represents a chapter in the user manual. The file manual.docbook is the main file, and includes all the chapters to build one document.
# Adding a new chapter
Create a new file new-chapter.docbook. Copy the squeleton of an other docbook file if needed. These files are xml-based files. Here is a link to a quick overview of the syntax to use:
http://www.ibm.com/developerworks/library/l-docbk.html.
Then add your new file reference in manual.docbook (at the beginning and at the end)
You are done!
# Generating the manual
You may need to install sgmltools-lite package: sudo apt-get install sgmltools-lite
Run:
sgmltools -b html manual.docbook
It will output HTML files in the manual directory.
Enjoy !
docbook/accounts.docbook 0 → 100644
View file @ a5bde305
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<chapter id="accounts">
<title>SIP/IAX2 accounts</title>
<para>
</para>
</chapter>
docbook/addressbook.docbook 0 → 100644
View file @ a5bde305
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<chapter id="addressbook">
<title>How to use the address books</title>
<para>
</para>
</chapter>
docbook/audio.docbook 0 → 100644
View file @ a5bde305
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<chapter id="audio">
<title>Audio configuration</title>
<sect1 label="Audio interfaces">
<para>
ALSA and Pulseaudio native interfaces are available.
</para>
<sect2 label="Pulseaudio">
<para>
</para>
</sect2>
<sect2 label="ALSA">
<para>
</para>
</sect2>
</sect1>
<sect1 label="Codecs overview">
<para>
</para>
</sect1>
</chapter>
docbook/introduction.docbook 0 → 100644
View file @ a5bde305
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<chapter id="introduction">
<title>A brief introduction to SFLphone</title>
<para>
SFLphone is a SIP/IAX2 softphone and VoIP client for GNU/Linux. It aims at being a robust enterprise-class desktop phone and has been designed with a hundred-calls-a-day receptionist in mind.
</para>
<para>
SFLphone is a free software and is distributed under the GNU General Public License version 3. It is developed by Savoir-Faire Linux, a Canadian Linux consulting company, in partnership with the global community.
</para>
<para>
Among the many features we developed for you, we could highlight the high definition sound (wide-band audio codecs - speex, G722, Celt), audio recording, voicemail notification and call history.
More than a simple softphone, SFLphone supports advanced enterprise-class call features: unlimited number of calls, call transfer and on/off hold option.
</para>
<para>
Besides the native ALSA interface, SFLphone now fully supports PulseAudio sound server so you could experience the great possibilities it offers (sound mixing, per application volume control, ...).
</para>
</chapter>
docbook/manual.docbook 0 → 100644
View file @ a5bde305
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY sflphone "SFLphone">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" >
<!-- chapters in separate docbook files -->
<!ENTITY introduction SYSTEM "introduction.docbook">
<!ENTITY accounts SYSTEM "accounts.docbook">
<!ENTITY secure SYSTEM "secure.docbook">
<!ENTITY audio SYSTEM "audio.docbook">
<!ENTITY addressbook SYSTEM "addressbook.docbook">
]>
<book>
<bookinfo>
<title>&sflphone; User Manual</title>
<date>2009-08-06</date>
<releaseinfo>&sflphonerelease;</releaseinfo>
<authorgroup>
<author>
<firstname>Pierre-Luc</firstname>
<surname>Bacon</surname>
<affiliation>
<address><email>pierre-luc.bacon@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>Emmanuel</firstname>
<surname>Milou</surname>
<affiliation>
<address><email>emmanuel.milou@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>J&eacute;r&eacute;my</firstname>
<surname>Quentin</surname>
<affiliation>
<address><email>jeremy.quentin@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>Alexandre</firstname>
<surname>Savard</surname>
<affiliation>
<address><email>alexandre.savard@savoirfairelinux.com</email></address>
</affiliation>
</author>
</authorgroup>
<copyright>
<year>2009</year>
<holder>Savoir-faire Linux Inc</holder>
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
<abstract>
SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, published under the GPLv3 license.
</abstract>
<keywordset>
<keyword>KDE</keyword>
<keyword>GNOME</keyword>
<keyword>SFLphone</keyword>
<keyword>client</keyword>
<keyword>softphone</keyword>
<keyword>enterprise</keyword>
</keywordset>
</bookinfo>
&introduction;
&accounts;
&audio;
&addressbook;
&secure;
</book>
docbook/secure.docbook 0 → 100644
View file @ a5bde305
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<chapter id="secure">
<title>Secure communications</title>
<para>
<para>
</chapter>
docbook/sflphone.xml 0 → 100644
View file @ a5bde305
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY app "SFLphone">
<!ENTITY appversion "0.9.7 beta">
]>
<!-- =============Document Header ============================= -->
<article id="index" lang="en">
<!-- please do not change the id; for translations, change lang to -->
<!-- appropriate code -->
<articleinfo>
<title>SFLphone Manual v1.0</title>
<copyright>
<year>2006</year>
<year>2007</year>
<year>2008</year>
<year>2009</year>
<holder>Savoir-faire Linux</holder>
</copyright>
<!-- translators: uncomment this:
-->
<abstract role="description">
<para>
SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, published under the GPLv3 license.
</para>
</abstract>
<publisher>
<publishername>Savoir-faire Linux</publishername>
</publisher>
<legalnotice id="legalnotice">
<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type="help" url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS distributed with this manual.</para>
<para>This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the licence to the manual, as described in section 6 of the licence.</para>
</legalnotice>
<authorgroup>
<author>
<firstname>Pierre-Luc</firstname>
<surname>Bacon</surname>
<affiliation>
<address><email>pierre-luc.bacon@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>Emmanuel</firstname>
<surname>Milou</surname>
<affiliation>
<address><email>emmanuel.milou@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>J&eacute;r&eacute;my</firstname>
<surname>Quentin</surname>
<affiliation>
<address><email>jeremy.quentin@savoirfairelinux.com</email></address>
</affiliation>
</author>
<author>
<firstname>Alexandre</firstname>
<surname>Savard</surname>
<affiliation>
<address><email>alexandre.savard@savoirfairelinux.com</email></address>
</affiliation>
</author>
</authorgroup>
<revhistory>
<revision>
<revnumber>SFLphone Manual V1.0</revnumber>
<date>September 2009</date>
<revdescription>
<para role="author">SFLphone team</para>
<para role="publisher">Savoir-faire Linux</para>
</revdescription>
</revision>
</revhistory>
<releaseinfo>This manual describes version 0.9.7 of SFLphone.</releaseinfo>
</articleinfo>
<indexterm>
<primary>SFLphone</primary>
</indexterm>
<sect1 id="introduction">
<title>A brief introduction to SFLphone</title>
<para>
<application>SFLphone</application> is a SIP/IAX2 softphone and VoIP client for GNU/Linux. It aims at being a robust enterprise-class desktop phone and has been designed with a hundred-calls-a-day receptionist in mind.
</para>
<para>
<application>SFLphone</application> is a free software and is distributed under the GNU General Public License version 3. It is developed by Savoir-Faire Linux, a Canadian Linux consulting company, in partnership with the global community.
</para>
<para>
Among the many features we developed for you, we could highlight the high definition sound (wide-band audio codecs - speex, G722, Celt), audio recording, voicemail notification and call history.
More than a simple softphone, <application>SFLphone</application> supports advanced enterprise-class call features: unlimited number of calls, call transfer and on/off hold option.
</para>
<para>
Besides the native ALSA interface, <application>SFLphone</application> now fully supports PulseAudio sound server so you could experience the great possibilities it offers (sound mixing, per application volume control, ...).
</para>
</sect1>
<sect1 id="accounts">
<title>SIP/IAX2 accounts</title>
</sect1>
<sect1 id="audio_interfaces">
<title>Audio configuration</title>
<para>
ALSA and Pulseaudio native interfaces are available.
</para>
<sect2 label="Pulseaudio">
<para>
</para>
</sect2>
<sect2 label="ALSA">
<para>
</para>
</sect2>
</sect1>
<sect1 id="codecs_overview">
<title>Codecs overview</title>
<para>
</para>
</sect1>
<sect1 id="addressbook">
<title>How to use the address books</title>
<para>
</para>
</sect1>
</article>
sflphone-client-gnome/Makefile.am
View file @ a5bde305
SUBDIRS = src pixmaps tests man po
SUBDIRS = src pixmaps tests man po doc
ACLOCAL_AMFLAGS = -I m4
GNOME_DOC=gnome-doc-utils.make
log4crc_DATA = log4crc
log4crcdir = $(datadir)/sflphone
EXTRA_DIST = $(log4crc_DATA) sflphone.desktop.in
EXTRA_DIST = $(log4crc_DATA) sflphone.desktop.in $(GNOME_DOC) m4
appsdir = $(datadir)/applications
apps_in_files = sflphone.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
#@INTLTOOL_DESKTOP_RULE@
DISTCLEANFILES= sflphone.desktop
DISTCLEANFILES= sflphone.desktop $(GNOME_DOC)
sflphone-client-gnome/autogen.sh
View file @ a5bde305
......@@ -9,27 +9,11 @@ function autocmd()
}
}
gnome-doc-prepare --force
autocmd libtoolize --force --copy
autocmd aclocal
autocmd autoheader
autocmd autoconf -f
autocmd automake --add-missing --force-missing --copy -Wall
./configure $@
#!/bin/sh
# could be replaced with autoconf -v -f (verbose, force rebuild of ltmain, .in files, etc.)
#if [ ! -d "m4" ]; then
# mkdir m4
#fi
#
#aclocal -I m4
#libtoolize --force
#autoheader
#autoconf -f
#automake -a
#./configure $@
#
#
sflphone-client-gnome/configure.ac
View file @ a5bde305
......@@ -2,6 +2,7 @@ AC_INIT([SFLphone],[0.9.6~beta],[sflphoneteam@savoirfairelinux.com],[sflphone-cl
AM_CONFIG_HEADER(config.h)
LT_INIT
GNOME_DOC_INIT
PACKAGE=SFLphone
VERSION=`cat VERSION`
......@@ -53,7 +54,9 @@ PKG_CHECK_MODULES(DEPS, \
libnotify >= 0.4 \
gtk+-2.0 >= 2.2 \
glib-2.0 >= 2.2 \
libebook-1.2 >= 2.22
libebook-1.2 >= 2.22 \
libgnomeui-2.0 \
gnome-doc-utils
)
AC_SUBST(DEPS_CFLAGS)
......@@ -74,11 +77,13 @@ src/config/Makefile
src/dbus/Makefile
src/contacts/Makefile
src/contacts/addressbook/Makefile
src/widget/Makefile
pixmaps/Makefile
sflphone.desktop
tests/Makefile
man/Makefile
po/Makefile
doc/Makefile
])
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