Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
9d20b581
Commit
9d20b581
authored
Jul 16, 2013
by
Tristan Matthews
Browse files
* #26839: client: move callmanager.h into client
parent
a962dc8d
Changes
6
Hide whitespace changes
Inline
Side-by-side
daemon/src/audio/audioloop.cpp
View file @
9d20b581
...
...
@@ -34,7 +34,7 @@
#include
"audioloop.h"
#include
"manager.h"
#include
"client/
dbus/
callmanager.h"
#include
"client/callmanager.h"
#include
<cmath>
#include
<numeric>
#include
<cstring>
...
...
daemon/src/audio/audiortp/zrtp_session_callback.cpp
View file @
9d20b581
...
...
@@ -31,7 +31,7 @@
#include
"logger.h"
#include
"sip/sipcall.h"
#include
"client/client.h"
#include
"client/
dbus/
callmanager.h"
#include
"client/callmanager.h"
#include
"manager.h"
#include
<cstdlib>
...
...
daemon/src/client/
dbus/
callmanager.h
→
daemon/src/client/callmanager.h
View file @
9d20b581
...
...
@@ -31,7 +31,14 @@
#ifndef __SFL_CALLMANAGER_H__
#define __SFL_CALLMANAGER_H__
#include
"dbus_cpp.h"
#ifdef HAVE_CONFIG_H
#include
"config.h"
#endif
#if HAVE_DBUS
#include
"dbus/dbus_cpp.h"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
/* This warning option only exists for gcc 4.6.0 and greater. */
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
...
...
@@ -39,7 +46,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include
"callmanager-glue.h"
#include
"
dbus/
callmanager-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
...
...
@@ -48,25 +55,34 @@
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#endif // HAVE_DBUS
#include
<stdexcept>
class
CallManagerException
:
public
std
::
runtime_error
{
public:
CallManagerException
(
const
std
::
string
&
str
=
""
)
:
CallManagerException
(
const
std
::
string
&
str
=
""
)
:
std
::
runtime_error
(
"A CallManagerException occured: "
+
str
)
{}
};
namespace
sfl
{
class
AudioZrtpSession
;
class
AudioZrtpSession
;
}
class
CallManager
#if HAVE_DBUS
:
public
org
::
sflphone
::
SFLphone
::
CallManager_adaptor
,
public
DBus
::
IntrospectableAdaptor
,
public
DBus
::
ObjectAdaptor
{
public
DBus
::
ObjectAdaptor
#endif
{
public:
#if HAVE_DBUS
CallManager
(
DBus
::
Connection
&
connection
);
#else
CallManager
();
#endif
/* methods exported by this interface,
* you will have to implement them in your ObjectAdaptor
...
...
daemon/src/client/dbus/Makefile.am
View file @
9d20b581
...
...
@@ -49,7 +49,7 @@ libclient_la_CXXFLAGS = -I../ \
noinst_HEADERS
=
\
callmanager.h
\
../
callmanager.h
\
configurationmanager.h
\
instance.h
\
../client.h
\
...
...
daemon/src/managerimpl.cpp
View file @
9d20b581
...
...
@@ -71,7 +71,7 @@
#ifndef __ANDROID__
#include
"client/dbus/configurationmanager.h"
#include
"client/
dbus/
callmanager.h"
#include
"client/callmanager.h"
#else
#include
"client/android/configurationmanager.h"
#include
"client/android/callmanager.h"
...
...
daemon/src/sip/sipvoiplink.cpp
View file @
9d20b581
...
...
@@ -73,7 +73,7 @@
#include
"client/android/callmanager.h"
#else
#include
"client/client.h"
#include
"client/
dbus/
callmanager.h"
#include
"client/callmanager.h"
#include
"client/dbus/configurationmanager.h"
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment