Commit 9894e139 authored by Tristan Matthews's avatar Tristan Matthews

* #25537: daemon/dbus renamed daemon/client

parent 3ae58a98
......@@ -365,7 +365,7 @@ AC_CONFIG_FILES([Makefile \
src/audio/sound/Makefile \
src/audio/codecs/Makefile \
src/config/Makefile \
src/dbus/Makefile \
src/client/Makefile \
src/hooks/Makefile \
src/history/Makefile \
src/video/Makefile \
......
......@@ -24,7 +24,7 @@ if USE_NETWORKMANAGER
NETWORKMANAGER=-DUSE_NETWORKMANAGER
endif
SUBDIRS = dbus audio config hooks history sip $(IAX_SUBDIR) $(INSTANT_MESSAGING_SUBDIR) $(SFL_VIDEO_SUBDIR)
SUBDIRS = client audio config hooks history sip $(IAX_SUBDIR) $(INSTANT_MESSAGING_SUBDIR) $(SFL_VIDEO_SUBDIR)
sflphoned_SOURCES = main.cpp
......@@ -41,7 +41,7 @@ libsflphone_la_LIBADD = \
$(IAX_LIB) \
./sip/libsiplink.la \
./audio/libaudio.la \
./dbus/libdbus.la \
./client/libclient.la \
./config/libconfig.la \
./hooks/libhooks.la \
./history/libhistory.la $(SFL_VIDEO_LIB) $(IM_LIB)
......
......@@ -42,7 +42,7 @@
#include "logger.h"
#include "manager.h"
#include "dbus/configurationmanager.h"
#include "client/configurationmanager.h"
const char * const Account::AUDIO_CODECS_KEY = "audioCodecs"; // 0/9/110/111/112/
const char * const Account::VIDEO_CODECS_KEY = "videoCodecs";
......
......@@ -37,7 +37,7 @@
#include "logger.h"
#include "manager.h"
#include "noncopyable.h"
#include "dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#include <ctime>
#define SFL_ALSA_PERIOD_SIZE 160
......
......@@ -34,7 +34,7 @@
#include "audioloop.h"
#include "manager.h"
#include "dbus/callmanager.h"
#include "client/callmanager.h"
#include <cmath>
#include <numeric>
#include <cstring>
......
......@@ -30,8 +30,8 @@
#include "zrtp_session_callback.h"
#include "logger.h"
#include "sip/sipcall.h"
#include "dbus/client.h"
#include "dbus/callmanager.h"
#include "client/client.h"
#include "client/callmanager.h"
#include "manager.h"
#include <cstdlib>
......
include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libdbus.la
noinst_LTLIBRARIES = libclient.la
BUILT_SOURCES= \
callmanager-glue.h \
......@@ -25,24 +25,24 @@ configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
instance-glue.h: instance-introspec.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
libdbus_la_SOURCES = \
libclient_la_SOURCES = \
callmanager.cpp \
configurationmanager.cpp \
instance.cpp \
client.cpp
if SFL_VIDEO
libdbus_la_SOURCES+=video_controls.cpp
libclient_la_SOURCES+=video_controls.cpp
endif
if USE_NETWORKMANAGER
libdbus_la_SOURCES += networkmanager.cpp
libclient_la_SOURCES += networkmanager.cpp
NETWORKMANAGER=-DUSE_NETWORKMANAGER
else
NETWORKMANAGER=
endif
libdbus_la_CXXFLAGS = \
libclient_la_CXXFLAGS = \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(NETWORKMANAGER)
......
......@@ -46,7 +46,7 @@
#include "networkmanager.h"
#ifdef SFL_VIDEO
#include "dbus/video_controls.h"
#include "video_controls.h"
#endif
Client::Client() : callManager_(0)
......
......@@ -132,4 +132,3 @@ class ConfigurationManager
};
#endif //CONFIGURATIONMANAGER_H
......@@ -47,4 +47,3 @@ class NetworkManager : public org::freedesktop::NetworkManager_proxy,
void PropertiesChanged(const std::map<std::string, ::DBus::Variant> &argin0);
};
#endif
......@@ -191,4 +191,3 @@ VideoControls::getCurrentCodecName(const std::string &callID)
{
return Manager::instance().getCurrentVideoCodecName(callID);
}
......@@ -122,4 +122,3 @@ class VideoControls : public org::sflphone::SFLphone::VideoControls_adaptor,
};
#endif // VIDEO_CONTROLS_H_
......@@ -40,7 +40,7 @@
#include "managerimpl.h"
#include "account_schema.h"
#include "dbus/callmanager.h"
#include "client/callmanager.h"
#include "global.h"
#include "fileutils.h"
#include "map_utils.h"
......@@ -65,9 +65,9 @@
#include "history/historynamecache.h"
#include "manager.h"
#include "dbus/configurationmanager.h"
#include "client/configurationmanager.h"
#ifdef SFL_VIDEO
#include "dbus/video_controls.h"
#include "client/video_controls.h"
#endif
#include "conference.h"
......@@ -178,7 +178,7 @@ void ManagerImpl::init(const std::string &config_file)
void ManagerImpl::run()
{
DEBUG("Starting DBus event loop");
DEBUG("Starting client event loop");
client_.event_loop();
}
......@@ -416,8 +416,7 @@ bool ManagerImpl::hangupCall(const std::string& callId)
AudioLayer *al = getAudioDriver();
if(al) al->setPlaybackMode(AudioLayer::NONE);
/* Broadcast a signal over DBus */
DEBUG("Send DBUS call state change (HUNGUP) for id %s", callId.c_str());
DEBUG("Send call state change (HUNGUP) for id %s", callId.c_str());
client_.getCallManager()->callStateChanged(callId, "HUNGUP");
/* We often get here when the call was hungup before being created */
......@@ -695,7 +694,6 @@ ManagerImpl::createConference(const std::string& id1, const std::string& id2)
// Add conference to map
conferenceMap_.insert(std::make_pair(conf->getConfID(), conf));
// broadcast a signal over dbus
client_.getCallManager()->conferenceCreated(conf->getConfID());
return conf;
......@@ -717,7 +715,6 @@ void ManagerImpl::removeConference(const std::string& conference_id)
return;
}
// broadcast a signal over dbus
client_.getCallManager()->conferenceRemoved(conference_id);
// We now need to bind the audio to the remain participant
......@@ -1680,7 +1677,6 @@ void ManagerImpl::peerHungupCall(const std::string& call_id)
}
}
/* Broadcast a signal over DBus */
client_.getCallManager()->callStateChanged(call_id, "HUNGUP");
removeWaitingCall(call_id);
......
......@@ -46,7 +46,7 @@
#include <tr1/memory>
#include <pthread.h>
#include "dbus/client.h"
#include "client/client.h"
#include "config/sfl_config.h"
......
......@@ -36,7 +36,7 @@
#include "sdp.h"
#include "manager.h"
#ifdef SFL_VIDEO
#include "dbus/video_controls.h"
#include "client/video_controls.h"
#endif
namespace {
......
......@@ -59,8 +59,8 @@
#include "pjsip/sip_transport_tls.h"
#endif
#include "dbus/client.h"
#include "dbus/configurationmanager.h"
#include "client/client.h"
#include "client/configurationmanager.h"
static const char * const DEFAULT_INTERFACE = "default";
static const char * const ANY_HOSTS = "0.0.0.0";
......
......@@ -52,9 +52,9 @@
#endif
#include "array_size.h"
#include "dbus/client.h"
#include "dbus/callmanager.h"
#include "dbus/configurationmanager.h"
#include "client/client.h"
#include "client/callmanager.h"
#include "client/configurationmanager.h"
#if HAVE_INSTANT_MESSAGING
#include "im/instant_messaging.h"
......@@ -64,7 +64,7 @@
#ifdef SFL_VIDEO
#include "video/video_rtp_session.h"
#include "dbus/video_controls.h"
#include "client/video_controls.h"
#endif
#include "pjsip/sip_endpoint.h"
......
......@@ -31,7 +31,7 @@
#include "video_receive_thread.h"
#include "socket_pair.h"
#include "dbus/video_controls.h"
#include "client/video_controls.h"
#include "check.h"
#include "packet_handle.h"
......
......@@ -30,7 +30,7 @@
#include "video_send_thread.h"
#include "socket_pair.h"
#include "dbus/video_controls.h"
#include "client/video_controls.h"
#include "packet_handle.h"
#include "check.h"
......
......@@ -51,7 +51,7 @@ extern "C" {
#include "video_v4l2_list.h"
#include "manager.h"
#include "dbus/video_controls.h"
#include "client/video_controls.h"
namespace sfl_video {
......
Markdown is supported
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