Skip to content
Snippets Groups Projects
Commit 4ef5e293 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

deamon: rename to Ring 

Refs #62691

Change-Id: I8b051e38674b50d2b7771376310dcf9d964452b4
parent 0d0d4ee5
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 221 additions and 208 deletions
INSTALL
+ 7
− 5
View file @ 4ef5e293
...@@ -12,9 +12,11 @@ Wiki: https://projects.savoirfairelinux.com/projects/sflphone/wiki/BuildInstruct ...@@ -12,9 +12,11 @@ Wiki: https://projects.savoirfairelinux.com/projects/sflphone/wiki/BuildInstruct
# Go to the root of the application core directory # Go to the root of the application core directory
cd daemon cd daemon
# Compile pjsip # Compile contrib
cd libs cd contrib
./compile_pjsip.sh mkdir native && cd native
../bootstrap
make
# Go back to the root # Go back to the root
cd ../.. cd ../..
./autogen.sh ./autogen.sh
...@@ -36,8 +38,8 @@ Wiki: https://projects.savoirfairelinux.com/projects/sflphone/wiki/BuildInstruct ...@@ -36,8 +38,8 @@ Wiki: https://projects.savoirfairelinux.com/projects/sflphone/wiki/BuildInstruct
You are done with the gnome client ! You are done with the gnome client !
Then, to start SFLphone, simply go in Applications > Internet > SFLphone VoIP Client. Then, to start Ring, simply go in Applications > Internet > Ring VoIP Client.
Thanks You Thanks You
SFLphone Team Ring Team
README
+ 5
− 5
View file @ 4ef5e293
SFLphone is an open-source SIP/IAX2 compatible enterprise-class softphone, published under the GNU Public License 3. Ring (formerly SFLPhone) is an open-source SIP/IAX2 compatible enterprise-class softphone, published under the GNU Public License 3.
GIT REPOSITORY GIT REPOSITORY
Tree information: Tree information:
* daemon: contains the core application code. This code is mandatory to run the softphone. It may be considered as the core as it implements all the logic (audio layer, communication layer, account management, codecs management, dbus services). * daemon (dring): contains the core application code. This code is mandatory to run the softphone. It may be considered as the core as it implements all the logic (audio layer, communication layer, account management, codecs management, dbus services).
* gnome: contains the GTK+ client for SFLphone. It will connect and communicate to the core application through D-Bus. * gnome: contains the GTK+ client for Ring. It will connect and communicate to the core application through D-Bus.
* tools: scripts * tools: scripts
* sflphone-callto: to start calls from command line * ring-callto: to start calls from command line
* update-copyright: (dev tool) to update copyright notice with new year * update-copyright: (dev tool) to update copyright notice with new year
* sflphone-kde: git clone git://anongit.kde.org/sflphone-kde * sflphone-kde: git clone git://anongit.kde.org/sflphone-kde
...@@ -18,4 +18,4 @@ Tree information: ...@@ -18,4 +18,4 @@ Tree information:
* Mailing list: http://lists.savoirfairelinux.net/mailman/listinfo/sflphone * Mailing list: http://lists.savoirfairelinux.net/mailman/listinfo/sflphone
SFLphone Team Ring Team
daemon/.gitignore
+ 2
− 2
View file @ 4ef5e293
...@@ -3,5 +3,5 @@ aclocal.m4 ...@@ -3,5 +3,5 @@ aclocal.m4
build-aux build-aux
configure configure
bin/dbus/*.adaptor.h bin/dbus/*.adaptor.h
bin/dbus/org.sflphone.SFLphone.service bin/dbus/cx.ring.Ring.service
bin/sflphoned bin/dring
daemon/AUTHORS
+ 17
− 9
View file @ 4ef5e293
Current authors Current authors
--------------- ---------------
Guillaume Roguez <guillaume dot roguez at savoirfairelinux dot com>
Adrien Béraud <adrien dot beraud at savoirfairelinux dot com>
Emmanuel Lepage <emmanuel dot lepage at savoirfairelinux dot com>
Alexandre Lision <alexandre dot lision at savoirfairelinux dot com>
Stepan Salenikovich <stepan dot salenikovich at savoirfairelinux dot com>
Former authors
--------------
Tristan Matthews <tristan dot matthews at savoirfairelinux dot com>
Emmanuel Milou <emmanuel dot milou at savoirfairelinux dot com> Emmanuel Milou <emmanuel dot milou at savoirfairelinux dot com>
- ALSA implementation ( replaces portaudio ) - ALSA implementation ( replaces portaudio )
- Dynamic loading of audio codecs ( shared libraries ) - Dynamic loading of audio codecs ( shared libraries )
- Debian packages - Debian packages
- GTK client error handling - GTK client error handling
- Plus many portions of code in sflphoned and sflphone-gtk - Plus many portions of code in dring and sflphone-gtk
- Test and debugging - Test and debugging
Alexandre Savard <alexandre dot savard at savoirfairelinux dot com> Alexandre Savard <alexandre dot savard at savoirfairelinux dot com>
Tristan Matthews <tristan dot matthews at savoirfairelinux dot com>
Emmanuel Lepage <emmanuel dot lepage at savoirfairelinux dot com>
Former authors
--------------
Rafaël Carré <rafael dot carre at savoirfairelinux dot com> Rafaël Carré <rafael dot carre at savoirfairelinux dot com>
Vivien Didelot <vivien dot didelot at savoirfairelinux dot com> Vivien Didelot <vivien dot didelot at savoirfairelinux dot com>
...@@ -49,7 +57,7 @@ Pierre-Luc Beaudoin <pierre-luc.beaudoin at savoirfairelinux dot com> ...@@ -49,7 +57,7 @@ Pierre-Luc Beaudoin <pierre-luc.beaudoin at savoirfairelinux dot com>
Yan Morin <yan dot morin at savoirfairelinux dot com> Yan Morin <yan dot morin at savoirfairelinux dot com>
- zeroconf integration - zeroconf integration
- sflphoned deamon - dring deamon
- add and improve sip core feature - add and improve sip core feature
- tests and debugging - tests and debugging
......
daemon/Makefile.am
+ 1
− 1
View file @ 4ef5e293
...@@ -21,7 +21,7 @@ endif ...@@ -21,7 +21,7 @@ endif
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
#FIXME: this will change when libsflphone is fixed #FIXME: this will change when libring is fixed
if HAVE_WIN32 if HAVE_WIN32
SUBDIRS = bin SUBDIRS = bin
else else
......
daemon/NEWS
+ 1
− 1
View file @ 4ef5e293
...@@ -64,7 +64,7 @@ SFLphoned/SFLphone (0.6) / 2005-11-04 ...@@ -64,7 +64,7 @@ SFLphoned/SFLphone (0.6) / 2005-11-04
* installation review * installation review
SFLphoned/SFLphone (0.5a) / 2005-10-17 SFLphoned/SFLphone (0.5a) / 2005-10-17
* sflphoned * dring
* bug fixes * bug fixes
* sflphone-qt * sflphone-qt
* client/server protocol * client/server protocol
......
daemon/README
+ 6
− 6
View file @ 4ef5e293
COPYRIGHT NOTICE COPYRIGHT NOTICE
Copyright (C) 2004-2014 Savoir-Faire Linux Inc. Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -30,7 +30,7 @@ as that of the covered work. ...@@ -30,7 +30,7 @@ as that of the covered work.
Introduction Introduction
------------ ------------
SFLPhone is a Voice-over-IP software phone. We want it to be: Ring is a Voice-over-IP software phone. We want it to be:
- user friendly (fast, sleek, easy to learn interface) - user friendly (fast, sleek, easy to learn interface)
- professional grade (transfers, holds, optimal audio quality) - professional grade (transfers, holds, optimal audio quality)
- fully compatible with Asterisk (SIP and IAX protocols) - fully compatible with Asterisk (SIP and IAX protocols)
...@@ -82,7 +82,7 @@ make ...@@ -82,7 +82,7 @@ make
make install make install
# And the GNOME client # And the GNOME client
cd sflphone-client-gnome cd ring-client-gnome
./autogen.sh ./autogen.sh
./configure ./configure
make make
...@@ -96,10 +96,10 @@ https://projects.savoirfairelinux.com/projects/sflphone/wiki/How_to_build ...@@ -96,10 +96,10 @@ https://projects.savoirfairelinux.com/projects/sflphone/wiki/How_to_build
How to compile on OSX How to compile on OSX
--------------------- ---------------------
# These first steps are only necessary if you don't use a package manager. # These first steps are only necessary if you don't use a package manager.
cd sflphone/daemon/extras/tools cd daemon/extras/tools
./bootstrap ./bootstrap
make make
export PATH=$PATH:/location/of/sflphone/daemon/extras/tools/build/bin export PATH=$PATH:/location/of/ring/daemon/extras/tools/build/bin
# Or, use your favorite package manager to install the necessary tools (macports or brew). # Or, use your favorite package manager to install the necessary tools (macports or brew).
automake libtool check gettext libtoolize ... automake libtool check gettext libtoolize ...
...@@ -131,7 +131,7 @@ sudo update-alternatives --config x86_64-w64-mingw32-gcc ...@@ -131,7 +131,7 @@ sudo update-alternatives --config x86_64-w64-mingw32-gcc
sudo update-alternatives --config x86_64-w64-mingw32-g++ sudo update-alternatives --config x86_64-w64-mingw32-g++
# Compile the dependencies # Compile the dependencies
cd sflphone/daemon/contrib/ cd ring/daemon/contrib/
mkdir win64 && cd win64 mkdir win64 && cd win64
../bootstrap --host=x86_64-w64-mingw32 ../bootstrap --host=x86_64-w64-mingw32
make make
......
daemon/bin/Makefile.am
+ 6
− 6
View file @ 4ef5e293
...@@ -10,18 +10,18 @@ libexec_PROGRAMS = ringcli ...@@ -10,18 +10,18 @@ libexec_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \ ringcli_CXXFLAGS = -I$(top_srcdir)/src \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
ringcli_LDADD = $(top_builddir)/src/libsflphone.la ringcli_LDADD = $(top_builddir)/src/libring.la
endif endif
if SFL_DBUS if RING_DBUS
SUBDIRS=dbus SUBDIRS=dbus
libexec_PROGRAMS = sflphoned libexec_PROGRAMS = dring
sflphoned_SOURCES = main.cpp dring_SOURCES = main.cpp
sflphoned_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \ dring_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
sflphoned_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libsflphone.la dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la
endif endif
daemon/bin/dbus/Makefile.am
+ 6
− 6
View file @ 4ef5e293
...@@ -11,7 +11,7 @@ BUILT_SOURCES+=dbuspresencemanager.adaptor.h ...@@ -11,7 +11,7 @@ BUILT_SOURCES+=dbuspresencemanager.adaptor.h
dbuspresencemanager.adaptor.h: presencemanager-introspec.xml Makefile.am dbuspresencemanager.adaptor.h: presencemanager-introspec.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@ dbusxx-xml2cpp $< --adaptor=$@
if SFL_VIDEO if RING_VIDEO
BUILT_SOURCES+=dbusvideomanager.adaptor.h BUILT_SOURCES+=dbusvideomanager.adaptor.h
dbusvideomanager.adaptor.h: videomanager-introspec.xml Makefile.am dbusvideomanager.adaptor.h: videomanager-introspec.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@ dbusxx-xml2cpp $< --adaptor=$@
...@@ -43,29 +43,29 @@ libclient_dbus_la_SOURCES = \ ...@@ -43,29 +43,29 @@ libclient_dbus_la_SOURCES = \
dbuspresencemanager.h \ dbuspresencemanager.h \
$(BUILT_SOURCES) $(BUILT_SOURCES)
if SFL_VIDEO if RING_VIDEO
libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
endif endif
libclient_dbus_la_CXXFLAGS = -I../ \ libclient_dbus_la_CXXFLAGS = -I../ \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-DPREFIX=\"$(prefix)\" \ -DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \ -DPROGSHAREDIR=\"${datadir}/ring\" \
$(DBUSCPP_CFLAGS) $(DBUSCPP_CFLAGS)
# Dbus service file # Dbus service file
servicedir = $(datadir)/dbus-1/services servicedir = $(datadir)/dbus-1/services
service_DATA = org.sflphone.SFLphone.service service_DATA = cx.ring.Ring.service
EXTRA_DIST = callmanager-introspec.xml \ EXTRA_DIST = callmanager-introspec.xml \
configurationmanager-introspec.xml \ configurationmanager-introspec.xml \
instance-introspec.xml \ instance-introspec.xml \
presencemanager-introspec.xml presencemanager-introspec.xml
if SFL_VIDEO if RING_VIDEO
EXTRA_DIST += videomanager-introspec.xml EXTRA_DIST += videomanager-introspec.xml
endif endif
CLEANFILES= \ CLEANFILES= \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
org.sflphone.SFLphone.service cx.ring.Ring.service
daemon/bin/dbus/callmanager-introspec.xml
+ 12
− 12
View file @ 4ef5e293
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<node name="/callmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> <node name="/callmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="org.sflphone.SFLphone.CallManager"> <interface name="cx.ring.Ring.CallManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The CallManager interface is used to manage call and conference related actions.</p> <p>The CallManager interface is used to manage call and conference related actions.</p>
<p>Since SFLphone-daemon supports multiple incoming/outgoing calls, any actions involving a specific call must address the method by the means of a unique callID. <p>Since Ring-daemon supports multiple incoming/outgoing calls, any actions involving a specific call must address the method by the means of a unique callID.
SFLphone-clients is responsible for generating the callID on outgoing calls. Conversely, SFLphone-daemon will generate a unique callID for incoming calls.</p> Ring-clients is responsible for generating the callID on outgoing calls. Conversely, Ring-daemon will generate a unique callID for incoming calls.</p>
</tp:docstring> </tp:docstring>
<method name="placeCall" tp:name-for-bindings="placeCall"> <method name="placeCall" tp:name-for-bindings="placeCall">
<tp:docstring> <tp:docstring>
...@@ -204,8 +204,8 @@ ...@@ -204,8 +204,8 @@
<method name="addMainParticipant" tp:name-for-bindings="addMainParticipant"> <method name="addMainParticipant" tp:name-for-bindings="addMainParticipant">
<tp:added version="0.9.7"/> <tp:added version="0.9.7"/>
<tp:docstring> <tp:docstring>
<p>As the core can handle multiple calls and conferences, it may happen that the client's user leaves a conference to answer an incoming call or to start new calls. This method is used to reintroduce SFLphone-client's user into the conference.</p> <p>As the core can handle multiple calls and conferences, it may happen that the client's user leaves a conference to answer an incoming call or to start new calls. This method is used to reintroduce Ring-client's user into the conference.</p>
<p>Its put the current call on HOLD or detaches SFLphone-client's user from the another conference.</p> <p>Its put the current call on HOLD or detaches Ring-client's user from the another conference.</p>
</tp:docstring> </tp:docstring>
<arg type="s" name="confID" direction="in"> <arg type="s" name="confID" direction="in">
<tp:docstring> <tp:docstring>
...@@ -518,11 +518,11 @@ ...@@ -518,11 +518,11 @@
<tp:docstring> <tp:docstring>
The acceptable states are: The acceptable states are:
<ul> <ul>
<li>ACTIVE_ATTACHED: SFLphone user is <li>ACTIVE_ATTACHED: Ring user is
participating to this conference</li> participating to this conference</li>
<li>ACTIVE_DETACHED: This situation can <li>ACTIVE_DETACHED: This situation can
occur if a call is received while occur if a call is received while
SFLphone user is participating to a Ring user is participating to a
conference. In this case, one can leave conference. In this case, one can leave
the conference by answering the the conference by answering the
call. Other participants may continue call. Other participants may continue
...@@ -571,7 +571,7 @@ ...@@ -571,7 +571,7 @@
<signal name="conferenceCreated" tp:name-for-bindings="conferenceCreated"> <signal name="conferenceCreated" tp:name-for-bindings="conferenceCreated">
<tp:added version="0.9.7"/> <tp:added version="0.9.7"/>
<tp:docstring> <tp:docstring>
Emited when a new conference is created. SFLphone-client is reponsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display. Emited when a new conference is created. Ring-client is reponsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display.
</tp:docstring> </tp:docstring>
<arg type="s" name="confID"> <arg type="s" name="confID">
<tp:docstring> <tp:docstring>
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
<signal name="conferenceRemoved" tp:name-for-bindings="conferenceRemoved"> <signal name="conferenceRemoved" tp:name-for-bindings="conferenceRemoved">
<tp:added version="0.9.7"/> <tp:added version="0.9.7"/>
<tp:docstring> <tp:docstring>
Emited when a new conference is remove. SFLphone-client should have kept a list of current participant in order to display modification. Emited when a new conference is remove. Ring-client should have kept a list of current participant in order to display modification.
</tp:docstring> </tp:docstring>
<arg type="s" name="confID"> <arg type="s" name="confID">
<tp:docstring> <tp:docstring>
...@@ -632,7 +632,7 @@ ...@@ -632,7 +632,7 @@
<signal name="sipCallStateChanged" tp:name-for-bindings="sipCallStateChanged"> <signal name="sipCallStateChanged" tp:name-for-bindings="sipCallStateChanged">
<tp:docstring> <tp:docstring>
<p>Call state changed, SFLphone received a notification <p>Call state changed, Ring received a notification
from registrar concerning this call.</p> from registrar concerning this call.</p>
</tp:docstring> </tp:docstring>
<arg type="s" name="callID" /> <arg type="s" name="callID" />
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
<p>Transfer has been successfully <p>Transfer has been successfully
processed. Client should remove transfered processed. Client should remove transfered
call from call list as it is no longer call from call list as it is no longer
accessible in SFLphone-daemon.</p> accessible in Ring-daemon (dring).</p>
</tp:docstring> </tp:docstring>
</signal> </signal>
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
<tp:docstring> <tp:docstring>
<p>Transfer operation failed. Corresponding <p>Transfer operation failed. Corresponding
call is no longer accessible in call is no longer accessible in
SFLphone-daemon.</p> Ring-daemon (dring).</p>
</tp:docstring> </tp:docstring>
</signal> </signal>
......
daemon/bin/dbus/configurationmanager-introspec.xml
+ 3
− 3
View file @ 4ef5e293
<?xml version="1.0" ?> <?xml version="1.0" ?>
<node name="/configurationmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> <node name="/configurationmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="org.sflphone.SFLphone.ConfigurationManager"> <interface name="cx.ring.Ring.ConfigurationManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
Used to handle the configuration stuff: accounts settings, account registration, user preferences, ... Used to handle the configuration stuff: accounts settings, account registration, user preferences, ...
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<method name="setAccountDetails" tp:name-for-bindings="setAccountDetails"> <method name="setAccountDetails" tp:name-for-bindings="setAccountDetails">
<tp:docstring> <tp:docstring>
Send new account parameters, or account parameters changes, to the core. The hash table is not required to be complete, only the updated parameters may be specified. Send new account parameters, or account parameters changes, to the core. The hash table is not required to be complete, only the updated parameters may be specified.
<tp:rationale>Account settings are written to the configuration file when sflphone properly quits.</tp:rationale> <tp:rationale>Account settings are written to the configuration file when ring properly quits.</tp:rationale>
<tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale> <tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
</tp:docstring> </tp:docstring>
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/> <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<!-- Only used by SIP accounts, data is directly from pjsip --> <!-- Only used by SIP accounts, data is directly from pjsip -->
<signal name="sipRegistrationStateChanged" tp:name-for-bindings="sipRegistrationStateChanged"> <signal name="sipRegistrationStateChanged" tp:name-for-bindings="sipRegistrationStateChanged">
<tp:docstring> <tp:docstring>
<p>Account state changed, SFLphone received a notification from registrar.</p> <p>Account state changed, Ring received a notification from registrar.</p>
</tp:docstring> </tp:docstring>
<annotation name="org.freedesktop.DBus.Deprecated" value="true"/> <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
<arg type="s" name="accountID" > <arg type="s" name="accountID" >
......
daemon/bin/dbus/cx.ring.Ring.service.in 0 → 100644
+ 3
− 0
View file @ 4ef5e293
[D-BUS Service]
Name=cx.ring.Ring
Exec=@LIBEXECDIR@/dring
daemon/bin/dbus/dbus_cpp.h
+ 1
− 1
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
daemon/bin/dbus/dbuscallmanager.cpp
+ 44
− 44
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com> * Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -28,216 +28,216 @@ ...@@ -28,216 +28,216 @@
* as that of the covered work. * as that of the covered work.
*/ */
#include <iostream> #include <iostream>
#include "sflphone.h" #include "ring.h"
#include "dbuscallmanager.h" #include "dbuscallmanager.h"
DBusCallManager::DBusCallManager(DBus::Connection& connection) DBusCallManager::DBusCallManager(DBus::Connection& connection)
: DBus::ObjectAdaptor(connection, "/org/sflphone/SFLphone/CallManager") : DBus::ObjectAdaptor(connection, "/cx/ring/Ring/CallManager")
{ {
} }
bool DBusCallManager::placeCall(const std::string& accountID, const std::string& callID, const std::string& to) bool DBusCallManager::placeCall(const std::string& accountID, const std::string& callID, const std::string& to)
{ {
return sflph_call_place(accountID, callID, to); return ring_call_place(accountID, callID, to);
} }
bool DBusCallManager::refuse(const std::string& callID) bool DBusCallManager::refuse(const std::string& callID)
{ {
return sflph_call_refuse(callID); return ring_call_refuse(callID);
} }
bool DBusCallManager::accept(const std::string& callID) bool DBusCallManager::accept(const std::string& callID)
{ {
return sflph_call_accept(callID); return ring_call_accept(callID);
} }
bool DBusCallManager::hangUp(const std::string& callID) bool DBusCallManager::hangUp(const std::string& callID)
{ {
return sflph_call_hang_up(callID); return ring_call_hang_up(callID);
} }
bool DBusCallManager::hold(const std::string& callID) bool DBusCallManager::hold(const std::string& callID)
{ {
return sflph_call_hold(callID); return ring_call_hold(callID);
} }
bool DBusCallManager::unhold(const std::string& callID) bool DBusCallManager::unhold(const std::string& callID)
{ {
return sflph_call_unhold(callID); return ring_call_unhold(callID);
} }
bool DBusCallManager::transfer(const std::string& callID, const std::string& to) bool DBusCallManager::transfer(const std::string& callID, const std::string& to)
{ {
return sflph_call_transfer(callID, to); return ring_call_transfer(callID, to);
} }
bool DBusCallManager::attendedTransfer(const std::string& transferID, const std::string& targetID) bool DBusCallManager::attendedTransfer(const std::string& transferID, const std::string& targetID)
{ {
return sflph_call_attended_transfer(transferID, targetID); return ring_call_attended_transfer(transferID, targetID);
} }
std::map< std::string, std::string > DBusCallManager::getCallDetails(const std::string& callID) std::map< std::string, std::string > DBusCallManager::getCallDetails(const std::string& callID)
{ {
return sflph_call_get_call_details(callID); return ring_call_get_call_details(callID);
} }
std::vector< std::string > DBusCallManager::getCallList() std::vector< std::string > DBusCallManager::getCallList()
{ {
return sflph_call_get_call_list(); return ring_call_get_call_list();
} }
void DBusCallManager::removeConference(const std::string& conference_id) void DBusCallManager::removeConference(const std::string& conference_id)
{ {
sflph_call_remove_conference(conference_id); ring_call_remove_conference(conference_id);
} }
bool DBusCallManager::joinParticipant(const std::string& sel_callID, const std::string& drag_callID) bool DBusCallManager::joinParticipant(const std::string& sel_callID, const std::string& drag_callID)
{ {
return sflph_call_join_participant(sel_callID, drag_callID); return ring_call_join_participant(sel_callID, drag_callID);
} }
void DBusCallManager::createConfFromParticipantList(const std::vector< std::string >& participants) void DBusCallManager::createConfFromParticipantList(const std::vector< std::string >& participants)
{ {
sflph_call_create_conf_from_participant_list(participants); ring_call_create_conf_from_participant_list(participants);
} }
bool DBusCallManager::isConferenceParticipant(const std::string& call_id) bool DBusCallManager::isConferenceParticipant(const std::string& call_id)
{ {
return sflph_call_is_conference_participant(call_id); return ring_call_is_conference_participant(call_id);
} }
bool DBusCallManager::addParticipant(const std::string& callID, const std::string& confID) bool DBusCallManager::addParticipant(const std::string& callID, const std::string& confID)
{ {
return sflph_call_add_participant(callID, confID); return ring_call_add_participant(callID, confID);
} }
bool DBusCallManager::addMainParticipant(const std::string& confID) bool DBusCallManager::addMainParticipant(const std::string& confID)
{ {
return sflph_call_add_main_participant(confID); return ring_call_add_main_participant(confID);
} }
bool DBusCallManager::detachParticipant(const std::string& callID) bool DBusCallManager::detachParticipant(const std::string& callID)
{ {
return sflph_call_detach_participant(callID); return ring_call_detach_participant(callID);
} }
bool DBusCallManager::joinConference(const std::string& sel_confID, const std::string& drag_confID) bool DBusCallManager::joinConference(const std::string& sel_confID, const std::string& drag_confID)
{ {
return sflph_call_join_conference(sel_confID, drag_confID); return ring_call_join_conference(sel_confID, drag_confID);
} }
bool DBusCallManager::hangUpConference(const std::string& confID) bool DBusCallManager::hangUpConference(const std::string& confID)
{ {
return sflph_call_hang_up_conference(confID); return ring_call_hang_up_conference(confID);
} }
bool DBusCallManager::holdConference(const std::string& confID) bool DBusCallManager::holdConference(const std::string& confID)
{ {
return sflph_call_hold_conference(confID); return ring_call_hold_conference(confID);
} }
bool DBusCallManager::unholdConference(const std::string& confID) bool DBusCallManager::unholdConference(const std::string& confID)
{ {
return sflph_call_unhold_conference(confID); return ring_call_unhold_conference(confID);
} }
std::vector<std::string> DBusCallManager::getConferenceList() std::vector<std::string> DBusCallManager::getConferenceList()
{ {
return sflph_call_get_conference_list(); return ring_call_get_conference_list();
} }
std::vector<std::string> DBusCallManager::getParticipantList(const std::string& confID) std::vector<std::string> DBusCallManager::getParticipantList(const std::string& confID)
{ {
return sflph_call_get_participant_list(confID); return ring_call_get_participant_list(confID);
} }
std::vector<std::string> DBusCallManager::getDisplayNames(const std::string& confID) std::vector<std::string> DBusCallManager::getDisplayNames(const std::string& confID)
{ {
return sflph_call_get_display_names(confID); return ring_call_get_display_names(confID);
} }
std::string DBusCallManager::getConferenceId(const std::string& callID) std::string DBusCallManager::getConferenceId(const std::string& callID)
{ {
return sflph_call_get_conference_id(callID); return ring_call_get_conference_id(callID);
} }
std::map<std::string, std::string> DBusCallManager::getConferenceDetails(const std::string& callID) std::map<std::string, std::string> DBusCallManager::getConferenceDetails(const std::string& callID)
{ {
return sflph_call_get_conference_details(callID); return ring_call_get_conference_details(callID);
} }
bool DBusCallManager::startRecordedFilePlayback(const std::string& filepath) bool DBusCallManager::startRecordedFilePlayback(const std::string& filepath)
{ {
return sflph_call_play_recorded_file(filepath); return ring_call_play_recorded_file(filepath);
} }
void DBusCallManager::stopRecordedFilePlayback(const std::string& filepath) void DBusCallManager::stopRecordedFilePlayback(const std::string& filepath)
{ {
sflph_call_stop_recorded_file(filepath); ring_call_stop_recorded_file(filepath);
} }
bool DBusCallManager::toggleRecording(const std::string& callID) bool DBusCallManager::toggleRecording(const std::string& callID)
{ {
return sflph_call_toggle_recording(callID); return ring_call_toggle_recording(callID);
} }
void DBusCallManager::setRecording(const std::string& callID) void DBusCallManager::setRecording(const std::string& callID)
{ {
sflph_call_set_recording(callID); ring_call_set_recording(callID);
} }
void DBusCallManager::recordPlaybackSeek(const double& value) void DBusCallManager::recordPlaybackSeek(const double& value)
{ {
sflph_call_record_playback_seek(value); ring_call_record_playback_seek(value);
} }
bool DBusCallManager::getIsRecording(const std::string& callID) bool DBusCallManager::getIsRecording(const std::string& callID)
{ {
return sflph_call_is_recording(callID); return ring_call_is_recording(callID);
} }
std::string DBusCallManager::getCurrentAudioCodecName(const std::string& callID) std::string DBusCallManager::getCurrentAudioCodecName(const std::string& callID)
{ {
return sflph_call_get_current_audio_codec_name(callID); return ring_call_get_current_audio_codec_name(callID);
} }
void DBusCallManager::playDTMF(const std::string& key) void DBusCallManager::playDTMF(const std::string& key)
{ {
sflph_call_play_dtmf(key); ring_call_play_dtmf(key);
} }
void DBusCallManager::startTone(const int32_t& start, const int32_t& type) void DBusCallManager::startTone(const int32_t& start, const int32_t& type)
{ {
sflph_call_start_tone(start, type); ring_call_start_tone(start, type);
} }
void DBusCallManager::setSASVerified(const std::string& callID) void DBusCallManager::setSASVerified(const std::string& callID)
{ {
sflph_call_set_sas_verified(callID); ring_call_set_sas_verified(callID);
} }
void DBusCallManager::resetSASVerified(const std::string& callID) void DBusCallManager::resetSASVerified(const std::string& callID)
{ {
sflph_call_reset_sas_verified(callID); ring_call_reset_sas_verified(callID);
} }
void DBusCallManager::setConfirmGoClear(const std::string& callID) void DBusCallManager::setConfirmGoClear(const std::string& callID)
{ {
sflph_call_set_confirm_go_clear(callID); ring_call_set_confirm_go_clear(callID);
} }
void DBusCallManager::requestGoClear(const std::string& callID) void DBusCallManager::requestGoClear(const std::string& callID)
{ {
sflph_call_request_go_clear(callID); ring_call_request_go_clear(callID);
} }
void DBusCallManager::acceptEnrollment(const std::string& callID, const bool& accepted) void DBusCallManager::acceptEnrollment(const std::string& callID, const bool& accepted)
{ {
sflph_call_accept_enrollment(callID, accepted); ring_call_accept_enrollment(callID, accepted);
} }
void DBusCallManager::sendTextMessage(const std::string& callID, const std::string& message) void DBusCallManager::sendTextMessage(const std::string& callID, const std::string& message)
{ {
sflph_call_send_text_message(callID, message); ring_call_send_text_message(callID, message);
} }
daemon/bin/dbus/dbuscallmanager.h
+ 5
− 5
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
* as that of the covered work. * as that of the covered work.
*/ */
#ifndef __SFL_CALLMANAGER_H__ #ifndef __RING_CALLMANAGER_H__
#define __SFL_CALLMANAGER_H__ #define __RING_CALLMANAGER_H__
#include <vector> #include <vector>
#include <map> #include <map>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include <stdexcept> #include <stdexcept>
class DBusCallManager : class DBusCallManager :
public org::sflphone::SFLphone::CallManager_adaptor, public cx::ring::Ring::CallManager_adaptor,
public DBus::IntrospectableAdaptor, public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor public DBus::ObjectAdaptor
{ {
...@@ -107,4 +107,4 @@ class DBusCallManager : ...@@ -107,4 +107,4 @@ class DBusCallManager :
void sendTextMessage(const std::string& callID, const std::string& message); void sendTextMessage(const std::string& callID, const std::string& message);
}; };
#endif // __SFL_CALLMANAGER_H__ #endif // __RING_CALLMANAGER_H__
daemon/bin/dbus/dbusclient.cpp
+ 19
− 19
View file @ 4ef5e293
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
#include <stdexcept> #include <stdexcept>
#include "sflphone.h" #include "ring.h"
#include "dbusclient.h" #include "dbusclient.h"
#include "dbus_cpp.h" #include "dbus_cpp.h"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "dbusconfigurationmanager.h" #include "dbusconfigurationmanager.h"
#include "dbuspresencemanager.h" #include "dbuspresencemanager.h"
#ifdef SFL_VIDEO #ifdef RING_VIDEO
#include "dbusvideomanager.h" #include "dbusvideomanager.h"
#endif #endif
...@@ -66,7 +66,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) : ...@@ -66,7 +66,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) :
, presenceManager_(nullptr) , presenceManager_(nullptr)
, instanceManager_(nullptr) , instanceManager_(nullptr)
, dispatcher_(new DBus::BusDispatcher) , dispatcher_(new DBus::BusDispatcher)
#ifdef SFL_VIDEO #ifdef RING_VIDEO
, videoManager_(nullptr) , videoManager_(nullptr)
#endif #endif
, timeout_(nullptr) , timeout_(nullptr)
...@@ -79,10 +79,10 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) : ...@@ -79,10 +79,10 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) :
// destructor, so we must NOT delete them ourselves. // destructor, so we must NOT delete them ourselves.
timeout_ = new DBus::DefaultTimeout(10 /* ms */, true, dispatcher_); timeout_ = new DBus::DefaultTimeout(10 /* ms */, true, dispatcher_);
// Poll for SIP/IAX events // Poll for SIP/IAX events
timeout_->expired = new EventCallback(sflph_poll_events); timeout_->expired = new EventCallback(ring_poll_events);
DBus::Connection sessionConnection(DBus::Connection::SessionBus()); DBus::Connection sessionConnection(DBus::Connection::SessionBus());
sessionConnection.request_name("org.sflphone.SFLphone"); sessionConnection.request_name("cx.ring.Ring");
callManager_ = new DBusCallManager(sessionConnection); callManager_ = new DBusCallManager(sessionConnection);
configurationManager_ = new DBusConfigurationManager(sessionConnection); configurationManager_ = new DBusConfigurationManager(sessionConnection);
...@@ -99,7 +99,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) : ...@@ -99,7 +99,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) :
instanceManager_ = new DBusInstance(sessionConnection, onNoMoreClientFunc); instanceManager_ = new DBusInstance(sessionConnection, onNoMoreClientFunc);
#ifdef SFL_VIDEO #ifdef RING_VIDEO
videoManager_ = new DBusVideoManager(sessionConnection); videoManager_ = new DBusVideoManager(sessionConnection);
#endif #endif
} catch (const DBus::Error &err) { } catch (const DBus::Error &err) {
...@@ -109,7 +109,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) : ...@@ -109,7 +109,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) :
auto ret = initLibrary(sflphFlags); auto ret = initLibrary(sflphFlags);
if (ret < 0) { if (ret < 0) {
throw std::runtime_error("cannot initialize libsflphone"); throw std::runtime_error("cannot initialize libring");
} }
instanceManager_->started(); instanceManager_->started();
...@@ -117,7 +117,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) : ...@@ -117,7 +117,7 @@ DBusClient::DBusClient(int sflphFlags, bool persistent) :
DBusClient::~DBusClient() DBusClient::~DBusClient()
{ {
#ifdef SFL_VIDEO #ifdef RING_VIDEO
delete videoManager_; delete videoManager_;
#endif #endif
...@@ -138,7 +138,7 @@ int DBusClient::initLibrary(int sflphFlags) ...@@ -138,7 +138,7 @@ int DBusClient::initLibrary(int sflphFlags)
auto callM = callManager_; // just an alias auto callM = callManager_; // just an alias
// Call event handlers // Call event handlers
sflph_call_ev_handlers callEvHandlers = { ring_call_ev_handlers callEvHandlers = {
bind(&DBusCallManager::callStateChanged, callM, _1, _2), bind(&DBusCallManager::callStateChanged, callM, _1, _2),
bind(&DBusCallManager::transferFailed, callM), bind(&DBusCallManager::transferFailed, callM),
bind(&DBusCallManager::transferSucceeded, callM), bind(&DBusCallManager::transferSucceeded, callM),
...@@ -167,7 +167,7 @@ int DBusClient::initLibrary(int sflphFlags) ...@@ -167,7 +167,7 @@ int DBusClient::initLibrary(int sflphFlags)
auto confM = configurationManager_; // just an alias auto confM = configurationManager_; // just an alias
// Configuration event handlers // Configuration event handlers
sflph_config_ev_handlers configEvHandlers = { ring_config_ev_handlers configEvHandlers = {
bind(&DBusConfigurationManager::volumeChanged, confM, _1, _2), bind(&DBusConfigurationManager::volumeChanged, confM, _1, _2),
bind(&DBusConfigurationManager::accountsChanged, confM), bind(&DBusConfigurationManager::accountsChanged, confM),
bind(&DBusConfigurationManager::historyChanged, confM), bind(&DBusConfigurationManager::historyChanged, confM),
...@@ -180,41 +180,41 @@ int DBusClient::initLibrary(int sflphFlags) ...@@ -180,41 +180,41 @@ int DBusClient::initLibrary(int sflphFlags)
auto presM = presenceManager_; auto presM = presenceManager_;
// Presence event handlers // Presence event handlers
sflph_pres_ev_handlers presEvHandlers = { ring_pres_ev_handlers presEvHandlers = {
bind(&DBusPresenceManager::newServerSubscriptionRequest, presM, _1), bind(&DBusPresenceManager::newServerSubscriptionRequest, presM, _1),
bind(&DBusPresenceManager::serverError, presM, _1, _2, _3), bind(&DBusPresenceManager::serverError, presM, _1, _2, _3),
bind(&DBusPresenceManager::newBuddyNotification, presM, _1, _2, _3, _4), bind(&DBusPresenceManager::newBuddyNotification, presM, _1, _2, _3, _4),
bind(&DBusPresenceManager::subscriptionStateChanged, presM, _1, _2, _3) bind(&DBusPresenceManager::subscriptionStateChanged, presM, _1, _2, _3)
}; };
#ifdef SFL_VIDEO #ifdef RING_VIDEO
auto videoM = videoManager_; auto videoM = videoManager_;
// Video event handlers // Video event handlers
sflph_video_ev_handlers videoEvHandlers = { ring_video_ev_handlers videoEvHandlers = {
bind(&DBusVideoManager::deviceEvent, videoM), bind(&DBusVideoManager::deviceEvent, videoM),
bind(&DBusVideoManager::startedDecoding, videoM, _1, _2, _3, _4, _5), bind(&DBusVideoManager::startedDecoding, videoM, _1, _2, _3, _4, _5),
bind(&DBusVideoManager::stoppedDecoding, videoM, _1, _2, _3) bind(&DBusVideoManager::stoppedDecoding, videoM, _1, _2, _3)
}; };
#endif // SFL_VIDEO #endif // RING_VIDEO
// All event handlers // All event handlers
sflph_ev_handlers evHandlers = { ring_ev_handlers evHandlers = {
.call_ev_handlers = callEvHandlers, .call_ev_handlers = callEvHandlers,
.config_ev_handlers = configEvHandlers, .config_ev_handlers = configEvHandlers,
.pres_ev_handlers = presEvHandlers, .pres_ev_handlers = presEvHandlers,
#ifdef SFL_VIDEO #ifdef RING_VIDEO
.video_ev_handlers = videoEvHandlers .video_ev_handlers = videoEvHandlers
#endif // SFL_VIDEO #endif // RING_VIDEO
}; };
// Initialize now // Initialize now
return sflph_init(&evHandlers, static_cast<sflph_init_flag>(sflphFlags)); return ring_init(&evHandlers, static_cast<ring_init_flag>(sflphFlags));
} }
void DBusClient::finiLibrary() void DBusClient::finiLibrary()
{ {
sflph_fini(); ring_fini();
} }
int DBusClient::event_loop() int DBusClient::event_loop()
......
daemon/bin/dbus/dbusclient.h
+ 4
− 4
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef __DBUSCLIENT_H__ #ifndef __DBUSCLIENT_H__
#define __DBUSCLIENT_H__ #define __DBUSCLIENT_H__
#include "sflphone.h" #include "ring.h"
#include "noncopyable.h" #include "noncopyable.h"
class DBusConfigurationManager; class DBusConfigurationManager;
...@@ -40,7 +40,7 @@ class DBusNetworkManager; ...@@ -40,7 +40,7 @@ class DBusNetworkManager;
class DBusInstance; class DBusInstance;
class DBusPresenceManager; class DBusPresenceManager;
#ifdef SFL_VIDEO #ifdef RING_VIDEO
class DBusVideoManager; class DBusVideoManager;
#endif #endif
...@@ -70,7 +70,7 @@ class DBusClient { ...@@ -70,7 +70,7 @@ class DBusClient {
DBusInstance* instanceManager_; DBusInstance* instanceManager_;
DBus::BusDispatcher* dispatcher_; DBus::BusDispatcher* dispatcher_;
#ifdef SFL_VIDEO #ifdef RING_VIDEO
DBusVideoManager *videoManager_; DBusVideoManager *videoManager_;
#endif #endif
DBus::DefaultTimeout *timeout_; DBus::DefaultTimeout *timeout_;
......
daemon/bin/dbus/dbusconfigurationmanager.cpp
+ 72
− 72
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com> * Author: Philippe Proulx <philippe.proulx@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -28,356 +28,356 @@ ...@@ -28,356 +28,356 @@
* as that of the covered work. * as that of the covered work.
*/ */
#include <iostream> #include <iostream>
#include "sflphone.h" #include "ring.h"
#include "dbusconfigurationmanager.h" #include "dbusconfigurationmanager.h"
DBusConfigurationManager::DBusConfigurationManager(DBus::Connection& connection) DBusConfigurationManager::DBusConfigurationManager(DBus::Connection& connection)
: DBus::ObjectAdaptor(connection, "/org/sflphone/SFLphone/ConfigurationManager") : DBus::ObjectAdaptor(connection, "/cx/ring/Ring/ConfigurationManager")
{ {
} }
std::map<std::string, std::string> DBusConfigurationManager::getAccountDetails(const std::string& accountID) std::map<std::string, std::string> DBusConfigurationManager::getAccountDetails(const std::string& accountID)
{ {
return sflph_config_get_account_details(accountID); return ring_config_get_account_details(accountID);
} }
std::map<std::string, std::string> DBusConfigurationManager::getVolatileAccountDetails(const std::string& accountID) std::map<std::string, std::string> DBusConfigurationManager::getVolatileAccountDetails(const std::string& accountID)
{ {
return sflph_config_get_volatile_account_details(accountID); return ring_config_get_volatile_account_details(accountID);
} }
void DBusConfigurationManager::setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details) void DBusConfigurationManager::setAccountDetails(const std::string& accountID, const std::map< std::string, std::string >& details)
{ {
sflph_config_set_account_details(accountID, details); ring_config_set_account_details(accountID, details);
} }
std::map<std::string, std::string> DBusConfigurationManager::getAccountTemplate() std::map<std::string, std::string> DBusConfigurationManager::getAccountTemplate()
{ {
return sflph_config_get_account_template(); return ring_config_get_account_template();
} }
std::string DBusConfigurationManager::addAccount(const std::map< std::string, std::string >& details) std::string DBusConfigurationManager::addAccount(const std::map< std::string, std::string >& details)
{ {
return sflph_config_add_account(details); return ring_config_add_account(details);
} }
void DBusConfigurationManager::removeAccount(const std::string& accountID) void DBusConfigurationManager::removeAccount(const std::string& accountID)
{ {
sflph_config_remove_account(accountID); ring_config_remove_account(accountID);
} }
std::vector< std::string > DBusConfigurationManager::getAccountList() std::vector< std::string > DBusConfigurationManager::getAccountList()
{ {
return sflph_config_get_account_list(); return ring_config_get_account_list();
} }
void DBusConfigurationManager::sendRegister(const std::string& accountID, const bool& enable) void DBusConfigurationManager::sendRegister(const std::string& accountID, const bool& enable)
{ {
sflph_config_send_register(accountID, enable); ring_config_send_register(accountID, enable);
} }
void DBusConfigurationManager::registerAllAccounts(void) void DBusConfigurationManager::registerAllAccounts(void)
{ {
sflph_config_register_all_accounts(); ring_config_register_all_accounts();
} }
std::map< std::string, std::string > DBusConfigurationManager::getTlsSettingsDefault() std::map< std::string, std::string > DBusConfigurationManager::getTlsSettingsDefault()
{ {
return sflph_config_get_tls_default_settings(); return ring_config_get_tls_default_settings();
} }
std::vector< int32_t > DBusConfigurationManager::getAudioCodecList() std::vector< int32_t > DBusConfigurationManager::getAudioCodecList()
{ {
return sflph_config_get_audio_codec_list(); return ring_config_get_audio_codec_list();
} }
std::vector< std::string > DBusConfigurationManager::getSupportedTlsMethod() std::vector< std::string > DBusConfigurationManager::getSupportedTlsMethod()
{ {
return sflph_config_get_supported_tls_method(); return ring_config_get_supported_tls_method();
} }
std::vector< std::string > DBusConfigurationManager::getAudioCodecDetails(const int32_t& payload) std::vector< std::string > DBusConfigurationManager::getAudioCodecDetails(const int32_t& payload)
{ {
return sflph_config_get_audio_codec_details(payload); return ring_config_get_audio_codec_details(payload);
} }
std::vector< int32_t > DBusConfigurationManager::getActiveAudioCodecList(const std::string& accountID) std::vector< int32_t > DBusConfigurationManager::getActiveAudioCodecList(const std::string& accountID)
{ {
return sflph_config_get_active_audio_codec_list(accountID); return ring_config_get_active_audio_codec_list(accountID);
} }
void DBusConfigurationManager::setActiveAudioCodecList(const std::vector< std::string >& list, const std::string& accountID) void DBusConfigurationManager::setActiveAudioCodecList(const std::vector< std::string >& list, const std::string& accountID)
{ {
sflph_config_set_active_audio_codec_list(list, accountID); ring_config_set_active_audio_codec_list(list, accountID);
} }
std::vector< std::string > DBusConfigurationManager::getAudioPluginList() std::vector< std::string > DBusConfigurationManager::getAudioPluginList()
{ {
return sflph_config_get_audio_plugin_list(); return ring_config_get_audio_plugin_list();
} }
void DBusConfigurationManager::setAudioPlugin(const std::string& audioPlugin) void DBusConfigurationManager::setAudioPlugin(const std::string& audioPlugin)
{ {
sflph_config_set_audio_plugin(audioPlugin); ring_config_set_audio_plugin(audioPlugin);
} }
std::vector< std::string > DBusConfigurationManager::getAudioOutputDeviceList() std::vector< std::string > DBusConfigurationManager::getAudioOutputDeviceList()
{ {
return sflph_config_get_audio_output_device_list(); return ring_config_get_audio_output_device_list();
} }
void DBusConfigurationManager::setAudioOutputDevice(const int32_t& index) void DBusConfigurationManager::setAudioOutputDevice(const int32_t& index)
{ {
sflph_config_set_audio_output_device(index); ring_config_set_audio_output_device(index);
} }
void DBusConfigurationManager::setAudioInputDevice(const int32_t& index) void DBusConfigurationManager::setAudioInputDevice(const int32_t& index)
{ {
sflph_config_set_audio_input_device(index); ring_config_set_audio_input_device(index);
} }
void DBusConfigurationManager::setAudioRingtoneDevice(const int32_t& index) void DBusConfigurationManager::setAudioRingtoneDevice(const int32_t& index)
{ {
sflph_config_set_audio_ringtone_device(index); ring_config_set_audio_ringtone_device(index);
} }
std::vector< std::string > DBusConfigurationManager::getAudioInputDeviceList() std::vector< std::string > DBusConfigurationManager::getAudioInputDeviceList()
{ {
return sflph_config_get_audio_input_device_list(); return ring_config_get_audio_input_device_list();
} }
std::vector< std::string > DBusConfigurationManager::getCurrentAudioDevicesIndex() std::vector< std::string > DBusConfigurationManager::getCurrentAudioDevicesIndex()
{ {
return sflph_config_get_current_audio_devices_index(); return ring_config_get_current_audio_devices_index();
} }
int32_t DBusConfigurationManager::getAudioInputDeviceIndex(const std::string& name) int32_t DBusConfigurationManager::getAudioInputDeviceIndex(const std::string& name)
{ {
return sflph_config_get_audio_input_device_index(name); return ring_config_get_audio_input_device_index(name);
} }
int32_t DBusConfigurationManager::getAudioOutputDeviceIndex(const std::string& name) int32_t DBusConfigurationManager::getAudioOutputDeviceIndex(const std::string& name)
{ {
return sflph_config_get_audio_output_device_index(name); return ring_config_get_audio_output_device_index(name);
} }
std::string DBusConfigurationManager::getCurrentAudioOutputPlugin() std::string DBusConfigurationManager::getCurrentAudioOutputPlugin()
{ {
return sflph_config_get_current_audio_output_plugin(); return ring_config_get_current_audio_output_plugin();
} }
bool DBusConfigurationManager::getNoiseSuppressState() bool DBusConfigurationManager::getNoiseSuppressState()
{ {
return sflph_config_get_noise_suppress_state(); return ring_config_get_noise_suppress_state();
} }
void DBusConfigurationManager::setNoiseSuppressState(const bool& state) void DBusConfigurationManager::setNoiseSuppressState(const bool& state)
{ {
sflph_config_set_noise_suppress_state(state); ring_config_set_noise_suppress_state(state);
} }
bool DBusConfigurationManager::isAgcEnabled() bool DBusConfigurationManager::isAgcEnabled()
{ {
return sflph_config_is_agc_enabled(); return ring_config_is_agc_enabled();
} }
void DBusConfigurationManager::setAgcState(const bool& enabled) void DBusConfigurationManager::setAgcState(const bool& enabled)
{ {
sflph_config_enable_agc(enabled); ring_config_enable_agc(enabled);
} }
void DBusConfigurationManager::muteDtmf(const bool& mute) void DBusConfigurationManager::muteDtmf(const bool& mute)
{ {
sflph_config_mute_dtmf(mute); ring_config_mute_dtmf(mute);
} }
bool DBusConfigurationManager::isDtmfMuted() bool DBusConfigurationManager::isDtmfMuted()
{ {
return sflph_config_is_dtmf_muted(); return ring_config_is_dtmf_muted();
} }
bool DBusConfigurationManager::isCaptureMuted() bool DBusConfigurationManager::isCaptureMuted()
{ {
return sflph_config_is_capture_muted(); return ring_config_is_capture_muted();
} }
void DBusConfigurationManager::muteCapture(const bool& mute) void DBusConfigurationManager::muteCapture(const bool& mute)
{ {
sflph_config_mute_capture(mute); ring_config_mute_capture(mute);
} }
bool DBusConfigurationManager::isPlaybackMuted() bool DBusConfigurationManager::isPlaybackMuted()
{ {
return sflph_config_is_playback_muted(); return ring_config_is_playback_muted();
} }
void DBusConfigurationManager::mutePlayback(const bool& mute) void DBusConfigurationManager::mutePlayback(const bool& mute)
{ {
sflph_config_mute_playback(mute); ring_config_mute_playback(mute);
} }
std::map<std::string, std::string> DBusConfigurationManager::getRingtoneList() std::map<std::string, std::string> DBusConfigurationManager::getRingtoneList()
{ {
return sflph_config_get_ringtone_list(); return ring_config_get_ringtone_list();
} }
std::string DBusConfigurationManager::getAudioManager() std::string DBusConfigurationManager::getAudioManager()
{ {
return sflph_config_get_audio_manager(); return ring_config_get_audio_manager();
} }
bool DBusConfigurationManager::setAudioManager(const std::string& api) bool DBusConfigurationManager::setAudioManager(const std::string& api)
{ {
return sflph_config_set_audio_manager(api); return ring_config_set_audio_manager(api);
} }
std::vector<std::string> DBusConfigurationManager::getSupportedAudioManagers() std::vector<std::string> DBusConfigurationManager::getSupportedAudioManagers()
{ {
return sflph_config_get_supported_audio_managers(); return ring_config_get_supported_audio_managers();
} }
int32_t DBusConfigurationManager::isIax2Enabled() int32_t DBusConfigurationManager::isIax2Enabled()
{ {
return sflph_config_is_iax2_enabled(); return ring_config_is_iax2_enabled();
} }
std::string DBusConfigurationManager::getRecordPath() std::string DBusConfigurationManager::getRecordPath()
{ {
return sflph_config_get_record_path(); return ring_config_get_record_path();
} }
void DBusConfigurationManager::setRecordPath(const std::string& recPath) void DBusConfigurationManager::setRecordPath(const std::string& recPath)
{ {
sflph_config_set_record_path(recPath); ring_config_set_record_path(recPath);
} }
bool DBusConfigurationManager::getIsAlwaysRecording() bool DBusConfigurationManager::getIsAlwaysRecording()
{ {
return sflph_config_is_always_recording(); return ring_config_is_always_recording();
} }
void DBusConfigurationManager::setIsAlwaysRecording(const bool& rec) void DBusConfigurationManager::setIsAlwaysRecording(const bool& rec)
{ {
sflph_config_set_always_recording(rec); ring_config_set_always_recording(rec);
} }
void DBusConfigurationManager::setHistoryLimit(const int32_t& days) void DBusConfigurationManager::setHistoryLimit(const int32_t& days)
{ {
sflph_config_set_history_limit(days); ring_config_set_history_limit(days);
} }
int32_t DBusConfigurationManager::getHistoryLimit() int32_t DBusConfigurationManager::getHistoryLimit()
{ {
return sflph_config_get_history_limit(); return ring_config_get_history_limit();
} }
void DBusConfigurationManager::clearHistory() void DBusConfigurationManager::clearHistory()
{ {
sflph_config_clear_history(); ring_config_clear_history();
} }
void DBusConfigurationManager::setAccountsOrder(const std::string& order) void DBusConfigurationManager::setAccountsOrder(const std::string& order)
{ {
sflph_config_set_accounts_order(order); ring_config_set_accounts_order(order);
} }
std::map<std::string, std::string> DBusConfigurationManager::getHookSettings() std::map<std::string, std::string> DBusConfigurationManager::getHookSettings()
{ {
return sflph_config_get_hook_settings(); return ring_config_get_hook_settings();
} }
void DBusConfigurationManager::setHookSettings(const std::map<std::string, std::string>& settings) void DBusConfigurationManager::setHookSettings(const std::map<std::string, std::string>& settings)
{ {
sflph_config_set_hook_settings(settings); ring_config_set_hook_settings(settings);
} }
std::vector<std::map<std::string, std::string> > DBusConfigurationManager::getHistory() std::vector<std::map<std::string, std::string> > DBusConfigurationManager::getHistory()
{ {
return sflph_config_get_history(); return ring_config_get_history();
} }
std::map<std::string, std::string> DBusConfigurationManager::getTlsSettings() std::map<std::string, std::string> DBusConfigurationManager::getTlsSettings()
{ {
return sflph_config_get_tls_settings(); return ring_config_get_tls_settings();
} }
std::map<std::string, std::string> DBusConfigurationManager::validateCertificate(const std::string& accountId, const std::string& certificate, const std::string& privateKey) std::map<std::string, std::string> DBusConfigurationManager::validateCertificate(const std::string& accountId, const std::string& certificate, const std::string& privateKey)
{ {
return sflph_config_validate_certificate(accountId, certificate, privateKey); return ring_config_validate_certificate(accountId, certificate, privateKey);
} }
std::map<std::string, std::string> DBusConfigurationManager::getCertificateDetails(const std::string& certificate) std::map<std::string, std::string> DBusConfigurationManager::getCertificateDetails(const std::string& certificate)
{ {
return sflph_config_get_certificate_details(certificate); return ring_config_get_certificate_details(certificate);
} }
void DBusConfigurationManager::setTlsSettings(const std::map< std::string, std::string >& details) void DBusConfigurationManager::setTlsSettings(const std::map< std::string, std::string >& details)
{ {
sflph_config_set_tls_settings(details); ring_config_set_tls_settings(details);
} }
std::map< std::string, std::string > DBusConfigurationManager::getIp2IpDetails() std::map< std::string, std::string > DBusConfigurationManager::getIp2IpDetails()
{ {
return sflph_config_get_ip2ip_details(); return ring_config_get_ip2ip_details();
} }
std::vector< std::map< std::string, std::string > > DBusConfigurationManager::getCredentials(const std::string& accountID) std::vector< std::map< std::string, std::string > > DBusConfigurationManager::getCredentials(const std::string& accountID)
{ {
return sflph_config_get_credentials(accountID); return ring_config_get_credentials(accountID);
} }
void DBusConfigurationManager::setCredentials(const std::string& accountID, const std::vector< std::map< std::string, std::string > >& details) void DBusConfigurationManager::setCredentials(const std::string& accountID, const std::vector< std::map< std::string, std::string > >& details)
{ {
sflph_config_set_credentials(accountID, details); ring_config_set_credentials(accountID, details);
} }
std::string DBusConfigurationManager::getAddrFromInterfaceName(const std::string& interface) std::string DBusConfigurationManager::getAddrFromInterfaceName(const std::string& interface)
{ {
return sflph_config_get_addr_from_interface_name(interface); return ring_config_get_addr_from_interface_name(interface);
} }
std::vector<std::string> DBusConfigurationManager::getAllIpInterface() std::vector<std::string> DBusConfigurationManager::getAllIpInterface()
{ {
return sflph_config_get_all_ip_interface(); return ring_config_get_all_ip_interface();
} }
std::vector<std::string> DBusConfigurationManager::getAllIpInterfaceByName() std::vector<std::string> DBusConfigurationManager::getAllIpInterfaceByName()
{ {
return sflph_config_get_all_ip_interface_by_name(); return ring_config_get_all_ip_interface_by_name();
} }
std::map<std::string, std::string> DBusConfigurationManager::getShortcuts() std::map<std::string, std::string> DBusConfigurationManager::getShortcuts()
{ {
return sflph_config_get_shortcuts(); return ring_config_get_shortcuts();
} }
void DBusConfigurationManager::setShortcuts(const std::map<std::string, std::string> &shortcutsMap) void DBusConfigurationManager::setShortcuts(const std::map<std::string, std::string> &shortcutsMap)
{ {
sflph_config_set_shortcuts(shortcutsMap); ring_config_set_shortcuts(shortcutsMap);
} }
void DBusConfigurationManager::setVolume(const std::string& device, const double& value) void DBusConfigurationManager::setVolume(const std::string& device, const double& value)
{ {
sflph_config_set_volume(device, value); ring_config_set_volume(device, value);
} }
double DBusConfigurationManager::getVolume(const std::string& device) double DBusConfigurationManager::getVolume(const std::string& device)
{ {
return sflph_config_get_volume(device); return ring_config_get_volume(device);
} }
bool DBusConfigurationManager::checkForPrivateKey(const std::string& pemPath) bool DBusConfigurationManager::checkForPrivateKey(const std::string& pemPath)
{ {
return sflph_config_check_for_private_key(pemPath); return ring_config_check_for_private_key(pemPath);
} }
bool DBusConfigurationManager::checkCertificateValidity(const std::string& caPath, const std::string& pemPath) bool DBusConfigurationManager::checkCertificateValidity(const std::string& caPath, const std::string& pemPath)
{ {
return sflph_config_check_certificate_validity(caPath, pemPath); return ring_config_check_certificate_validity(caPath, pemPath);
} }
bool DBusConfigurationManager::checkHostnameCertificate(const std::string& host, const std::string& port) bool DBusConfigurationManager::checkHostnameCertificate(const std::string& host, const std::string& port)
{ {
return sflph_config_check_hostname_certificate(host, port); return ring_config_check_hostname_certificate(host, port);
} }
daemon/bin/dbus/dbusconfigurationmanager.h
+ 5
− 5
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> * Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
* as that of the covered work. * as that of the covered work.
*/ */
#ifndef __SFL_DBUSCONFIGURATIONMANAGER_H__ #ifndef __RING_DBUSCONFIGURATIONMANAGER_H__
#define __SFL_DBUSCONFIGURATIONMANAGER_H__ #define __RING_DBUSCONFIGURATIONMANAGER_H__
#include <vector> #include <vector>
#include <map> #include <map>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#include <stdexcept> #include <stdexcept>
class DBusConfigurationManager : class DBusConfigurationManager :
public org::sflphone::SFLphone::ConfigurationManager_adaptor, public cx::ring::Ring::ConfigurationManager_adaptor,
public DBus::IntrospectableAdaptor, public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor public DBus::ObjectAdaptor
{ {
...@@ -140,4 +140,4 @@ class DBusConfigurationManager : ...@@ -140,4 +140,4 @@ class DBusConfigurationManager :
}; };
#endif // __SFL_DBUSCONFIGURATIONMANAGER_H__ #endif // __RING_DBUSCONFIGURATIONMANAGER_H__
daemon/bin/dbus/dbusinstance.cpp
+ 2
− 2
View file @ 4ef5e293
/* /*
* Copyright (C) 2004-2013 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
DBusInstance::DBusInstance(DBus::Connection& connection, DBusInstance::DBusInstance(DBus::Connection& connection,
const OnNoMoreClientFunc& onNoMoreClientFunc) : const OnNoMoreClientFunc& onNoMoreClientFunc) :
DBus::ObjectAdaptor(connection, "/org/sflphone/SFLphone/Instance"), DBus::ObjectAdaptor(connection, "/cx/ring/Ring/Instance"),
onNoMoreClientFunc_(onNoMoreClientFunc), onNoMoreClientFunc_(onNoMoreClientFunc),
count_(0) count_(0)
{} {}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment