summaryrefslogtreecommitdiff
path: root/daemon/daemon.cpp
diff options
context:
space:
mode:
authorJavier <dev.git@javispedro.com>2014-11-30 17:27:08 +0100
committerJavier <dev.git@javispedro.com>2014-11-30 17:37:19 +0100
commit49f1261bf9d635d5e3d881e87a93ed4e76abfe90 (patch)
tree4432ecd771a3aca533914d02f9947cb497493395 /daemon/daemon.cpp
parentd55d1d472d5876f90dd95301d9f3b6bef6f4c494 (diff)
allow receiving responses to commands in watchconnector
* the skeleton is in place for watchconnector to allow query->response messages. I've used call/cc style because it is impossible to make QBluetoothSocket synchronous (waitForReadyRead() is a no-op) * remove watchcommands, instead create musicmanager to listen for the music endpoint. The other (simpler) endpoints are now listened in watchconnector itself. hangupAll() slot is moved to voicecallmanager. * instead of emitting signals for each received message, listeners can now register for receiving messages targeted towards a given endpoint * when reading from bluetoothsocket, properly handle short reads * remove useless 'watch' namespace * create appmanager, which mantains a database of installed apps (installed on the phone, that is; watch installed apps will come later) * all the *Managers are now instantiated by the main Manager itself * introduce Unpacker helper class for decoding watch messages * implement getAppbankStatus and getAppbankUuids messages and response parsers * remove file logging for now (20MB is bad for eMMC!) * use dbus object path /org/pebbled instead of /
Diffstat (limited to 'daemon/daemon.cpp')
-rw-r--r--daemon/daemon.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index 80ae667..c9456c6 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -78,17 +78,11 @@ int main(int argc, char *argv[])
Log4Qt::Logger::logger(QLatin1String("Main Logger"))->info() << argv[0] << APP_VERSION;
Settings settings;
- watch::WatchConnector watch;
- DBusConnector dbus;
- VoiceCallManager voice(&settings);
- NotificationManager notifications(&settings);
- AppManager apps(&settings);
- Manager manager(&watch, &dbus, &voice, &notifications, &apps, &settings);
+ Manager manager(&settings);
+ Q_UNUSED(manager);
signal(SIGINT, signalhandler);
signal(SIGTERM, signalhandler);
- QObject::connect(&app, SIGNAL(aboutToQuit()), &watch, SLOT(endPhoneCall()));
- QObject::connect(&app, SIGNAL(aboutToQuit()), &watch, SLOT(disconnect()));
return app.exec();
}